diff --git a/.circleci/config.yml b/.circleci/config.yml index b9abdaac62..8ae0c0b671 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,13 +6,14 @@ jobs: build-bookworm: docker: - image: leamas/debian-git:bookworm - # bookworm-scm fails on non-existing /etc/apt/sources.list - # - image: buildpack-deps:bookworm-scm + # bookworm-scm fails on non-existing /etc/apt/sources.list + # - image: buildpack-deps:bookworm-scm auth: username: $DOCKER_USER password: $DOCKER_PW environment: - OCPN_TARGET: bookworm + - PACKAGE_BRANCH: ci/bookworm-backports steps: - checkout - run: cat /etc/apt/sources.list @@ -36,8 +37,8 @@ jobs: build-jammy: docker: - image: leamas/ubuntu-git:jammy - # jammy-scm fails on missing sudo - # - image: buildpack-deps:jammy-scm + # jammy-scm fails on missing sudo + # - image: buildpack-deps:jammy-scm auth: username: $DOCKER_USER password: $DOCKER_PW @@ -57,14 +58,18 @@ jobs: environment: - OCPN_TARGET: flatpak steps: + # We maintain two caches, one for even build numbers and one for odd. + # flatpak-builder knows about what can be used in the cache, we just + # make sure that we always save existing data - run: cd ~; git clone "$CIRCLE_REPOSITORY_URL" -b "$CIRCLE_BRANCH" - - run: ci/docker-auth.sh + # - run: echo "CIRCLE_BUILD_NUM: $CIRCLE_BUILD_NUM" + - run: echo $((CIRCLE_BUILD_NUM % 2)) > .buildstamp - restore_cache: - keys: - - fp-cache-v3-{{checksum "flatpak/org.opencpn.OpenCPN.yaml"}} + key: fp-v1-{{checksum ".buildstamp"}} - run: ci/circleci-build-flatpak.sh + - run: echo $(((CIRCLE_BUILD_NUM + 1) % 2)) > .buildstamp - save_cache: - key: fp-cache-v3-{{checksum "flatpak/org.opencpn.OpenCPN.yaml"}} + key: fp-v1-{{checksum ".buildstamp"}} paths: - build/.flatpak-builder/cache - build/.flatpak-builder/ccache @@ -86,42 +91,42 @@ jobs: macos: xcode: "13.3.1" environment: - - OCPN_TARGET: macos + - OCPN_TARGET: macos - pkg_mod: 11 - MACOSX_DEPLOYMENT_TARGET: 11.0 steps: - checkout - restore_cache: - keys: - - macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}} + keys: + - macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}} - run: ci/generic-build-macos.sh - save_cache: - key: macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}} - paths: - - /usr/local/bin - - /usr/local/include - - /usr/local/lib + key: macos-cache-v2-{{checksum "ci/generic-build-macos.sh"}} + paths: + - /usr/local/bin + - /usr/local/include + - /usr/local/lib - run: ci/generic-upload.sh build-macos-universal: macos: xcode: "15.1.0" environment: - - OCPN_TARGET: macos + - OCPN_TARGET: macos - pkg_mod: 11 - MACOSX_DEPLOYMENT_TARGET: 11.0 steps: - checkout - restore_cache: - keys: - - macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} + keys: + - macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} - run: ci/universal-build-macos.sh - save_cache: - key: macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} - paths: - - /usr/local/bin - - /usr/local/include - - /usr/local/lib + key: macos-cache-v2-universal-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} + paths: + - /usr/local/bin + - /usr/local/include + - /usr/local/lib - run: ci/generic-upload.sh build-macos-intel-legacy: @@ -140,21 +145,21 @@ jobs: steps: - checkout - restore_cache: - keys: - - macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} + keys: + - macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} - run: ci/universal-build-macos.sh - save_cache: - key: macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} - paths: - - /usr/local/bin - - /usr/local/include - - /usr/local/lib + key: macos-cache-v2-intel-{{checksum "ci/macos-universal-deps.sh"}}-{{checksum "ci/universal-build-macos.sh"}} + paths: + - /usr/local/bin + - /usr/local/include + - /usr/local/lib - run: ci/generic-upload.sh std-filters: &std-filters filters: branches: - only: + only: - master - build - flatpak diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 60879e58dc..106fdf70aa 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -64,7 +64,7 @@ jobs: run: | set -x cd build - cmake --install . + cmake --build . --config $CONFIGURATION --target install cmake --build . --config $CONFIGURATION --target run-tests - name: Upload diff --git a/.gitignore b/.gitignore index 1c1eb06fa0..47e49d7cff 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ *~ .DS_Store .idea -.pre-commit-config.yaml .vs .vscode build @@ -17,5 +16,6 @@ cache crowdin.yaml cscope.files cscope.out +data/doc/local/* index.sh tags diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..e0ff8e8362 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "flatpak/org.opencpn.OpenCPN"] + path = flatpak/org.opencpn.OpenCPN + url = https://github.com/flathub/org.opencpn.OpenCPN.git + branch = ci diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..4f7ac2d61b --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,12 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.3.0 + hooks: + - id: check-yaml + - id: end-of-file-fixer + - id: trailing-whitespace +- repo: https://github.com/pre-commit/mirrors-clang-format + rev: v18.1.8 + hooks: + - id: clang-format + exclude: (?x)^( libs.*| data.*)$ diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d43b3e307..3d82c43776 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -452,6 +452,11 @@ if (QT_ANDROID) set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-soname,libgorp.so -Wl,--build-id") endif () +if (ARCH STREQUAL armhf) + # See: https://forums.raspberrypi.com/viewtopic.php?t=144115 + add_compile_options(-mcpu=cortex-a53 -mfpu=neon-fp-armv8) +endif () # Assuming at least RPi 3 + message(STATUS "Final compiler options:") message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") message(STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}") @@ -853,8 +858,6 @@ set(GUI_HDRS ${GUI_HDR_DIR}/waypointman_gui.h ${GUI_HDR_DIR}/WindowDestroyListener.h ${GUI_HDR_DIR}/WindowDestroyListener.h - ${GUI_HDR_DIR}/wiz_ui_proto.h - ${GUI_HDR_DIR}/wiz_ui.h ) list(APPEND GUI_HDRS ${GUI_S57_DIR}/include/ogr_s57.h @@ -908,6 +911,7 @@ set(GUI_SRC ${GUI_SRC_DIR}/load_errors_dlg.cpp ${GUI_SRC_DIR}/MarkInfo.cpp ${GUI_SRC_DIR}/mbtiles/mbtiles.cpp + ${GUI_SRC_DIR}/mbtiles/WorkerThread.cpp ${GUI_SRC_DIR}/mbtiles/WorkerThread.hpp ${GUI_SRC_DIR}/mbtiles/TileQueue.hpp ${GUI_SRC_DIR}/mbtiles/TileDescriptor.hpp @@ -970,10 +974,19 @@ set(GUI_SRC ${GUI_SRC_DIR}/update_mgr.cpp ${GUI_SRC_DIR}/viewport.cpp ${GUI_SRC_DIR}/waypointman_gui.cpp - ${GUI_SRC_DIR}/initwiz/wiz_ui_proto.cpp - ${GUI_SRC_DIR}/initwiz/wiz_ui.cpp ) +if (NOT QT_ANDROID) + list(APPEND GUI_HDRS + ${GUI_HDR_DIR}/wiz_ui_proto.h + ${GUI_HDR_DIR}/wiz_ui.h + ) + list(APPEND GUI_SRC + ${GUI_SRC_DIR}/initwiz/wiz_ui_proto.cpp + ${GUI_SRC_DIR}/initwiz/wiz_ui.cpp + ) +endif () + list(APPEND GUI_SRC ${GUI_S57_DIR}/src/ogrs57datasource.cpp ${GUI_S57_DIR}/src/ogrs57layer.cpp @@ -1005,6 +1018,12 @@ if (QT_ANDROID) list(APPEND GUI_SRC ${CMAKE_SOURCE_DIR}/android/androidUTIL.cpp) endif () +if (NOT MSVC AND NOT APPLE) + list(APPEND GUI_HDRS ${GUI_HDR_DIR}/ocpn_fontdlg.h) + list(APPEND GUI_SRC ${GUI_SRC_DIR}/ocpn_fontdlg.cpp) +endif () + + set(SRCS ${GUI_SRC}) set(HDRS ${GUI_HDRS}) @@ -1099,14 +1118,6 @@ find_package(Gettext REQUIRED) add_subdirectory(libs/ssl_sha1) target_link_libraries(${PACKAGE_NAME} PRIVATE ssl::sha1) -if (LINUX) - find_package(LIBUDEV) - if (LIBUDEV_FOUND) - target_link_libraries(${PACKAGE_NAME} PRIVATE ocpn::libudev) - set(HAVE_LIBUDEV 1) - endif () -endif () - if (OCPN_USE_SYSFS_PORTS) set(USE_SYSFS_PORTS 1) endif () @@ -1115,7 +1126,8 @@ if (EXISTS /sys/devices) set(HAVE_SYSFS_PORTS 1) endif () -if (wxWidgets_VERSION_STRING VERSION_LESS "3.1.6") +if (wxWidgets_VERSION_STRING VERSION_LESS "3.1.6" + AND NOT QT_ANDROID) find_package(PANGO) if (PANGO_FOUND) target_link_libraries(${PACKAGE_NAME} PRIVATE ocpn::pango) @@ -1245,7 +1257,13 @@ target_link_libraries(${PACKAGE_NAME} PRIVATE ocpn::sqlite) add_subdirectory("libs/SQLiteCpp") target_link_libraries(${PACKAGE_NAME} PRIVATE ocpn::sqlite_cpp) -add_subdirectory("libs/shapelib") +find_package(Shapelib) +if (SHAPELIB_FOUND) + message(STATUS "Using system shapelib") +else () + message(STATUS "Using bundled shapelib") + add_subdirectory("libs/shapelib") +endif () target_link_libraries(${PACKAGE_NAME} PRIVATE shapelib::shapelib) add_subdirectory("libs/ShapefileCpp") @@ -1254,10 +1272,8 @@ target_include_directories(${PACKAGE_NAME} PRIVATE ${SHAPEFILECPP_INCLUDE_DIR}) target_include_directories(${PACKAGE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libs/gdal/include/gdal) if (NOT QT_ANDROID) - # TODO: On Linux libdnet may be available from system packages add_subdirectory("libs/libdnet") - target_link_libraries(${PACKAGE_NAME} PRIVATE dnet) - target_include_directories(${PACKAGE_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/libs/libdnet/include) + target_link_libraries(${PACKAGE_NAME} PRIVATE ocpn::dnet) endif () if (UNIX) @@ -1305,72 +1321,6 @@ if (CMAKE_HOST_WIN32) ) endif () -if (OCPN_USE_CURL) - if (CMAKE_HOST_WIN32) - install( - FILES "${CMAKE_SOURCE_DIR}/cache/buildwin/curl-ca-bundle.crt" - "${CMAKE_SOURCE_DIR}/cache/buildwin/libeay32.dll" - "${CMAKE_SOURCE_DIR}/cache/buildwin/ssleay32.dll" DESTINATION "." - ) - if (MSVC) - set(CURL_LIBRARIES "${CMAKE_SOURCE_DIR}/buildwin/libcurl.lib") - install(FILES "cache/buildwin/libcurl.dll" DESTINATION ".") - install(FILES "cache/buildwin/zlib1.dll" DESTINATION ".") - endif () - else () - set(OCPN_USE_EXTERN_CURL ON) - endif () - - if (NOT QT_ANDROID) - if (OCPN_USE_EXTERN_CURL) - find_package(CURL REQUIRED) - message(STATUS "ocpn: using external curl libraries...") - message(STATUS " curl includes: " ${CURL_INCLUDE_DIRS}) - message(STATUS " curl libraries: " ${CURL_LIBRARIES}) - - target_include_directories(${PACKAGE_NAME} PRIVATE ${CURL_INCLUDE_DIRS}) - else () - include("Curl") - message(STATUS "Using bundled curl library...") - endif () - - pkg_search_module(SYS_WXCURL libwxcurl wxcurl) - use_bundled_lib(USE_BUNDLED_WXCURL wxcurl) - if (SYS_WXCURL_FOUND AND NOT USE_BUNDLED_WXCURL) - message(STATUS "Building with system wxcurl") - target_include_directories( - ${PACKAGE_NAME} PRIVATE ${CURL_INCLUDE_DIRS} ${SYS_WXCURL_INCLUDE_DIR} - ) - target_link_libraries(${PACKAGE_NAME} PRIVATE ${SYS_WXCURL_LIBRARIES}) - else () - message(STATUS "Building with bundled wxcurl") - include("Curl") - add_subdirectory("libs/wxcurl") - target_link_libraries(${PACKAGE_NAME} PRIVATE ocpn::wxcurl) - endif () - - target_link_libraries(${PACKAGE_NAME} PRIVATE ${CURL_LIBRARIES}) - - if (WIN32 AND OCPN_USE_EXTERN_CURL) - find_library( - CURL_LIBRARY_DLL - NAMES curl curllib libcurl_imp curllib_static libcurl - PATH_SUFFIXES dll - ) - install(FILES ${CURL_LIBRARY_DLL} DESTINATION ".") - endif () - else () - target_include_directories( - ${PACKAGE_NAME} - PRIVATE ${CMAKE_SOURCE_DIR}/buildandroid/libcurl/${ARCH}/include - ) - target_link_libraries( - ${PACKAGE_NAME} - PRIVATE ${CMAKE_SOURCE_DIR}/buildandroid/libcurl/${ARCH}/lib/libcurl.a - ) - endif () -endif () - if (QT_ANDROID) target_include_directories( ${PACKAGE_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/buildandroid/libexpat/include @@ -1628,6 +1578,10 @@ set(basemap_shp # Various data files +set(ssfnData + data/ssfn/FreeSans.sfn + ) + set(uiData resources/bitmaps/styles.xml resources/bitmaps/toolicons_journeyman.png @@ -1693,6 +1647,9 @@ if (APPLE) set_source_files_properties( ${basemap_shp} PROPERTIES MACOSX_PACKAGE_LOCATION SharedSupport/basemap_shp ) + set_source_files_properties( + ${ssfnData} PROPERTIES MACOSX_PACKAGE_LOCATION SharedSupport/ssfndata + ) set_source_files_properties( ${uiData} PROPERTIES MACOSX_PACKAGE_LOCATION SharedSupport/uidata ) @@ -1831,17 +1788,17 @@ if (APPLE) if (OCPN_BUNDLE_DOCS) set_source_files_properties( - data/doc/help_en_US.html PROPERTIES MACOSX_PACKAGE_LOCATION - SharedSupport/doc + data/doc/local/toc_flat.html PROPERTIES MACOSX_PACKAGE_LOCATION + SharedSupport/doc/local ) - file(GLOB_RECURSE WIKI_DOC_FILES "${CMAKE_SOURCE_DIR}/data/doc/*") + file(GLOB_RECURSE WIKI_DOC_FILES "${CMAKE_SOURCE_DIR}/data/doc/local/*") foreach (_currentWikiDocFile ${WIKI_DOC_FILES}) file(RELATIVE_PATH _docfileRelPath # Output variable - "${CMAKE_SOURCE_DIR}/data/doc/" # Base directory + "${CMAKE_SOURCE_DIR}/data/doc/local" # Base directory ${_currentWikiDocFile} # Absolute path to the file ) get_filename_component(_docfileLocation ${_docfileRelPath} DIRECTORY) - set(_location "SharedSupport/doc/${_docfileLocation}") + set(_location "SharedSupport/doc/local/${_docfileLocation}") set_source_files_properties( ${_currentWikiDocFile} PROPERTIES MACOSX_PACKAGE_LOCATION ${_location} ) @@ -1866,7 +1823,7 @@ if (APPLE) set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.opencpn") if (OCPN_BUNDLE_DOCS) - set(DOC_FILES data/doc/help_web.html data/doc/help_en_US.html + set(DOC_FILES data/doc/help_web.html ${WIKI_DOC_FILES} ) else () @@ -1877,6 +1834,7 @@ if (APPLE) ${PACKAGE_NAME} PRIVATE ${gshhs} ${basemap_shp} + ${ssfnData} ${uiData} ${s57data} ${tcData} @@ -1944,7 +1902,16 @@ add_subdirectory(libs/picosha2) add_subdirectory(libs/pugixml) add_subdirectory(libs/rapidjson) add_subdirectory(libs/s52plib) + +if (QT_ANDROID) + set(SOUND_WX_INCLUDE_DIR "${ANDROID_WX_INCLUDES}" CACHE STRING "") + set(SOUND_WX_LIBS "${ANDROID_WX_LIBS}" CACHE STRING "") +else () + set(SOUND_WX_INCLUDE_DIR "${wxWidgets_INCLUDE_DIRS}" CACHE STRING "") + set(SOUND_WX_LIBS "${wxWidgets_LIBRARIES}" CACHE STRING "") +endif () add_subdirectory(libs/sound) + add_subdirectory(libs/wxJSON) # @@ -2000,6 +1967,8 @@ if (NOT APPLE) install(FILES ${basemap_shp} DESTINATION ${PREFIX_PKGDATA}/basemap_shp) + install(FILES ${ssfnData} DESTINATION ${PREFIX_PKGDATA}/ssfndata) + file(GLOB LICENSES "${CMAKE_SOURCE_DIR}/COPYING.*") install(FILES ${LICENSES} LICENSING DESTINATION "${PREFIX_PKGDATA}") @@ -2023,7 +1992,7 @@ if (NOT APPLE) install(DIRECTORY data/sounds/ DESTINATION ${PREFIX_PKGDATA}/sounds) if (OCPN_BUNDLE_DOCS) - install(DIRECTORY data/doc/ DESTINATION ${PREFIX_PKGDATA}/doc) + install(DIRECTORY data/doc DESTINATION ${PREFIX_PKGDATA}) else () install(FILES data/doc/help_web.html DESTINATION ${PREFIX_PKGDATA}/doc) endif () @@ -2558,40 +2527,8 @@ configure_file( "${CMAKE_BINARY_DIR}/opencpn.appdata.xml" @ONLY ) -# -# Debian package setup -# -set(PKG_DESCR - [=[ -OpenCPN is a concise ChartPlotter/Navigator. The application supports: -GPS/GPSD Position Input, BSB Raster Chart Display, S57 Vector ENChart -Display, AIS Input Decoding, Waypoint Autopilot Navigation. ]=] -) - -if (UNIX AND NOT APPLE) - set(CPACK_STRIP_FILES ON) - set(CPACK_GENERATOR ${PACKAGE_FORMAT}) - set(CPACK_PACKAGE_CONTACT "David S. Register ") - - # autogenerate additional dependency information - set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) - set(CPACK_DEBIAN_PACKAGE_RECOMMENDS ${PACKAGE_RECS}) - if ("${ARCH}" STREQUAL "x86_64") - set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") - else () - set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${ARCH}) - endif () - set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}") - set(CPACK_DEBIAN_PACKAGE_SECTION "misc") - set(CPACK_DEBIAN_COMPRESSION_TYPE "xz") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenSource Chart Plotter/Navigator") - set(CPACK_PACKAGE_DESCRIPTION ${PKG_DESCR}) - set(CPACK_PACKAGE_RELOCATABLE OFF) - set(CPACK_SET_DESTDIR ON) - set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -endif () - -# Command line tools - must be added before the macOS bundle is defined, otherwise they do not get installed before fixup_bundle is performed +# Command line tools - must be added before the macOS bundle is defined, +# otherwise they do not get installed before fixup_bundle is performed if (NOT QT_ANDROID) add_subdirectory(cli) endif () @@ -2786,5 +2723,4 @@ if (QT_ANDROID) ${CMAKE_SOURCE_DIR}/buildandroid/libopenssl/${ARCH}/openssl/lib/libssl.a ${CMAKE_SOURCE_DIR}/buildandroid/libopenssl/${ARCH}/openssl/lib/libcrypto.a ) - add_definitions(-DMG_ENABLE_OPENSSL) endif () diff --git a/INSTALL b/INSTALL index a6eafdfa62..05071d4095 100644 --- a/INSTALL +++ b/INSTALL @@ -28,7 +28,7 @@ with the following wxWidgets hosts: ---------------------------------------------------------------------- Up to date build dependency instructions can be found at -https://opencpn-manuals.github.io/main/ocpn-dev-manual/, look for +https://opencpn-manuals.github.io/main/opencpn-dev/, look for OpenCPN Development. On Debian/Ubuntu the canonical way to install build depencies is: @@ -52,7 +52,7 @@ Opencpn uses the cmake system. On Linux, the build is performed using: $ make -j 4 $ sudo make install -See the manual at https://opencpn-manuals.github.io/main/ocpn-dev-manual/ +See the manual at https://opencpn-manuals.github.io/main/opencpn-dev/ for build instructions on other platforms. diff --git a/NSIS.template.in.in b/NSIS.template.in.in index d247f69a64..c47052985c 100644 --- a/NSIS.template.in.in +++ b/NSIS.template.in.in @@ -87,6 +87,7 @@ CMake variables Var VERSION_OLDER Var CANCEL_INSTALLER Var VERSION_DATE + Var LAST_VERSION_DATE Var LANG_NAME Var Status_SecGrpSetConfig Var MAJOR_D @@ -837,6 +838,7 @@ Section "-Install Section" SecInstall WriteRegStr SHCTX "${REG_KEY_UN}" "DisplayName" "@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" WriteRegStr SHCTX "${REG_KEY_UN}" "DisplayVersion" "@CPACK_PACKAGE_VERSION@" WriteRegStr SHCTX "${REG_KEY_UN}" "CompareVersion" "$VERSION_DATE" + WriteRegStr SHCTX "${REG_KEY_UN}" "LastCompareVersion" "$LAST_VERSION_DATE" WriteRegStr SHCTX "${REG_KEY_UN}" "StartMenuPath" "$SMPROGRAMS\$STARTMENU_FOLDER" WriteRegStr SHCTX "${REG_KEY_UN}" "InstallLocation" "$INSTDIR" WriteRegStr SHCTX "${REG_KEY_UN}" "UninstallString" "$\"$INSTDIR\Uninstall @CPACK_PACKAGE_VERSION@.exe$\"" @@ -2016,7 +2018,7 @@ FunctionEnd StrCpy $GroupBox_Size 1 ;Case 2: one older previous installation => Option 1: Upgrade Option 2: Parallel Installation - ${ElseIf} $MULTIPLE_INSTALLS == 1 + ${ElseIf} $MULTIPLE_INSTALLS > 0 ${AndIf} $VERSION_NEWER == 1 ${NSD_CreateLabel} 0 0 100% 32u "$(Label_TypeInst_Upgrade_Text)" Pop $Label_TypeInst_Upgrade @@ -2039,7 +2041,7 @@ FunctionEnd StrCpy $GroupBox_Size 2 ;Case 3: one newer previous installation => Option 1: Downgrade Option 2: Parallel Installation - ${ElseIf} $MULTIPLE_INSTALLS == 1 + ${ElseIf} $MULTIPLE_INSTALLS > 0 ${AndIf} $VERSION_OLDER == 1 ${NSD_CreateLabel} 0 0 100% 32u "$(Label_TypeInst_Downgrade_Text)" Pop $Label_TypeInst_Downgrade @@ -2062,6 +2064,7 @@ FunctionEnd StrCpy $GroupBox_Size 2 ;Case 4: more than one previous installation => Option 1: Parallel Installation + ;August, 2024, dsr. This case is never activated ${ElseIf} $MULTIPLE_INSTALLS > 1 ${NSD_CreateLabel} 0 0 100% 32u "$(Label_TypeInst_Parallel_Text)" Pop $Label_TypeInst_Parallel @@ -3692,6 +3695,7 @@ FunctionEnd ${If} $R3 == "OpenCPN" ${AndIf} $R2 > 7 ReadRegStr $R4 SHCTX "${REG_ROOT_KEY_UN}\$R1" "CompareVersion" + StrCpy $LAST_VERSION_DATE $R4 ReadRegStr $R6 SHCTX "${REG_ROOT_KEY_UN}\$R1" "InstallLocation" ${If} $R4 != "" ${VersionCompare} $VERSION_DATE $R4 $Compare_Version_Result diff --git a/README.opencpn-cmd.md b/README.opencpn-cmd.md index b18ca6070f..621f9a6159 100644 --- a/README.opencpn-cmd.md +++ b/README.opencpn-cmd.md @@ -30,7 +30,7 @@ Flatpak ------- Make a local Flatpak build as described in -https://opencpn-manuals.github.io/main/ocpn-dev-manual/od-compile-linux.html +https://opencpn-manuals.github.io/main/opencpn-dev/linux.html#_flatpak This will also make a local installation. opencpn-cmd needs to run in the Flatpak sandbox. Do: diff --git a/VERSION.cmake b/VERSION.cmake index 4022582214..bb47192b40 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,4 +1,4 @@ SET(VERSION_MAJOR "5") -SET(VERSION_MINOR "9") +SET(VERSION_MINOR "10") SET(VERSION_PATCH "0") -SET(VERSION_DATE "2023-05-08") +SET(VERSION_DATE "2024-08-09") diff --git a/android/androidUTIL.cpp b/android/androidUTIL.cpp index 5acdaf24d5..7f6a852bb0 100644 --- a/android/androidUTIL.cpp +++ b/android/androidUTIL.cpp @@ -263,7 +263,6 @@ extern bool g_bAutoAnchorMark; extern wxAuiManager *g_pauimgr; extern wxString g_AisTargetList_perspective; - WX_DEFINE_ARRAY_PTR(ChartCanvas *, arrayofCanvasPtr); extern arrayofCanvasPtr g_canvasArray; @@ -357,7 +356,7 @@ int futimens(int fd, const struct timespec times[2]) { // Event handler for Raw NMEA messages coming from Java upstream class AndroidNMEAEvent : public wxEvent { public: - AndroidNMEAEvent( wxEventType commandType, int id); + AndroidNMEAEvent(wxEventType commandType, int id); ~AndroidNMEAEvent(); // accessors @@ -365,39 +364,39 @@ class AndroidNMEAEvent : public wxEvent { std::shared_ptr> GetPayload(); // required for sending with wxPostEvent() - wxEvent* Clone() const; + wxEvent *Clone() const; + private: std::shared_ptr> m_payload; }; wxDECLARE_EVENT(wxEVT_ANDROID_NMEA_RAW, AndroidNMEAEvent); - wxDEFINE_EVENT(wxEVT_ANDROID_NMEA_RAW, AndroidNMEAEvent); -AndroidNMEAEvent::AndroidNMEAEvent( wxEventType commandType, int id = 0) - : wxEvent(id, commandType){}; +AndroidNMEAEvent::AndroidNMEAEvent(wxEventType commandType, int id = 0) + : wxEvent(id, commandType) {}; -AndroidNMEAEvent::~AndroidNMEAEvent(){}; +AndroidNMEAEvent::~AndroidNMEAEvent() {}; -void AndroidNMEAEvent::SetPayload(std::shared_ptr> data) { - m_payload = data; +void AndroidNMEAEvent::SetPayload( + std::shared_ptr> data) { + m_payload = data; +} +std::shared_ptr> AndroidNMEAEvent::GetPayload() { + return m_payload; } -std::shared_ptr> AndroidNMEAEvent::GetPayload() { return m_payload; } - // required for sending with wxPostEvent() -wxEvent* AndroidNMEAEvent::Clone() const { - AndroidNMEAEvent* newevent = - new AndroidNMEAEvent(*this); - newevent->m_payload = this->m_payload; - return newevent; +// required for sending with wxPostEvent() +wxEvent *AndroidNMEAEvent::Clone() const { + AndroidNMEAEvent *newevent = new AndroidNMEAEvent(*this); + newevent->m_payload = this->m_payload; + return newevent; }; - - class androidUtilHandler : public wxEvtHandler { public: - androidUtilHandler(DriverListener& listener); + androidUtilHandler(DriverListener &listener); ~androidUtilHandler(); void onTimerEvent(wxTimerEvent &event); @@ -405,7 +404,7 @@ class androidUtilHandler : public wxEvtHandler { void OnResizeTimer(wxTimerEvent &event); void OnScheduledEvent(wxCommandEvent &event); - void handle_N0183_MSG(AndroidNMEAEvent& event); + void handle_N0183_MSG(AndroidNMEAEvent &event); wxString GetStringResult() { return m_stringResult; } void LoadAuxClasses(); @@ -420,7 +419,7 @@ class androidUtilHandler : public wxEvtHandler { int m_bskipConfirm; bool m_migratePermissionSetDone; - DriverListener& m_listener; + DriverListener &m_listener; DECLARE_EVENT_TABLE() }; @@ -435,9 +434,8 @@ EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, END_EVENT_TABLE() -androidUtilHandler::androidUtilHandler(DriverListener& listener) - : m_listener(listener) -{ +androidUtilHandler::androidUtilHandler(DriverListener &listener) + : m_listener(listener) { m_eventTimer.SetOwner(this, ANDROID_EVENT_TIMER); m_stressTimer.SetOwner(this, ANDROID_STRESS_TIMER); m_resizeTimer.SetOwner(this, ANDROID_RESIZE_TIMER); @@ -446,20 +444,17 @@ androidUtilHandler::androidUtilHandler(DriverListener& listener) LoadAuxClasses(); - // Prepare the wxEventHandler to accept events from upstream - Bind(wxEVT_ANDROID_NMEA_RAW, &androidUtilHandler::handle_N0183_MSG, - this); - + // Prepare the wxEventHandler to accept events from upstream + Bind(wxEVT_ANDROID_NMEA_RAW, &androidUtilHandler::handle_N0183_MSG, this); } androidUtilHandler::~androidUtilHandler() { - Unbind(wxEVT_ANDROID_NMEA_RAW, &androidUtilHandler::handle_N0183_MSG, - this); + Unbind(wxEVT_ANDROID_NMEA_RAW, &androidUtilHandler::handle_N0183_MSG, this); } -void androidUtilHandler::handle_N0183_MSG(AndroidNMEAEvent& event) { +void androidUtilHandler::handle_N0183_MSG(AndroidNMEAEvent &event) { auto p = event.GetPayload(); - std::vector* payload = p.get(); + std::vector *payload = p.get(); // Extract the NMEA0183 sentence std::string full_sentence = std::string(payload->begin(), payload->end()); @@ -474,8 +469,8 @@ void androidUtilHandler::handle_N0183_MSG(AndroidNMEAEvent& event) { auto address = std::make_shared(NavAddr0183("Android_RAW")); - auto msg = std::make_shared(identifier, full_sentence, - address); + auto msg = + std::make_shared(identifier, full_sentence, address); auto msg_all = std::make_shared(*msg, "ALL"); m_listener.Notify(std::move(msg)); @@ -483,8 +478,7 @@ void androidUtilHandler::handle_N0183_MSG(AndroidNMEAEvent& event) { } } -void androidUtilHandler::LoadAuxClasses() -{ +void androidUtilHandler::LoadAuxClasses() { // We do a few little dummy class accesses here, to cause the static link to // wxWidgets to bring in some class members required by some plugins, that // would be missing otherwise. @@ -498,7 +492,6 @@ void androidUtilHandler::LoadAuxClasses() wxZipEntry *entry = new wxZipEntry(); wxSplitterWindow *swin = new wxSplitterWindow(); - } void androidUtilHandler::onTimerEvent(wxTimerEvent &event) { @@ -587,7 +580,8 @@ void androidUtilHandler::onTimerEvent(wxTimerEvent &event) { } // Tide/Current window - if (gFrame->GetPrimaryCanvas() && gFrame->GetPrimaryCanvas()->getTCWin()) { + if (gFrame->GetPrimaryCanvas() && + gFrame->GetPrimaryCanvas()->getTCWin()) { bool bshown = gFrame->GetPrimaryCanvas()->getTCWin()->IsShown(); gFrame->GetPrimaryCanvas()->getTCWin()->Hide(); gFrame->GetPrimaryCanvas()->getTCWin()->RecalculateSize(); @@ -621,8 +615,8 @@ void androidUtilHandler::onTimerEvent(wxTimerEvent &event) { } if (g_options) { - g_options->RecalculateSize( - g_options->GetSize().x, g_options->GetSize().y ); + g_options->RecalculateSize(g_options->GetSize().x, + g_options->GetSize().y); } bInConfigChange = false; @@ -765,7 +759,6 @@ void androidUtilHandler::onTimerEvent(wxTimerEvent &event) { } } - break; } @@ -802,7 +795,7 @@ void androidUtilHandler::onTimerEvent(wxTimerEvent &event) { // qDebug() << "isFileChooserFinished returned null"; } else if ((jenv)->GetStringLength(s)) { const char *ret_string = (jenv)->GetStringUTFChars(s, NULL); - //qDebug() << "isFileChooserFinished returned" << ret_string; + // qDebug() << "isFileChooserFinished returned" << ret_string; if (!strncmp(ret_string, "cancel:", 7)) { m_migratePermissionSetDone = true; m_stringResult = _T("cancel:"); @@ -812,11 +805,11 @@ void androidUtilHandler::onTimerEvent(wxTimerEvent &event) { } } - if(m_migratePermissionSetDone){ + if (m_migratePermissionSetDone) { g_androidUtilHandler->m_action = ACTION_NONE; g_androidUtilHandler->m_eventTimer.Stop(); - if(g_migrateDialog) + if (g_migrateDialog) g_migrateDialog->onPermissionGranted(m_stringResult); } } @@ -824,8 +817,6 @@ void androidUtilHandler::onTimerEvent(wxTimerEvent &event) { break; } - - default: break; } @@ -991,7 +982,7 @@ void androidUtilHandler::OnScheduledEvent(wxCommandEvent &event) { bool androidUtilInit(void) { qDebug() << "androidUtilInit()"; - auto& msgbus = NavMsgBus::GetInstance(); + auto &msgbus = NavMsgBus::GetInstance(); g_androidUtilHandler = new androidUtilHandler(msgbus); // Initialize some globals @@ -1029,7 +1020,6 @@ bool androidUtilInit(void) { token = tk.GetNextToken(); g_androidDownloadDirectory = token; - } g_mask = -1; @@ -1072,18 +1062,15 @@ void resizeAndroidPersistents() { } void sendNMEAMessageEvent(wxString &msg) { - std::string string = msg.ToStdString(); auto buffer = std::make_shared>(); - std::vector* vec = buffer.get(); + std::vector *vec = buffer.get(); - for (int i=0; i < string.size(); i++) - vec->push_back(string[i]); + for (int i = 0; i < string.size(); i++) vec->push_back(string[i]); AndroidNMEAEvent Nevent(wxEVT_ANDROID_NMEA_RAW, 0); Nevent.SetPayload(buffer); g_androidUtilHandler->AddPendingEvent(Nevent); - } // OCPNNativeLib @@ -1100,18 +1087,15 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_test(JNIEnv *env, } extern "C" { -JNIEXPORT jint JNICALL - Java_org_opencpn_OCPNNativeLib_onSoundDone(JNIEnv *env, - jobject obj, - long soundPtr) { - auto sound = reinterpret_cast(soundPtr); - DEBUG_LOG << "on SoundDone, ptr: " << soundPtr; - sound->OnSoundDone(); - return 57; +JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_onSoundDone( + JNIEnv *env, jobject obj, long soundPtr) { + auto sound = reinterpret_cast(soundPtr); + DEBUG_LOG << "on SoundDone, ptr: " << soundPtr; + sound->OnSoundDone(); + return 57; } } - extern "C" { JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_processSailTimer( JNIEnv *env, jobject obj, double WindAngleMagnetic, double WindSpeedKnots) { @@ -1268,10 +1252,9 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_processNMEA( if (consumer) { auto buffer = std::make_shared>(); - std::vector* vec = buffer.get(); + std::vector *vec = buffer.get(); - for (int i=0; i < strlen(string); i++) - vec->push_back(string[i]); + for (int i = 0; i < strlen(string); i++) vec->push_back(string[i]); CommDriverN0183SerialEvent Nevent(wxEVT_COMMDRIVER_N0183_SERIAL, 0); Nevent.SetPayload(buffer); @@ -1296,12 +1279,12 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_processNMEAInt( if (consumer) { auto buffer = std::make_shared>(); - std::vector* vec = buffer.get(); + std::vector *vec = buffer.get(); - for (int i=0; i < strlen(string); i++) - vec->push_back(string[i]); + for (int i = 0; i < strlen(string); i++) vec->push_back(string[i]); - CommDriverN0183AndroidIntEvent Nevent(wxEVT_COMMDRIVER_N0183_ANDROID_INT, 0); + CommDriverN0183AndroidIntEvent Nevent(wxEVT_COMMDRIVER_N0183_ANDROID_INT, + 0); Nevent.SetPayload(buffer); consumer->AddPendingEvent(Nevent); } @@ -1313,7 +1296,6 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_processNMEAInt( extern "C" { JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_processBTNMEA( JNIEnv *env, jobject obj, jstring nmea_string) { - wxEvtHandler *consumer = s_pAndroidBTNMEAMessageConsumer; const char *string = env->GetStringUTFChars(nmea_string, NULL); @@ -1322,10 +1304,9 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_processBTNMEA( if (consumer) { auto buffer = std::make_shared>(); - std::vector* vec = buffer.get(); + std::vector *vec = buffer.get(); - for (int i=0; i < strlen(string); i++) - vec->push_back(string[i]); + for (int i = 0; i < strlen(string); i++) vec->push_back(string[i]); vec->push_back('\r'); vec->push_back('\n'); @@ -1352,10 +1333,9 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_processARBNMEA( if (consumer) { auto buffer = std::make_shared>(); - std::vector* vec = buffer.get(); + std::vector *vec = buffer.get(); - for (int i=0; i < strlen(string); i++) - vec->push_back(string[i]); + for (int i = 0; i < strlen(string); i++) vec->push_back(string[i]); vec->push_back('\r'); vec->push_back('\n'); @@ -1574,7 +1554,7 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_invokeCmdEventCmdString( wxString wx_sparm; JNIEnv *jenv; - if (!java_vm) return 73; + if (!java_vm) return 73; // Need a Java environment to decode the string parameter if (java_vm->GetEnv((void **)&jenv, JNI_VERSION_1_6) != JNI_OK) { @@ -1814,7 +1794,7 @@ JNIEXPORT jint JNICALL Java_org_opencpn_OCPNNativeLib_sendPluginMessage( wxString Msg; JNIEnv *jenv; - if (!java_vm) return 79; + if (!java_vm) return 79; // Need a Java environment to decode the string parameter if (java_vm->GetEnv((void **)&jenv, JNI_VERSION_1_6) != JNI_OK) { @@ -2097,13 +2077,15 @@ wxString androidGetDeviceInfo() { wxString b = s1.Mid(a + 1, 2); memset(android_plat_spc.msdk, 0, sizeof(android_plat_spc.msdk)); strncpy(android_plat_spc.msdk, b.c_str(), 2); - g_Android_SDK_Version = atoi( android_plat_spc.msdk ); + g_Android_SDK_Version = atoi(android_plat_spc.msdk); } } if (wxNOT_FOUND != s1.Find(_T("opencpn"))) { strcpy(&android_plat_spc.hn[0], s1.c_str()); } - if (wxNOT_FOUND != s1.Find(_T("Model (and Product): "))) { //Model (and Product): LML413DL (cv3_lao_com) + if (wxNOT_FOUND != + s1.Find(_T("Model (and Product): "))) { // Model (and Product): + // LML413DL (cv3_lao_com) wxString smp = s1.Mid(21); wxString smp1 = smp.BeforeFirst('('); g_android_Device_Model = smp1.Trim(false).Trim(true).Truncate(8); @@ -2123,16 +2105,16 @@ wxString androidGetDeviceInfo() { return g_deviceInfo; } -bool androidIsDirWritable( wxString dir ) -{ +bool androidIsDirWritable(wxString dir) { if (g_Android_SDK_Version < 30) return true; - else{ + else { // This is theorectically most accurate, but slow to execute - //wxString result = callActivityMethod_ss("isDirWritable", dir); - //return (result.IsSameAs("YES")); + // wxString result = callActivityMethod_ss("isDirWritable", dir); + // return (result.IsSameAs("YES")); - // This is a practical alternative, for things like chart storage qualification. + // This is a practical alternative, for things like chart storage + // qualification. return (dir.Contains("org.opencpn.opencpn")); } } @@ -2207,7 +2189,7 @@ androidGetCacheDir() // Used for raster_texture_cache, mmsitoname.csv, etc wxString androidGetExtStorageDir() // Used for Chart storage, typically { if (g_Android_SDK_Version >= 30) - return g_androidExtFilesDir; // Scoped storage model + return g_androidExtFilesDir; // Scoped storage model else return g_androidExtStorageDir; } @@ -2400,9 +2382,9 @@ double GetAndroidDisplaySize() { if (ldpi < 160) ldpi = 160.; // Find the max dimension among all possibilities -// double maxDim = wxMax(screen_size.x, screen_size.y); -// maxDim = wxMax(maxDim, androidHeight); -// maxDim = wxMax(maxDim, androidWidth); + // double maxDim = wxMax(screen_size.x, screen_size.y); + // maxDim = wxMax(maxDim, androidHeight); + // maxDim = wxMax(maxDim, androidWidth); double maxDim = screen_size.x; maxDim = wxMax(maxDim, androidWidth); @@ -2480,7 +2462,6 @@ double getAndroidDisplayDensity() { } wxSize getAndroidDisplayDimensions(void) { - wxSize sz_ret = ::wxGetDisplaySize(); // default, probably reasonable, but // maybe not accurate if (!java_vm) return sz_ret; @@ -3410,7 +3391,7 @@ int androidApplySettingsString(wxString settings, ArrayOfCDI *pACDI) { } if (b_action && cp) { // something to do? -//FIXME (dave) +// FIXME (dave) #if 0 // Terminate and remove any existing stream with the same port name @@ -3520,7 +3501,7 @@ int androidApplySettingsString(wxString settings, ArrayOfCDI *pACDI) { } if (b_action && cp) { // something to do? -//FIXME (dave) +// FIXME (dave) #if 0 rr |= NEED_NEW_OPTIONS; @@ -3554,12 +3535,12 @@ int androidApplySettingsString(wxString settings, ArrayOfCDI *pACDI) { cp->b_IsSetup = true; } #endif - } } - } // found pref + } + } // found pref - i++; - } // while + i++; + } // while return rr; } @@ -3762,12 +3743,13 @@ wxString getFontQtStylesheet(wxFont *font) { return qstyle; } -bool androidPlaySound(const wxString soundfile, AndroidSound* sound) { +bool androidPlaySound(const wxString soundfile, AndroidSound *sound) { DEBUG_LOG << "androidPlaySound"; std::ostringstream oss; oss << sound; wxString wxSound(oss.str()); - wxString result = callActivityMethod_s2s("playSound", soundfile, wxSound.Mid(2)); + wxString result = + callActivityMethod_s2s("playSound", soundfile, wxSound.Mid(2)); return true; } @@ -3796,7 +3778,8 @@ wxString androidGetSupplementalLicense(void) { wxArrayString androidTraverseDir(wxString dir, wxString filespec) { wxArrayString result; - if (g_Android_SDK_Version != 17) // skip unless running Android 4.2.2, especially Samsung... + if (g_Android_SDK_Version != + 17) // skip unless running Android 4.2.2, especially Samsung... return result; wxString ir = @@ -4039,7 +4022,6 @@ QScrollBar::sub-line:vertical {\ subcontrol-origin: margin;\ }"; - QString qtStyleSheetWideScrollBars = "QScrollBar:horizontal {\ border: 0px solid grey;\ @@ -4301,11 +4283,11 @@ wxBitmap loadAndroidSVG(const wxString filename, unsigned int width, fn.SetExt(_T("png")); // Try to find the target image, at the proper resolution. - if(fn.FileExists()){ + if (fn.FileExists()) { wxBitmap bmp_test(fn.GetFullPath(), wxBITMAP_TYPE_PNG); - if(bmp_test.IsOk()){ - if((bmp_test.GetWidth() == (int)width) && (bmp_test.GetHeight() == - (int)height)) + if (bmp_test.IsOk()) { + if ((bmp_test.GetWidth() == (int)width) && + (bmp_test.GetHeight() == (int)height)) return bmp_test; } } @@ -4538,88 +4520,70 @@ Java_org_opencpn_OCPNNativeLib_ScheduleCleanExit(JNIEnv *env, jobject obj) { } } -void CheckMigrateCharts() -{ +void CheckMigrateCharts() { qDebug() << "CheckMigrateCharts"; - if (g_Android_SDK_Version < 30) // Only on Android/11 + + if (g_Android_SDK_Version < 30) // Only on Android/11 + return; // Force access to correct home directory, as a hint.... pInit_Chart_Dir->Clear(); // Scan the config file chart directory array. - wxArrayString chartDirs = GetConfigChartDirectories(); //GetChartDirArrayString(); + wxArrayString chartDirs = + GetConfigChartDirectories(); // GetChartDirArrayString(); wxArrayString migrateDirs; qDebug() << chartDirs.GetCount(); - for (unsigned int i=0; i < chartDirs.GetCount(); i++){ + for (unsigned int i = 0; i < chartDirs.GetCount(); i++) { qDebug() << chartDirs[i].mb_str(); bool bOK = false; - if ( chartDirs[i].StartsWith(g_androidGetFilesDirs0) ) + if (chartDirs[i].StartsWith(g_androidGetFilesDirs0)) bOK = true; - else if (!g_androidGetFilesDirs1.StartsWith("?")){ - if ( chartDirs[i].StartsWith(g_androidGetFilesDirs1) ) - bOK = true; + else if (!g_androidGetFilesDirs1.StartsWith("?")) { + if (chartDirs[i].StartsWith(g_androidGetFilesDirs1)) bOK = true; } if (!bOK) { migrateDirs.Add(chartDirs[i]); } } - if (!migrateDirs.GetCount()) - return; - + if (!migrateDirs.GetCount()) return; // Run the chart migration assistant g_migrateDialog = new MigrateAssistantDialog(gFrame, false); - g_migrateDialog->SetSize( gFrame->GetSize()); + g_migrateDialog->SetSize(gFrame->GetSize()); g_migrateDialog->Centre(); g_migrateDialog->Raise(); g_migrateDialog->ShowModal(); - - } -wxString androidGetDownloadDirectory() -{ - return g_androidDownloadDirectory; -} +wxString androidGetDownloadDirectory() { return g_androidDownloadDirectory; } +wxString WrapText(wxWindow *win, const wxString &text, int widthMax) { + class HardBreakWrapper : public wxTextWrapper { + public: + HardBreakWrapper(wxWindow *win, const wxString &text, int widthMax) { + Wrap(win, text, widthMax); + } + wxString const &GetWrapped() const { return m_wrapped; } + protected: + virtual void OnOutputLine(const wxString &line) { m_wrapped += line; } + virtual void OnNewLine() { m_wrapped += '\n'; } -wxString WrapText(wxWindow *win, const wxString& text, int widthMax) -{ - class HardBreakWrapper : public wxTextWrapper - { - public: - HardBreakWrapper(wxWindow *win, const wxString& text, int widthMax) - { - Wrap(win, text, widthMax); - } - wxString const& GetWrapped() const { return m_wrapped; } - protected: - virtual void OnOutputLine(const wxString& line) - { - m_wrapped += line; - } - virtual void OnNewLine() - { - m_wrapped += '\n'; - } - private: - wxString m_wrapped; - }; - HardBreakWrapper wrapper(win, text, widthMax); - return wrapper.GetWrapped(); + private: + wxString m_wrapped; + }; + HardBreakWrapper wrapper(win, text, widthMax); + return wrapper.GetWrapped(); } /////////////////////////////////////////////////////////////////////////////// /// Class MigrateAssistantDialog Implementation /////////////////////////////////////////////////////////////////////////////// - BEGIN_EVENT_TABLE(MigrateAssistantDialog, wxDialog) EVT_BUTTON(ID_MIGRATE_CANCEL, MigrateAssistantDialog::OnMigrateCancelClick) EVT_BUTTON(ID_MIGRATE_OK, MigrateAssistantDialog::OnMigrateOKClick) @@ -4628,13 +4592,13 @@ EVT_BUTTON(ID_MIGRATE_CONTINUE, MigrateAssistantDialog::OnMigrate1Click) EVT_TIMER(MIGRATION_STATUS_TIMER, MigrateAssistantDialog::onTimerEvent) END_EVENT_TABLE() -MigrateAssistantDialog::MigrateAssistantDialog(wxWindow* parent, bool bskipScan, - wxWindowID id, const wxString& caption, - const wxPoint& pos, const wxSize& size, - long style) +MigrateAssistantDialog::MigrateAssistantDialog(wxWindow *parent, bool bskipScan, + wxWindowID id, + const wxString &caption, + const wxPoint &pos, + const wxSize &size, long style) : wxDialog(parent, id, caption, pos, size, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) -{ + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { m_Status = ""; m_permissionResult = ""; m_bsdcard = false; @@ -4651,34 +4615,30 @@ MigrateAssistantDialog::MigrateAssistantDialog(wxWindow* parent, bool bskipScan, Centre(); } -MigrateAssistantDialog::~MigrateAssistantDialog(void) { - -} - +MigrateAssistantDialog::~MigrateAssistantDialog(void) {} void MigrateAssistantDialog::CreateControls(void) { - wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL); SetSizer(mainSizer); - wxStaticBox* mmsiBox = - new wxStaticBox(this, wxID_ANY, _("OpenCPN for Android Migration Assistant")); + wxStaticBox *mmsiBox = new wxStaticBox( + this, wxID_ANY, _("OpenCPN for Android Migration Assistant")); - wxStaticBoxSizer* infoSizer = new wxStaticBoxSizer(mmsiBox, wxVERTICAL); + wxStaticBoxSizer *infoSizer = new wxStaticBoxSizer(mmsiBox, wxVERTICAL); mainSizer->Add(infoSizer, 0, wxEXPAND | wxALL, 5); m_infoText = NULL; - if (!m_bskipScan){ + if (!m_bskipScan) { // Scan the chart directory array from the config file. wxArrayString chartDirs = GetConfigChartDirectories(); - for (unsigned int i=0; i < chartDirs.GetCount(); i++){ + for (unsigned int i = 0; i < chartDirs.GetCount(); i++) { bool bOK = false; - if ( chartDirs[i].StartsWith(g_androidGetFilesDirs0) ) + if (chartDirs[i].StartsWith(g_androidGetFilesDirs0)) bOK = true; - else if (!g_androidGetFilesDirs1.StartsWith("?")){ - if ( chartDirs[i].StartsWith(g_androidGetFilesDirs1) ) - bOK = true; + else if (!g_androidGetFilesDirs1.StartsWith("?")) { + if (chartDirs[i].StartsWith(g_androidGetFilesDirs1)) bOK = true; } if (!bOK) { m_migrateDirs.Add(chartDirs[i]); @@ -4686,96 +4646,116 @@ void MigrateAssistantDialog::CreateControls(void) { } } - if (m_migrateDirs.GetCount()){ - wxString infoText1(_("OpenCPN has detected chart folders in your configuration file that cannot be accessed on this version of Android")); + if (m_migrateDirs.GetCount()) { + wxString infoText1( + _("OpenCPN has detected chart folders in your configuration file that " + "cannot be accessed on this version of Android")); - wxString infoText1w = WrapText(this, infoText1, gFrame->GetSize().x * 95 / 100); + wxString infoText1w = + WrapText(this, infoText1, gFrame->GetSize().x * 95 / 100); m_infoText = new wxStaticText(this, wxID_STATIC, infoText1w); - infoSizer->AddSpacer( 1 * GetCharWidth()); + infoSizer->AddSpacer(1 * GetCharWidth()); infoSizer->Add(m_infoText, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 10); - infoSizer->AddSpacer( 1 * GetCharWidth()); + infoSizer->AddSpacer(1 * GetCharWidth()); wxString dirsMsg; - for (unsigned int i=0; i < m_migrateDirs.GetCount(); i++){ + for (unsigned int i = 0; i < m_migrateDirs.GetCount(); i++) { dirsMsg += wxString(" "); dirsMsg += m_migrateDirs[i]; dirsMsg += wxString("\n"); } - //dirsMsg += wxString("\n"); + // dirsMsg += wxString("\n"); m_infoDirs = new wxStaticText(this, wxID_STATIC, dirsMsg); infoSizer->Add(m_infoDirs, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 10); - wxString migrateMsg1 = _("OpenCPN can copy these chart folders to a suitable location, if desired."); + wxString migrateMsg1 = + _("OpenCPN can copy these chart folders to a suitable location, if " + "desired."); migrateMsg1 += "\n\n"; - migrateMsg1 += _("To proceed with chart folder migration, choose the chart source folder, and follow the instructions given."); + migrateMsg1 += + _("To proceed with chart folder migration, choose the chart source " + "folder, and follow the instructions given."); - wxString migrateMsg1w = WrapText(this, migrateMsg1, gFrame->GetSize().x * 95/ 100); + wxString migrateMsg1w = + WrapText(this, migrateMsg1, gFrame->GetSize().x * 95 / 100); m_migrateStep1 = new wxStaticText(this, wxID_STATIC, migrateMsg1w); - infoSizer->Add(m_migrateStep1, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 10); - - } - else { + infoSizer->Add(m_migrateStep1, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, + 10); - wxString migrateMsg1 = _("Some chart folders may be inaccessible to OpenCPN on this version of Android. "); - migrateMsg1 += _("OpenCPN can copy these chart folders to a suitable location, if desired."); + } else { + wxString migrateMsg1 = + _("Some chart folders may be inaccessible to OpenCPN on this version " + "of Android. "); + migrateMsg1 += + _("OpenCPN can copy these chart folders to a suitable location, if " + "desired."); migrateMsg1 += "\n\n"; - migrateMsg1 += _("To proceed with chart folder migration, choose the chart source folder, and follow the instructions given."); + migrateMsg1 += + _("To proceed with chart folder migration, choose the chart source " + "folder, and follow the instructions given."); - wxString migrateMsg1w = WrapText(this, migrateMsg1, gFrame->GetSize().x * 9 / 10); + wxString migrateMsg1w = + WrapText(this, migrateMsg1, gFrame->GetSize().x * 9 / 10); m_migrateStep1 = new wxStaticText(this, wxID_STATIC, migrateMsg1w); - infoSizer->Add(m_migrateStep1, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 10); + infoSizer->Add(m_migrateStep1, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, + 10); } - mainSizer->AddSpacer( 1 * GetCharWidth()); + mainSizer->AddSpacer(1 * GetCharWidth()); // Is SDCard available? - if (!g_androidGetFilesDirs1.StartsWith("?")){ - - wxStaticBoxSizer* sourceSizer = new wxStaticBoxSizer( + if (!g_androidGetFilesDirs1.StartsWith("?")) { + wxStaticBoxSizer *sourceSizer = new wxStaticBoxSizer( new wxStaticBox(this, wxID_ANY, _("Migrate destination")), wxVERTICAL); mainSizer->Add(sourceSizer, 0, wxEXPAND | wxALL, 5); - mainSizer->AddSpacer( 2 * GetCharWidth()); + mainSizer->AddSpacer(2 * GetCharWidth()); - m_radioInternal = new wxRadioButton (this, wxID_ANY, _("OpenCPN Internal Storage"),wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - sourceSizer->Add( m_radioInternal, 0, /*wxEXPAND |*/ wxALL | wxALIGN_CENTER_HORIZONTAL, 5); + m_radioInternal = + new wxRadioButton(this, wxID_ANY, _("OpenCPN Internal Storage"), + wxDefaultPosition, wxDefaultSize, wxRB_GROUP); + sourceSizer->Add(m_radioInternal, 0, + /*wxEXPAND |*/ wxALL | wxALIGN_CENTER_HORIZONTAL, 5); - m_radioSDCard = new wxRadioButton (this, wxID_ANY, _("OpenCPN SDCard Storage"),wxDefaultPosition, wxDefaultSize); - sourceSizer->Add( m_radioSDCard, 0, /*wxEXPAND |*/ wxALL | wxALIGN_CENTER_HORIZONTAL, 5); + m_radioSDCard = + new wxRadioButton(this, wxID_ANY, _("OpenCPN SDCard Storage"), + wxDefaultPosition, wxDefaultSize); + sourceSizer->Add(m_radioSDCard, 0, + /*wxEXPAND |*/ wxALL | wxALIGN_CENTER_HORIZONTAL, 5); - m_radioInternal->SetValue( true ); + m_radioInternal->SetValue(true); } - // control buttons - m_migrateButton = new wxButton(this, ID_MIGRATE_START, _("Choose chart source folder.")); + m_migrateButton = + new wxButton(this, ID_MIGRATE_START, _("Choose chart source folder.")); mainSizer->Add(m_migrateButton, 0, wxEXPAND | wxALL, 5); - //mainSizer->AddSpacer( 1 * GetCharWidth()); + // mainSizer->AddSpacer( 1 * GetCharWidth()); statusSizer = new wxStaticBoxSizer( - new wxStaticBox(this, wxID_ANY, _("Status")), wxVERTICAL); - mainSizer->Add(statusSizer, 0, wxEXPAND | wxALL, 5); + new wxStaticBox(this, wxID_ANY, _("Status")), wxVERTICAL); + mainSizer->Add(statusSizer, 0, wxEXPAND | wxALL, 5); + m_ipGauge = new InProgressIndicator( + this, wxID_ANY, 100, wxDefaultPosition, + wxSize(gFrame->GetSize().x * 8 / 10, gFrame->GetCharHeight() * 2)); + statusSizer->Add(m_ipGauge, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, 5); - m_ipGauge = new InProgressIndicator(this, wxID_ANY, 100, wxDefaultPosition, - wxSize(gFrame->GetSize().x * 8 / 10, gFrame->GetCharHeight() * 2)); - statusSizer->Add(m_ipGauge, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5); - - mainSizer->AddSpacer( 1 * GetCharWidth()); + mainSizer->AddSpacer(1 * GetCharWidth()); m_statusText = new wxStaticText(this, wxID_STATIC, m_Status); statusSizer->Add(m_statusText, 0, wxEXPAND | wxALL, 5); GetSizer()->Hide(statusSizer); - wxBoxSizer* btnSizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer *btnSizer = new wxBoxSizer(wxHORIZONTAL); mainSizer->Add(btnSizer, 0, wxALIGN_RIGHT | wxALL, 5); m_CancelButton = new wxButton(this, ID_MIGRATE_CANCEL, _("Cancel")); m_CancelButton->SetDefault(); @@ -4784,42 +4764,37 @@ void MigrateAssistantDialog::CreateControls(void) { m_OKButton = new wxButton(this, ID_MIGRATE_OK, _("OK")); btnSizer->Add(m_OKButton, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); m_OKButton->Hide(); - } - -void MigrateAssistantDialog::OnMigrateCancelClick(wxCommandEvent& event) { - +void MigrateAssistantDialog::OnMigrateCancelClick(wxCommandEvent &event) { m_statusTimer.Stop(); callActivityMethod_vs("cancelMigration"); EndModal(wxID_CANCEL); } -void MigrateAssistantDialog::OnMigrateOKClick(wxCommandEvent& event) { +void MigrateAssistantDialog::OnMigrateOKClick(wxCommandEvent &event) { EndModal(wxID_OK); } -void MigrateAssistantDialog::OnMigrateClick(wxCommandEvent& event) -{ - - wxString clickText1(_("On the next page, find and choose the root folder containing chart files to migrate\n\n\ +void MigrateAssistantDialog::OnMigrateClick(wxCommandEvent &event) { + wxString clickText1(_( + "On the next page, find and choose the root folder containing chart files to migrate\n\n\ Example: /storage/emulated/0/Charts\n\n")); clickText1 += _("This entire folder will be migrated.\n"); clickText1 += _("Proceed?"); - if (wxID_OK == OCPNMessageBox( - NULL, clickText1, _("OpenCPN for Android Migration Assistant"), wxOK | wxCANCEL )){ - - if(m_infoText) m_infoText->Hide(); + if (wxID_OK == OCPNMessageBox(NULL, clickText1, + _("OpenCPN for Android Migration Assistant"), + wxOK | wxCANCEL)) { + if (m_infoText) m_infoText->Hide(); m_migrateStep1->Hide(); GetSizer()->Show(statusSizer); Layout(); if (g_androidUtilHandler) { - m_Status = _("Waiting for permission grant...."); - setStatus( m_Status ); + setStatus(m_Status); g_androidUtilHandler->m_eventTimer.Stop(); g_androidUtilHandler->m_migratePermissionSetDone = false; @@ -4836,143 +4811,131 @@ Example: /storage/emulated/0/Charts\n\n")); } } -void MigrateAssistantDialog::OnMigrate1Click(wxCommandEvent& event) { - +void MigrateAssistantDialog::OnMigrate1Click(wxCommandEvent &event) { // Construct the migration arguments - //Destination is either internal, or SDCard, if available - if( !m_bsdcard ) + // Destination is either internal, or SDCard, if available + if (!m_bsdcard) m_migrateDestinationFolder = g_androidGetFilesDirs0 + "/Charts"; else m_migrateDestinationFolder = g_androidGetFilesDirs1 + "/Charts"; qDebug() << "m_migrateSourceFolder" << m_migrateSourceFolder.mb_str(); - qDebug() << "m_migrateDestinationFolder" << m_migrateDestinationFolder.mb_str(); + qDebug() << "m_migrateDestinationFolder" + << m_migrateDestinationFolder.mb_str(); wxString activityResult; - activityResult = callActivityMethod_s2s("migrateFolder", m_migrateSourceFolder, m_migrateDestinationFolder); + activityResult = callActivityMethod_s2s( + "migrateFolder", m_migrateSourceFolder, m_migrateDestinationFolder); m_Status = _("Migration started..."); - setStatus( m_Status ); + setStatus(m_Status); m_statusTimer.Start(500, wxTIMER_CONTINUOUS); m_ipGauge->Show(); Layout(); - - } -void MigrateAssistantDialog::onPermissionGranted( wxString result ) { +void MigrateAssistantDialog::onPermissionGranted(wxString result) { m_permissionResult = result; qDebug() << "onPermissionGranted " << result.mb_str(); - if(result.StartsWith("file")){ + if (result.StartsWith("file")) { m_migrateSourceFolder = result.Mid(5); m_Status = _("Permission granted to "); m_Status += m_migrateSourceFolder; - setStatus( m_Status ); + setStatus(m_Status); // Carry on to the next step m_migrateButton->Hide(); Layout(); // Capture the destination - if(m_radioSDCard) - m_bsdcard = m_radioSDCard->GetValue(); + if (m_radioSDCard) m_bsdcard = m_radioSDCard->GetValue(); - wxString clickText2(_("OpenCPN has obtained temporary permission to access the selected chart folders.")); + wxString clickText2( + _("OpenCPN has obtained temporary permission to access the selected " + "chart folders.")); clickText2 += "\n\n"; clickText2 += _("Chart migration is ready to proceed."); clickText2 += "\n\n"; clickText2 += _("Source: "); clickText2 += m_migrateSourceFolder; clickText2 += "\n\n"; - if(!m_bsdcard) + if (!m_bsdcard) clickText2 += _("Destination: OpenCPN Internal Storage"); else clickText2 += _("Destination: OpenCPN SDCard Storage"); clickText2 += "\n\n"; clickText2 += _("Migrate charts now?"); - - - if (wxID_OK == OCPNMessageBox( - NULL, clickText2, _("OpenCPN for Android Migration Assistant"), wxOK | wxCANCEL )){ - + if (wxID_OK == OCPNMessageBox(NULL, clickText2, + _("OpenCPN for Android Migration Assistant"), + wxOK | wxCANCEL)) { wxCommandEvent evt(wxEVT_BUTTON); evt.SetId(ID_MIGRATE_CONTINUE); AddPendingEvent(evt); - } - else{ - m_Status = ""; - setStatus( m_Status ); + } else { + m_Status = ""; + setStatus(m_Status); - m_migrateButton->Show(); - Layout(); + m_migrateButton->Show(); + Layout(); } - } - else{ + } else { m_Status = ""; - setStatus( m_Status ); + setStatus(m_Status); } - } -void MigrateAssistantDialog::onTimerEvent(wxTimerEvent &event) -{ - // Get and show the current status from Java upstream - qDebug() << "Migration: onTimerEvent"; - - m_Status = callActivityMethod_vs("getMigrateStatus"); - setStatus( m_Status ); - - if (m_Status.StartsWith("Counting")) - m_ipGauge->Pulse(); - - if (m_Status.StartsWith("Migrating")){ - wxString prog = m_Status.Mid(10); - //qDebug() << prog.mb_str(); - wxString np = prog.BeforeFirst('/'); - //qDebug() << np.mb_str(); - wxString np1 = prog.AfterFirst('/'); - wxString np2 = np1.BeforeFirst(';'); - //qDebug() << np2.mb_str(); - - long i, n; - np.ToLong(&i); - np2.ToLong(&n); - if (m_ipGauge->GetRange() != n) - m_ipGauge->SetRange( n ); - m_ipGauge->SetValue( i ); - } - +void MigrateAssistantDialog::onTimerEvent(wxTimerEvent &event) { + // Get and show the current status from Java upstream + qDebug() << "Migration: onTimerEvent"; + m_Status = callActivityMethod_vs("getMigrateStatus"); + setStatus(m_Status); + if (m_Status.StartsWith("Counting")) m_ipGauge->Pulse(); - // Finished? - if (m_Status.Contains("Migration complete")){ - m_statusTimer.Stop(); + if (m_Status.StartsWith("Migrating")) { + wxString prog = m_Status.Mid(10); + // qDebug() << prog.mb_str(); + wxString np = prog.BeforeFirst('/'); + // qDebug() << np.mb_str(); + wxString np1 = prog.AfterFirst('/'); + wxString np2 = np1.BeforeFirst(';'); + // qDebug() << np2.mb_str(); - wxString clickText3(_("Chart migration is finished.")); - clickText3 += "\n\n"; - clickText3 += _("Migrated chart folders are now accessible to OpenCPN."); - clickText3 += "\n"; - clickText3 += _("You may need to adjust your chart folders further, to accommodate individual chart groups"); - clickText3 += "\n\n"; - clickText3 += _("OpenCPN will now restart to apply changes."); - - if (wxID_OK == OCPNMessageBox( - NULL, clickText3, _("OpenCPN for Android Migration Assistant"), wxOK )){ - - FinishMigration(); + long i, n; + np.ToLong(&i); + np2.ToLong(&n); + if (m_ipGauge->GetRange() != n) m_ipGauge->SetRange(n); + m_ipGauge->SetValue(i); + } - } + // Finished? + if (m_Status.Contains("Migration complete")) { + m_statusTimer.Stop(); + + wxString clickText3(_("Chart migration is finished.")); + clickText3 += "\n\n"; + clickText3 += _("Migrated chart folders are now accessible to OpenCPN."); + clickText3 += "\n"; + clickText3 += + _("You may need to adjust your chart folders further, to accommodate " + "individual chart groups"); + clickText3 += "\n\n"; + clickText3 += _("OpenCPN will now restart to apply changes."); + + if (wxID_OK == OCPNMessageBox(NULL, clickText3, + _("OpenCPN for Android Migration Assistant"), + wxOK)) { + FinishMigration(); } - + } } -wxArrayString GetConfigChartDirectories() -{ +wxArrayString GetConfigChartDirectories() { wxArrayString rv; pConfig->SetPath(_T ( "/ChartDirectories" )); int iDirMax = pConfig->GetNumberOfEntries(); @@ -4984,60 +4947,55 @@ wxArrayString GetConfigChartDirectories() pConfig->Read(str, &val); // Get a Directory name rv.Add(val.BeforeFirst('^')); bCont = pConfig->GetNextEntry(str, dummy); - } } return rv; } +void MigrateAssistantDialog::FinishMigration() { + m_Status = _("Finishing migration"); + setStatus(m_Status); -void MigrateAssistantDialog::FinishMigration() -{ - m_Status = _("Finishing migration"); - setStatus( m_Status ); - - // Craft the migrated (destination) folder - - qDebug() << "m_migrateSourceFolder " << m_migrateSourceFolder.mb_str(); - qDebug() << "m_migrateDestinationFolder " << m_migrateDestinationFolder.mb_str(); - - - - // Edit the config file, removing old inaccessible folders, - // and adding migrated folders. + // Craft the migrated (destination) folder - wxArrayString finalArray; - wxArrayString chartDirs = GetConfigChartDirectories(); //ChartData->GetChartDirArrayString(); - for (unsigned int i=0; i < chartDirs.GetCount(); i++){ + qDebug() << "m_migrateSourceFolder " << m_migrateSourceFolder.mb_str(); + qDebug() << "m_migrateDestinationFolder " + << m_migrateDestinationFolder.mb_str(); - //qDebug() << "Checking: " << chartDirs[i].mb_str(); + // Edit the config file, removing old inaccessible folders, + // and adding migrated folders. - // Leave the OK folders - bool bOK = false; - if ( chartDirs[i].StartsWith(g_androidGetFilesDirs0) ) - bOK = true; + wxArrayString finalArray; + wxArrayString chartDirs = + GetConfigChartDirectories(); // ChartData->GetChartDirArrayString(); + for (unsigned int i = 0; i < chartDirs.GetCount(); i++) { + // qDebug() << "Checking: " << chartDirs[i].mb_str(); - else if (!g_androidGetFilesDirs1.StartsWith("?")){ - if ( chartDirs[i].StartsWith(g_androidGetFilesDirs1) ) - bOK = true; - } + // Leave the OK folders + bool bOK = false; + if (chartDirs[i].StartsWith(g_androidGetFilesDirs0)) + bOK = true; - // Check inaccessible folders to see if they were (part of) the migration - if (!bOK) { - if(!chartDirs[i].StartsWith(m_migrateSourceFolder)) // not part of migration - bOK = true; // so, keep it. - // To be migrated on next round - } + else if (!g_androidGetFilesDirs1.StartsWith("?")) { + if (chartDirs[i].StartsWith(g_androidGetFilesDirs1)) bOK = true; + } - if(bOK){ - //qDebug() << "Add: " << chartDirs[i].mb_str(); - finalArray.Add(chartDirs[i]); - } + // Check inaccessible folders to see if they were (part of) the migration + if (!bOK) { + if (!chartDirs[i].StartsWith( + m_migrateSourceFolder)) // not part of migration + bOK = true; // so, keep it. + // To be migrated on next round + } + if (bOK) { + // qDebug() << "Add: " << chartDirs[i].mb_str(); + finalArray.Add(chartDirs[i]); } + } - finalArray.Add(m_migrateDestinationFolder + "/MigratedCharts"); + finalArray.Add(m_migrateDestinationFolder + "/MigratedCharts"); #if 0 // Now manage the migrate folder @@ -5098,77 +5056,63 @@ void MigrateAssistantDialog::FinishMigration() } #endif - for (unsigned int j=0 ; j < finalArray.GetCount() ; j++){ - qDebug() << "finalEntry: " << finalArray[j].mb_str(); - } - - - // Now delete and replace the chart directory list in the config file - wxRemoveFile(ChartListFileName); + for (unsigned int j = 0; j < finalArray.GetCount(); j++) { + qDebug() << "finalEntry: " << finalArray[j].mb_str(); + } - pConfig->SetPath(_T ( "/ChartDirectories" )); - pConfig->DeleteGroup(_T ( "/ChartDirectories" )); + // Now delete and replace the chart directory list in the config file + wxRemoveFile(ChartListFileName); - pConfig->SetPath(_T ( "/ChartDirectories" )); - for (int iDir = 0; iDir < finalArray.GetCount(); iDir++) { - wxString dirn = finalArray[iDir]; - dirn.Append(_T("^")); + pConfig->SetPath(_T ( "/ChartDirectories" )); + pConfig->DeleteGroup(_T ( "/ChartDirectories" )); - wxString str_buf; - str_buf.Printf(_T ( "ChartDir%d" ), iDir + 1); - pConfig->Write(str_buf, dirn); - } - pConfig->Flush(); + pConfig->SetPath(_T ( "/ChartDirectories" )); + for (int iDir = 0; iDir < finalArray.GetCount(); iDir++) { + wxString dirn = finalArray[iDir]; + dirn.Append(_T("^")); - // Restart - callActivityMethod_vs("restartOCPNAfterMigrate"); + wxString str_buf; + str_buf.Printf(_T ( "ChartDir%d" ), iDir + 1); + pConfig->Write(str_buf, dirn); + } + pConfig->Flush(); + // Restart + callActivityMethod_vs("restartOCPNAfterMigrate"); } - BEGIN_EVENT_TABLE( InProgressIndicator, wxGauge ) - EVT_TIMER( 4356, InProgressIndicator::OnTimer ) - END_EVENT_TABLE() - - InProgressIndicator::InProgressIndicator() - { - } +BEGIN_EVENT_TABLE(InProgressIndicator, wxGauge) +EVT_TIMER(4356, InProgressIndicator::OnTimer) +END_EVENT_TABLE() - InProgressIndicator::InProgressIndicator(wxWindow* parent, wxWindowID id, int range, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator, const wxString& name) -{ - wxGauge::Create(parent, id, range, pos, size, style, validator, name); +InProgressIndicator::InProgressIndicator() {} - m_timer.SetOwner( this, 4356 ); +InProgressIndicator::InProgressIndicator(wxWindow *parent, wxWindowID id, + int range, const wxPoint &pos, + const wxSize &size, long style, + const wxValidator &validator, + const wxString &name) { + wxGauge::Create(parent, id, range, pos, size, style, validator, name); - SetValue(0); - m_bAlive = false; + m_timer.SetOwner(this, 4356); + SetValue(0); + m_bAlive = false; } -InProgressIndicator::~InProgressIndicator() -{ - Stop(); -} +InProgressIndicator::~InProgressIndicator() { Stop(); } -void InProgressIndicator::OnTimer(wxTimerEvent &evt) -{ - if(m_bAlive) - Pulse(); +void InProgressIndicator::OnTimer(wxTimerEvent &evt) { + if (m_bAlive) Pulse(); } - -void InProgressIndicator::Start() -{ - m_bAlive = true; - m_timer.Start( 50 ); - +void InProgressIndicator::Start() { + m_bAlive = true; + m_timer.Start(50); } -void InProgressIndicator::Stop() -{ - m_bAlive = false; - SetValue(0); - m_timer.Stop(); - +void InProgressIndicator::Stop() { + m_bAlive = false; + SetValue(0); + m_timer.Stop(); } diff --git a/buildandroid/ndk/README.txt b/buildandroid/ndk/README.txt new file mode 100644 index 0000000000..9f316210ef --- /dev/null +++ b/buildandroid/ndk/README.txt @@ -0,0 +1,5 @@ +The file "linux-atomic.o" was extracted from libgcc.a found in recent Android NDK before the global change to LLVM/Clang. + +$ ar -x android-ndk-r17c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a + +This module must be included on armv7a build of OpenCPN NDK library to avoid undefined errors related to "__sync_fetch_and_add_4". diff --git a/buildandroid/ndk/linux-atomic.o b/buildandroid/ndk/linux-atomic.o new file mode 100644 index 0000000000..2463b3d26e Binary files /dev/null and b/buildandroid/ndk/linux-atomic.o differ diff --git a/buildwin/winConfig.bat b/buildwin/winConfig.bat index 016888a9a7..7dfd89d093 100644 --- a/buildwin/winConfig.bat +++ b/buildwin/winConfig.bat @@ -286,6 +286,18 @@ if errorlevel 1 (@echo NOT OK) else ( xcopy /e /q /y "%buildWINtmp%\OCPNWindowsCoreBuildSupport-0.3\buildwin" "%CACHE_DIR%\buildwin" if errorlevel 1 (@echo NOT OK) else (echo OK)) :skipbuildwin +set URL="https://dl.cloudsmith.io/public/david-register/opencpn-docs/raw/files/QuickStartGuide-v0.4.zip" +set "DEST=%CACHE_DIR%\QuickStartManual.zip" +if not exist "%DEST%" ( + @echo Downloading quickstart manual + call :download + if exist "%CACHE_DIR%\..\data\doc\local" rmdir /s /q "%CACHE_DIR%\..\data\doc\local" + mkdir "%CACHE_DIR%\..\data\doc\local" + set "SOURCE=%DEST%" + set "DEST=%CACHE_DIR%\..\data\doc\local" + @echo Exploding quickstart manual + call :explode +) ::------------------------------------------------------------- :: Download wxWidgets sources ::------------------------------------------------------------- @@ -591,7 +603,7 @@ if exist %DEST% ( ) %PSH% -Command [System.Net.ServicePointManager]::MaxServicePointIdleTime = 5000000; ^ if ($PSVersionTable.PSVersion.Major -lt 6) { $ProgressPreference = 'SilentlyContinue' }; ^ - Invoke-WebRequest "%URL%" -OutFile '%DEST%'; ^ + Invoke-WebRequest '%URL%' -OutFile '%DEST%'; ^ exit $LASTEXITCODE if errorlevel 1 (@echo Download failed && pause && exit /b 1) else (@echo Download OK) exit /b 0 diff --git a/buildwin/win_deps.bat b/buildwin/win_deps.bat index 22966b9009..398a909a26 100644 --- a/buildwin/win_deps.bat +++ b/buildwin/win_deps.bat @@ -54,12 +54,12 @@ set "GH_DL_BASE=https://github.com/OpenCPN/OCPNWindowsCoreBuildSupport" set "opencpn_support_base=https://dl.cloudsmith.io/public/alec-leamas" if not exist %CACHE_DIR%\buildwin\libcurl.dll ( wget -nv -O !CACHE_DIR!\OCPNWindowsCoreBuildSupport.zip ^ - %GH_DL_BASE%/archive/refs/tags/v0.3.zip + %GH_DL_BASE%/archive/refs/tags/v0.5.zip 7z x -y !CACHE_DIR!\OCPNWindowsCoreBuildSupport.zip ^ -o%CACHE_DIR%\buildwintemp if not exist !CACHE_DIR!\buildwin (mkdir !CACHE_DIR!\buildwin) xcopy ^ - !CACHE_DIR!\buildwintemp\OCPNWindowsCoreBuildSupport-0.3\buildwin ^ + !CACHE_DIR!\buildwintemp\OCPNWindowsCoreBuildSupport-0.5\buildwin ^ !CACHE_DIR!\buildwin /s /y /q if exist !CACHE_DIR!\buildwin\wxWidgets ( del !CACHE_DIR!\buildwin\wxWidgets\*.dll /q @@ -67,3 +67,8 @@ if not exist %CACHE_DIR%\buildwin\libcurl.dll ( wget !opencpn_support_base!/opencpn-support/raw/files/iphlpapi.lib ^ -O %CACHE_DIR%\buildwin\iphlpapi.lib ) + +wget -nv -O !CACHE_DIR!\QuickStartGuide.zip ^ + https://dl.cloudsmith.io/public/david-register/opencpn-docs/raw/files/QuickStartGuide-v0.4.zip +if not exist %CACHE_DIR%\..\data\doc\local (mkdir %CACHE_DIR%\..\data\doc\local) +7z x -y !CACHE_DIR!\QuickStartGuide.zip -o%CACHE_DIR%\..\data\doc\local diff --git a/ci/appveyor.bat b/ci/appveyor.bat index 4bdc4500ac..7fced26933 100644 --- a/ci/appveyor.bat +++ b/ci/appveyor.bat @@ -58,10 +58,13 @@ cmake -A Win32 -G "Visual Studio 17 2022" ^ -DOCPN_RELEASE=0 ^ -DCMAKE_INSTALL_PREFIX="%cd%/test/%CONFIGURATION%" ^ -DOCPN_BUILD_TEST=ON ^ + .. cmake --build . --target package --config %CONFIGURATION% +type N:\build\_CPack_Packages\win32\NSIS\NSISOutput.log + :: Compress pdb and mark with git hash @echo on "C:\Program Files\Git\bin\bash" -c ^ diff --git a/ci/circleci-build-flatpak.sh b/ci/circleci-build-flatpak.sh index 3e61a5676e..b9ede6d95c 100755 --- a/ci/circleci-build-flatpak.sh +++ b/ci/circleci-build-flatpak.sh @@ -18,6 +18,9 @@ if [ "$current_branch" != "master" ]; then git branch -m $current_branch master fi +# https://stackoverflow.com/questions/74486167 +git config --global protocol.file.allow always + # Use most updated flatpak PPA wget -q -O - https://dl.google.com/linux/linux_signing_key.pub \ | sudo apt-key add - @@ -33,8 +36,13 @@ sudo apt install --reinstall ca-certificates sudo apt install -q -y appstream flatpak flatpak-builder git ccrypt make rsync gnupg2 # Set up flatpak -runtime=$(sed -n '/runtime-version/s/.*://p' flatpak/org.opencpn.OpenCPN.yaml) +git submodule update --init flatpak/org.opencpn.OpenCPN +git submodule update --remote --merge flatpak/org.opencpn.OpenCPN +runtime=$(sed -n '/runtime-version/s/.*://p' \ + flatpak/org.opencpn.OpenCPN/org.opencpn.OpenCPN.yaml) runtime=${runtime/ /} +runtime=${runtime%\"} +runtime=${runtime#\"} flatpak --user remote-add --if-not-exists \ flathub https://flathub.org/repo/flathub.flatpakrepo flatpak --user install --noninteractive org.freedesktop.Platform//$runtime @@ -42,49 +50,15 @@ flatpak --user install --noninteractive org.freedesktop.Sdk//$runtime cd flatpak -# By default, script packages master branch from main github repo, as a -# proper packaging branch should do. Setting FP_BUILD_ORIGINAL_BRANCH -# makes it build same branch as the script instead, for testing. -if [ -z "$FP_BUILD_ORIGINAL_BRANCH" ]; then - sed -i -e '/url:/s|\.\.|https://github.com/OpenCPN/OpenCPN.git|' \ - -e "/BUILD_NUMBER/s/0/$BUILD_NUMBER/" \ - org.opencpn.OpenCPN.yaml -fi - # The build heavy lifting test -d ../build || mkdir ../build cd ../build -make -f ../flatpak/Makefile build +make -f ../flatpak/Makefile ci-build flatpak list -# Decrypt and unpack gpg keys, sign and install into website/ -ccat --envvar FLATPAK_KEY ../ci/gpg.tar.gz.cpt > gpg.tar.gz -tar xf gpg.tar.gz -chmod 700 opencpn-gpg -make -f ../flatpak/Makefile install -make GPG_HOMEDIR=opencpn-gpg -f ../flatpak/Makefile sign -rm -rf gpg.tar.gz opencpn-gpg - -# Deploy website/ to deployment server. -cp ../ci/id_opencpn.tar.cpt . -ccdecrypt --envvar FLATPAK_KEY id_opencpn.tar.cpt -tar -xf id_opencpn.tar -chmod 600 .ssh/id_opencpn - - -# Restore the patched file so the caching works. -git checkout ../flatpak/org.opencpn.OpenCPN.yaml - -# Debug: show version in local repo. -flatpak remote-add \ - --user --gpg-import=website/opencpn.key local $PWD/website/repo -flatpak update --appstream local -flatpak remote-ls local - # Validate the appstream data: appstreamcli validate app/files/share/appdata/org.opencpn.OpenCPN.appdata.xml || : - # build the single file bundle, the actual artifact. flatpak build-bundle repo \ opencpn+$(git rev-parse --short HEAD).flatpak org.opencpn.OpenCPN devel diff --git a/ci/generic-build-debian.sh b/ci/generic-build-debian.sh index c19ce070f3..17467ebb48 100755 --- a/ci/generic-build-debian.sh +++ b/ci/generic-build-debian.sh @@ -1,40 +1,78 @@ #!/usr/bin/env bash # -# Build the Travis Debian artifacts +# Build the Debian artifacts # set -xe src_tree_root="$(dirname $(readlink -f $0))/.." sudo apt-get -qq update sudo apt-get install --yes --force-yes -q devscripts equivs -mk-build-deps "${src_tree_root}/ci/control" \ - --install --root-cmd=sudo\ - --remove \ - --tool="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes --force-yes" -sudo apt-get --allow-unauthenticated --yes --force-yes install -f - -# Xenial finds webview header but not the library: -if [ "$OCPN_TARGET" = "xenial" ]; then - WEBVIEW_OPT="-DOCPN_USE_WEBVIEW:BOOL=OFF" +if [[ $(lsb_release -rs) == 20.04 ]]; then + # Focal needs a more recent cmake + wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc \ + 2>/dev/null | \ + gpg --dearmor - | \ + sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null + echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' \ + | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null + sudo apt update + sudo apt-get install kitware-archive-keyring fi +pushd "${src_tree_root}" +if [ -n "$PACKAGE_BRANCH" ]; then + # Initiate git environment + git config --global user.name "OpenCPN auto builds" + git config --global user.email "opencpn-builds@nowhere.net" + git remote add home https://github.com/OpenCPN/OpenCPN.git + git remote update home -if [[ "$EXTRA_BUILD_OPTS" == *OCPN_FORCE_GTK3=ON* ]]; then - sudo update-alternatives --set wx-config \ - /usr/lib/*-linux-*/wx/config/gtk3-unicode-3.0 -fi + # Checkout debian/ dir from package branch + git fetch home $PACKAGE_BRANCH:$PACKAGE_BRANCH + git checkout $PACKAGE_BRANCH debian + git commit -m "Add debian packaging dir" -pushd "${src_tree_root}" -rm -rf build && mkdir build && cd build -cmake $WEBVIEW_OPT $EXTRA_BUILD_OPTS\ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DOCPN_CI_BUILD:BOOL=ON \ - -DOCPN_USE_BUNDLED_LIBS=OFF \ - .. -make -sj2 -dbus-run-session make run-tests || : -make package -popd + # Install build deps + mk-build-deps --install --root-cmd=sudo --remove \ + --tool="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes --force-yes" + sudo apt-get --allow-unauthenticated --yes --force-yes install -f + # Create a debian changelog entry + export DEBEMAIL=opencpn-builds@nowhere.net + export DEBFULLNAME="OpenCPN nightly builds" + version="1:5.11.0~$(date "+%Y%m%d%H%m").$(git rev-parse --short HEAD)-1" + dch --distribution ${PACKAGE_BRANCH##*/} -v "$version" "Auto build" + git add debian/changelog + git commit -m "d/changelog: $version" + + # Create orig tarball and work in the sources it provides + git archive --prefix opencpn-5.11.0/ --output ../opencpn.tar.gz HEAD + mk-origtargz ../opencpn.tar.gz + (cd ..; tar xf *xz) + cd ../opencpn-5.11.0* + + # Build package and move artifacts to expected build/ dir + debuild -us -uc -j4 + test -d ../project/build || mkdir ../project/build + mv ../*deb ../project/build +else + mk-build-deps "${src_tree_root}/ci/control" \ + --install \ + --root-cmd=sudo \ + --remove \ + --tool="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes --force-yes" + sudo apt-get --allow-unauthenticated --yes --force-yes install -f + + rm -rf build && mkdir build && cd build + cmake $WEBVIEW_OPT $EXTRA_BUILD_OPTS\ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DOCPN_CI_BUILD:BOOL=ON \ + -DOCPN_USE_BUNDLED_LIBS=OFF \ + .. + make -sj2 + dbus-run-session make run-tests || : +fi +cd .. sudo apt-get --yes --force-yes install python3-pip python3-setuptools +popd diff --git a/ci/generic-build-macos.sh b/ci/generic-build-macos.sh index 41cf953f4c..59f6ecdd5b 100755 --- a/ci/generic-build-macos.sh +++ b/ci/generic-build-macos.sh @@ -42,6 +42,13 @@ for pkg in openssl cmake ; do brew link --overwrite $pkg || : done +# Download and unzip documentation files +wget -nv -O QuickStartGuide.zip \ + "https://dl.cloudsmith.io/public/david-register/opencpn-docs/raw/files/QuickStartGuide-v0.4.zip" +mkdir -p data/doc/local +unzip QuickStartGuide.zip -d data/doc/local +sudo chmod -R +r data/doc/local + # Build, install and make package mkdir -p build cd build diff --git a/ci/generic-upload.sh b/ci/generic-upload.sh index 18d66ed903..daac74c27d 100755 --- a/ci/generic-upload.sh +++ b/ci/generic-upload.sh @@ -55,7 +55,7 @@ else fi if test -f Release/opencpn.pdb; then cp Release/opencpn.pdb .; fi for src in \ - $(expand *.dmg *setup.exe *.deb *.pkg *pdb*gz *.dSYM.tar.gz *.flatpak) + $(expand *.dmg *setup.exe *.deb *.pkg *pdb *gz *.dSYM.tar.gz *.flatpak) do old=$(basename $src) new=$(echo $old | sed "s/+/+${BUILD_NR}./") diff --git a/ci/universal-build-macos.sh b/ci/universal-build-macos.sh index c80f4c4e0e..e5c52928c9 100755 --- a/ci/universal-build-macos.sh +++ b/ci/universal-build-macos.sh @@ -71,6 +71,13 @@ sudo tar -C ${DEPS_BUNDLE_DEST} -xJf /tmp/${DEPS_BUNDLE_FILE} export PATH="/usr/local/opt/gettext/bin:$PATH" echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile +# Download and unzip documentation files +wget -nv -O QuickStartGuide.zip \ + "https://dl.cloudsmith.io/public/david-register/opencpn-docs/raw/files/QuickStartGuide-v0.4.zip" +mkdir -p data/doc/local +unzip QuickStartGuide.zip -d data/doc/local +sudo chmod -R +r data/doc/local + # Build, install and make package mkdir -p build cd build @@ -91,6 +98,7 @@ cmake -DOCPN_CI_BUILD=$CI_BUILD \ -DOCPN_USE_SYSTEM_LIBARCHIVE=OFF \ -DOCPN_DEPS_BUNDLE_PATH=${DEPS_BUNDLE_DEST} \ -DwxWidgets_CONFIG_EXECUTABLE=${DEPS_BUNDLE_DEST}/lib/wx/config/osx_cocoa-unicode-3.2 \ + -DCMAKE_APPBUNDLE_PATH=${DEPS_BUNDLE_DEST} \ -DwxWidgets_CONFIG_OPTIONS="--prefix=${DEPS_BUNDLE_DEST}" \ .. diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 3321dcf44d..286aaea35e 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -67,35 +67,6 @@ if(APPLE AND OCPN_USE_DEPS_BUNDLE) ) endif() -if (NOT WIN32) - if(APPLE AND OCPN_USE_DEPS_BUNDLE) - set(OPENSSL_ROOT_DIR ${OCPN_DEPS_BUNDLE_PATH}) - endif() - find_package(OpenSSL) - if (OPENSSL_FOUND) - message(STATUS - "OpenSSL found ${OPENSSL_INCLUDE_DIR} ${OPENSSL_LIBRARIES}" - ) - target_include_directories(opencpn-cmd PRIVATE ${OPENSSL_INCLUDE_DIR}) - target_include_directories(${PACKAGE_NAME} PRIVATE ${OPENSSL_INCLUDE_DIR}) - target_link_libraries(opencpn-cmd PRIVATE ${OPENSSL_LIBRARIES}) - add_definitions(-DMG_ENABLE_OPENSSL) - endif () -else () - target_include_directories( - opencpn-cmd - PRIVATE ${CMAKE_SOURCE_DIR}/cache/buildwin/include/openssl - ) - target_link_libraries( - opencpn-cmd - PRIVATE ${CMAKE_SOURCE_DIR}/cache/buildwin/libssl.lib - ) - target_link_libraries( - opencpn-cmd - PRIVATE ${CMAKE_SOURCE_DIR}/cache/buildwin/libcrypto.lib - ) -endif () - target_link_libraries(opencpn-cmd PRIVATE ocpn::model ocpn::model-src) if (MSVC) target_link_libraries(opencpn-cmd PRIVATE iphlpapi) diff --git a/cmake/FindShapelib.cmake b/cmake/FindShapelib.cmake new file mode 100644 index 0000000000..c55b618811 --- /dev/null +++ b/cmake/FindShapelib.cmake @@ -0,0 +1,27 @@ +# Find the shapelib a k a shp libraries +# +# Defines: +# SHAPELIB_FOUND - true if shapelib libs and headers found +# +# Exports: +# shapelib::shapelib transitive link target if SHAPELIB_FOUND is true +# +# Copyright (c) 2024 Alec Leamas +# License: GPL 2+ + +find_path(SHAPELIB_INCLUDE_DIR shapefil.h) + +find_library(SHAPELIB_LIBRARY NAMES shp shapelib) + +find_package_handle_standard_args(Shapelib + DEFAULT_MSG SHAPELIB_LIBRARY SHAPELIB_INCLUDE_DIR +) + +if (Shapelib_FOUND) + add_library(_shapelib INTERFACE) + target_link_libraries(_shapelib INTERFACE ${SHAPELIB_LIBRARY}) + target_include_directories(_shapelib INTERFACE ${SHAPELIB_INCLUDE_DIR}) + add_library(shapelib::shapelib ALIAS _shapelib) +endif() + +mark_as_advanced(SHAPELIB_INCLUDE_DIR SHAPELIB_LIBRARY) diff --git a/cmake/TargetSetup.cmake b/cmake/TargetSetup.cmake index 254cb3eacd..f01395d8fe 100644 --- a/cmake/TargetSetup.cmake +++ b/cmake/TargetSetup.cmake @@ -9,12 +9,14 @@ if (NOT OCPN_TARGET_TUPLE STREQUAL "") list(GET OCPN_TARGET_TUPLE 1 PKG_TARGET_VERSION) elseif (OCPN_FLATPAK) set(PKG_TARGET "flatpak-${ARCH}") - set(manifest_path "${PROJECT_SOURCE_DIR}/flatpak/org.opencpn.OpenCPN.yaml") + set(_manifest_dir "${PROJECT_SOURCE_DIR}/flatpak/org.opencpn.OpenCPN") + set(manifest_path "${_manifest_dir}/org.opencpn.OpenCPN.yaml") file(READ ${manifest_path} manifest) string(REPLACE "\n" ";" manifest_lines "${manifest}") foreach (_line ${manifest_lines}) if (${_line} MATCHES "^runtime-version") - string(REGEX REPLACE ".*:" "" PKG_TARGET_VERSION "${_line}") + string(REGEX REPLACE ".*:" "" PKG_TARGET_VERSION ${_line}) + string(REGEX REPLACE "\"" "" PKG_TARGET_VERSION ${PKG_TARGET_VERSION}) endif () endforeach () message(STATUS "Building for flatpak runtime ${PKG_TARGET_VERSION}") diff --git a/data/doc/50info/MBT1.jpg b/data/doc/50info/MBT1.jpg deleted file mode 100644 index 279e823159..0000000000 Binary files a/data/doc/50info/MBT1.jpg and /dev/null differ diff --git a/data/doc/50info/bridge1.jpg b/data/doc/50info/bridge1.jpg deleted file mode 100644 index 6d439bfc0b..0000000000 Binary files a/data/doc/50info/bridge1.jpg and /dev/null differ diff --git a/data/doc/50info/bridge2.jpg b/data/doc/50info/bridge2.jpg deleted file mode 100644 index b4316987f9..0000000000 Binary files a/data/doc/50info/bridge2.jpg and /dev/null differ diff --git a/data/doc/50info/chdow.jpg b/data/doc/50info/chdow.jpg deleted file mode 100644 index c2c33731fe..0000000000 Binary files a/data/doc/50info/chdow.jpg and /dev/null differ diff --git a/data/doc/50info/conf1.jpg b/data/doc/50info/conf1.jpg deleted file mode 100644 index aefb047286..0000000000 Binary files a/data/doc/50info/conf1.jpg and /dev/null differ diff --git a/data/doc/50info/conf2.jpg b/data/doc/50info/conf2.jpg deleted file mode 100644 index 90946c360f..0000000000 Binary files a/data/doc/50info/conf2.jpg and /dev/null differ diff --git a/data/doc/50info/conf3.jpg b/data/doc/50info/conf3.jpg deleted file mode 100644 index 61c784eaab..0000000000 Binary files a/data/doc/50info/conf3.jpg and /dev/null differ diff --git a/data/doc/50info/conf4.jpg b/data/doc/50info/conf4.jpg deleted file mode 100644 index 3405ed1e27..0000000000 Binary files a/data/doc/50info/conf4.jpg and /dev/null differ diff --git a/data/doc/50info/config1.jpg b/data/doc/50info/config1.jpg deleted file mode 100644 index c8f99fc0e3..0000000000 Binary files a/data/doc/50info/config1.jpg and /dev/null differ diff --git a/data/doc/50info/config2.jpg b/data/doc/50info/config2.jpg deleted file mode 100644 index c9be80315e..0000000000 Binary files a/data/doc/50info/config2.jpg and /dev/null differ diff --git a/data/doc/50info/cpb1.jpg b/data/doc/50info/cpb1.jpg deleted file mode 100644 index 73695bb2fa..0000000000 Binary files a/data/doc/50info/cpb1.jpg and /dev/null differ diff --git a/data/doc/50info/cpb2.jpg b/data/doc/50info/cpb2.jpg deleted file mode 100644 index 65c3b596aa..0000000000 Binary files a/data/doc/50info/cpb2.jpg and /dev/null differ diff --git a/data/doc/50info/cpb3.jpg b/data/doc/50info/cpb3.jpg deleted file mode 100644 index 877921ea28..0000000000 Binary files a/data/doc/50info/cpb3.jpg and /dev/null differ diff --git a/data/doc/50info/intro1.jpg b/data/doc/50info/intro1.jpg deleted file mode 100644 index ce291fa1e5..0000000000 Binary files a/data/doc/50info/intro1.jpg and /dev/null differ diff --git a/data/doc/50info/maintool1.jpg b/data/doc/50info/maintool1.jpg deleted file mode 100644 index 0ad985f572..0000000000 Binary files a/data/doc/50info/maintool1.jpg and /dev/null differ diff --git a/data/doc/50info/mark1.jpg b/data/doc/50info/mark1.jpg deleted file mode 100644 index 501da59f06..0000000000 Binary files a/data/doc/50info/mark1.jpg and /dev/null differ diff --git a/data/doc/50info/mark2.jpg b/data/doc/50info/mark2.jpg deleted file mode 100644 index ed9b6a9b24..0000000000 Binary files a/data/doc/50info/mark2.jpg and /dev/null differ diff --git a/data/doc/50info/odg1.jpg b/data/doc/50info/odg1.jpg deleted file mode 100644 index 10f878cf74..0000000000 Binary files a/data/doc/50info/odg1.jpg and /dev/null differ diff --git a/data/doc/50info/odg3.jpg b/data/doc/50info/odg3.jpg deleted file mode 100644 index 3f811f3413..0000000000 Binary files a/data/doc/50info/odg3.jpg and /dev/null differ diff --git a/data/doc/50info/perslay1.jpg b/data/doc/50info/perslay1.jpg deleted file mode 100644 index 6042f97b3c..0000000000 Binary files a/data/doc/50info/perslay1.jpg and /dev/null differ diff --git a/data/doc/50info/perslay2.jpg b/data/doc/50info/perslay2.jpg deleted file mode 100644 index 81d88e7ff7..0000000000 Binary files a/data/doc/50info/perslay2.jpg and /dev/null differ diff --git a/data/doc/50info/prepvc.jpg b/data/doc/50info/prepvc.jpg deleted file mode 100644 index e5b8690ab3..0000000000 Binary files a/data/doc/50info/prepvc.jpg and /dev/null differ diff --git a/data/doc/50info/routeall.jpg b/data/doc/50info/routeall.jpg deleted file mode 100644 index 972b14c547..0000000000 Binary files a/data/doc/50info/routeall.jpg and /dev/null differ diff --git a/data/doc/50info/routes-points.jpg b/data/doc/50info/routes-points.jpg deleted file mode 100644 index 628525c641..0000000000 Binary files a/data/doc/50info/routes-points.jpg and /dev/null differ diff --git a/data/doc/50info/rteprop.jpg b/data/doc/50info/rteprop.jpg deleted file mode 100644 index ff3d54fc4d..0000000000 Binary files a/data/doc/50info/rteprop.jpg and /dev/null differ diff --git a/data/doc/50info/rteptprop.jpg b/data/doc/50info/rteptprop.jpg deleted file mode 100644 index 7324abec85..0000000000 Binary files a/data/doc/50info/rteptprop.jpg and /dev/null differ diff --git a/data/doc/50info/wptprop.jpg b/data/doc/50info/wptprop.jpg deleted file mode 100644 index 5646f883e5..0000000000 Binary files a/data/doc/50info/wptprop.jpg and /dev/null differ diff --git a/data/doc/advanced_features.html b/data/doc/advanced_features.html deleted file mode 100644 index 9212aaef7f..0000000000 --- a/data/doc/advanced_features.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/doc/advanced_features/advanced_features.html b/data/doc/advanced_features/advanced_features.html deleted file mode 100644 index 02f9bd6913..0000000000 --- a/data/doc/advanced_features/advanced_features.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:advanced_features - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/doc/advanced_features/anchor_watch.html b/data/doc/advanced_features/anchor_watch.html deleted file mode 100644 index 3eb9799db6..0000000000 --- a/data/doc/advanced_features/anchor_watch.html +++ /dev/null @@ -1,195 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:anchor_watch - - - - - - - - - - - - - - - - - - - - - -
- - - -

Anchor Watch

-
- -

-Anchor watch can be set on any mark that you have created with OpenCPN, except for a mark that belongs to a layer, as long as the boat is within 1 nautical mile of this mark. This means that the Anchor watch items, on the right click menu, will only be visible if your boat is within 1 nautical miles of a mark. If the boat is closer than 5 m to the mark the anchor watch can't be set either. -

- -

-A maximum of two marks can have anchor watch set at the same time. Get around the restriction with a mark in a layer, by creating a new mark nearby. -

- -

- -

- -

-This feature can be used in other situations than just anchoring, but keeping an eye on your anchor, and making sure it isn't dragging, is the main purpose. -

- -

-Basic usage -

- -

-To learn how it works let's make a dry run to a nice trade wind anchorage. -

- -

- -

- -

-After circling around and exploring the bay, we know where we want to drop our anchor. -

- -

-At the chosen spot we drop the anchor, at the same time we right click on the “Own Boat Icon” and press “drop Mark Here”. -

- -

- -

- -

-The wind, ENE at 15 kts let us drift back until we are satisfied with our scope. A burst in reverse convinces us that the anchor is set, later confirmed by a leisurely snorkeling over the anchor. Time to sort out the anchor watch
- -

- -

-Right click on the mark and press “Set Anchor Watch”. The name of the mark changes to 50, and a green circle appears with a radius of 50 meters.
- -

- -

- -

- -

-The anchor watch is now active, with a default max distance of 50m from the mark, and an alarm will be set off if the boat for some reason exits the circle. If “Play sound on CPA/TCPA Alerts” is set in the AIS ToolBox Tab, the same audio alarm is activated together with the visual alarm on the screen. To deactivate the anchor watch, right click on the mark and select “Clear Anchor Watch”.
- -

- -

-If you are more than 50 m from the anchor when activating the watch this happens.. -

- -

- -

- -

-Sort this out by open the Mark/WP Properties Dialog. -

- -

- -

- -

-Change the name from “50 m” to a name that is relevant to the amount of chain and/or rode that you use, for example “75”. Change the icon to, if you like. Pressing OK should stop the alarm. -

- -

-To get protection from the wind and a bit of northerly swell, we have really anchored to close to the beach. To keep an eye on this potential danger we set another mark on the beach. -

- -

- -

- -

-This time we change the “Mark Name” to -150, this means that if the boat comes within 150 meters of this mark, the alarm is set off. Green circle, OK to be inside. Red circle OK to be outside. -

- -

- -

- -

-An hour later, after a heavy squall passed, the wind goes light and fluky. The boat drifts towards the beach and the anchor alarm sounds and comes up on our computer screen. -

- -

-The alarm sound is the same as the AIS warning sound and is set in the ToolBox under the AIS tab. -

- -

-Alternatives and Settings -

- -

-A mark at the position of ownship, can also be created by hitting “Enter” or “Spacebar”. “Ctrl + M” creates a mark at the position of the cursor. The anchor watch can now be set as demonstrated above with the default alarm distance being applied. -

- -

-A way to easily drop a mark, exactly at your current position, is to hit “Ctrl + Space”. This is the “Man Over Board” shortcut. Right click and go to properties. Change the name to a suitable alarm distance and pick a different icon. Set the Anchor Watch. -

- -

- -

- -

-The picture is an illustration to what happens if you use the MOB keystroke, and then just activate the Anchor Watch. As the mark is already named, the default watch distance doesn't work. The green circle is the 5 m default minimum distance. The alarm goes off, of course. -

- -

-* The Anchor Watch only works with an active gps. If the gps signal is lost, the alarm will be set off. Both the default Anchor Watch Radius and Max distance from mark can be changed by editing the configuration file, opencpn.ini on Windows and opencpn.config on Linux. -

-
    -
  • Close down OpenCPN and open the configuration file in a text editor.
    -
  • -
  • Find the section that starts with “[Settings] ”.
    -
  • -
  • Create two new lines, looking, for example like this.
    -
  • -
  • AnchorWatchDefault=45 (default is 50 m)
    -
  • -
  • AnchorWatchMax=2500 (default is 1852 m)
    -
  • -
  • Enter your own preferences, 45 & 2500 are just for illustration.
    -
  • -
- -
- - -
- - diff --git a/data/doc/advanced_features/automatic_anchor_mark.html b/data/doc/advanced_features/automatic_anchor_mark.html deleted file mode 100644 index 69c1279635..0000000000 --- a/data/doc/advanced_features/automatic_anchor_mark.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:automatic_anchor_mark - - - - - - - - - - - - - - - - - - - - - -
- - - -

Automatic Anchor Mark

-
- -

-Automatic Anchor Mark. This is what it does. If the following are ALL true: -

-
    -
  1. In “Cruising” mode, meaning that speed has at some point exceeded 3.0 kts.
    -
  2. -
  3. Current speed is less than 0.5 kts.
    -
  4. -
  5. OpenCPN has been up at least 30 minutes
    -
  6. -
  7. OpenCPN is exiting normally
    -
  8. -
  9. There is no anchor watch set on an “anchor…” icon mark.
    -
  10. -
  11. Any “Anchorage - icon” waypoint within 0.25 NM of current GPS location is deleted.
    -
  12. -
- -

-Then, OpenCPN will drop a waypoint at the current location, with the name - “Anchorage created on [Date Stamp]”. -

- -

-Thus waypoints are automatically created for known good anchorages as you shut down the computer. -The 0.25 NM condition prevents clogging up frequently visited anchorages with closely spaced waypoints. -The other conditions help to prevent spurious waypoints. -

- -

-To use this feature find opencpn.conf or opencpn.ini as it is called in windows. -Search for a line like this: -

-
AutoAnchorDrop=0 
- -

-and change the value from “0” to “1”. -

- -

-Also see Configuration File -

- -
- - -
- - diff --git a/data/doc/advanced_features/command_line.html b/data/doc/advanced_features/command_line.html deleted file mode 100644 index 1c70442e1b..0000000000 --- a/data/doc/advanced_features/command_line.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:command_line - - - - - - - - - - - - - - - - - - - - - -
- - - -

Command Line

-
- -
- -

OpenCPN has a minimal command line interface (CLI)

-
-
    -
  • Windows Usage : opencpn.exe [/unit_test_1] [/p] [/no_opengl] [/fullscreen] [/rebuild_gl_raster_cache]
    -
  • -
-
    -
  • Linux Usage: opencpn [-unit_test_1] [-p] [-no_opengl] [-fullscreen] [-rebuild_gl_raster_cache]
    -
  • -
- -
- -

The options:

-
- -

-[/unit_test_1] -This command test cycles through all possible charts in the currently loaded chart database, adjusting the viewport to show the loaded chart automatically. The value of this test is clear: it provide an unattended stress test of OpenCPN, It is most fun to watch in quilt mode….. -The test runs until all charts in the database have been visited once. -A side-effect of this switch is that it can be used to process a set of ENC charts into SENC files. The first, time consuming processing of ENC charts, can this way be done unattended. -

- -

-[/p ] -The portable option is explained here → Portable OpenCPN -

- -

-[/no_opengl] -A total switch-off of OpenGL, in a more thorough way than in “Options”. Read more in OpenGL . -

- -

-[/fullscreen ] -Starts OpenCPN in FullScreen mode. -

- -

-[/rebuild_gl_raster_cache] -Read more in Options Setting -

- -
- -

For Windows

-
- -

-When using a .bat file to launch OpenCPN, you may type this MSDOS line : -

-
START /REALTIME C:"\Program Files"\OpenCPN/opencpn
- -

-Where: -

- -

- START : MSDOS Command
- - /REALTIME : gives the highest priority to the program
- - C:"\program Files"\OpenCPN/opencpn : pathway where OpenCPN's Executable is downloaded
- - (specific to each windows version)
- -

- -
- - -
- - diff --git a/data/doc/advanced_features/configuration_file.html b/data/doc/advanced_features/configuration_file.html deleted file mode 100644 index 331e8cca7f..0000000000 --- a/data/doc/advanced_features/configuration_file.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:configuration_file - - - - - - - - - - - - - - - - - - - - - -
- - - -

Configuration File

-
-
    -
  • Always exit OpenCPN before editing the configuration file.
    -
  • -
  • Edit the file with a text editor, and save your changes.
    -
  • -
  • Restart OpenCPN.
    -
  • -
- -

-Some of the user settings available through the config file. -

- -

-APB bearing precision setting is set in the Toolbar > Options > Connections settings page for connections that have outgoing messages. The precision is applied to: -

-
    -
  • CrossTrackErrorMagnitude
    -
  • -
  • BearingOriginToDestination
    -
  • -
  • BearingPresentPositionToDestination
    -
  • -
  • HeadingToSteer
    -
  • -
- -

-This change was made as some auto pilots are limited in the precision they can accept in the APB message. -All other messages and internally the precision is not changed. -There is no change to the XTE message as that was not requested at the time. -Setting added in OpenCPN Version 4.2.0 -

-
[Settings]  .....
-NMEAAPBPrecision=3
- -

-Ais name caching can be turned off in the opencpn.ini/opencpn.config file by adding a line like this. -

-
[Settings] .....
-EnableAISNameCache=0
- -

-Crash reporting -for Windows icon be enabled by editing the opencpn.ini file. Add the line below to enable the crash-report. Sett the value to “0” to disable it. -

-
[Settings] .....
-EmailCrashReport=1
- -

-Rotating the canvas, is unsupported but possible….. -

-
[Settings] ....
-EnableRotateKeys=1
- -

-Enables -

-
    -
  • [ = Rotate chart left. ] = Rotate chart right.
    -
  • -
  • Alt + [ = Rotate chart left in fine steps.
    -
  • -
  • Alt + ] = Rotate chart right in fine steps.
    -
  • -
  • \ = Reset rotation
    -
  • -
  • Some keyboards have to use AltGR + ], etc.
    -
  • -
- -

-Also an Alternative, see the RotateCtrl_pi plugin which has Toolbar buttons. -

- -

-Graphic memory, If you have a lot of graphic memory, or very little, try to add the following to your config (ini on windows) file: -

-
[Settings] .....
-GPUMemorySize=nnn
- -

-where nnn is graphics card memory size, in MBytes. -256 MBytes is the default. -

- -

-Application memory limit target. Try to limit the total memory used by OCPN to the specified value, approximately. -Specify this mode by: -

-
[Settings] ......
-MEMCacheLimit=xxx
- -

-Open chart limit. -This is the default mode under Linux, and the default value is 20 open charts at any one time. -Modify this limit by the following: -

-
[Settings]  ....
-NCacheLimit=yy
- -

-Display a horizontal scalebar instead of the default vertical. -

-
[Settings]   .....
-UseSimplifiedScalebar=1
- -

-Width of the COG Predictor can be adjusted in the opencpn.ini configuration file. Find the line below and adjust the value. -

-
[Settings]  ....
-OwnshipCOGPredictorWidth=3
- -

-Maximum Waypoint Name Length -

-
[Settings] ....
-MaxWaypointNameLength=6
- -

-Allow the use of setting MaxWaypointNameLength in opencpn.ini to enable sending longer than 6 character waypoint names to GPS -

- -

-Number of Navobject Backups -In the opencpn.ini or opencpn.config file you can find a configuration setting to control the number of backups kept, defaulting to KeepNavobjBackups=5. This value can be changed using a text editor. -

-
[Settings] ...
-KeepNavobjBackups=5
- -

-AnchorWatch -Both the default Anchor Watch Radius and Max distance from mark can be changed by editing the configuration file -

-
-[Settings] ....
-AnchorWatchDefault=45
-AnchorWatchMax=2500
- -

-Enter your own preferences, 45 & 2500 are just for illustration, defaults are 50 and 1852 respectively. -

- -

-Automatic Anchor Mark -Search for a line like this: -

-
[Settings] .....
-AutoAnchorDrop=0
- -

-and change the value from “0” to “1”. -

- -

-Using all four processors -

-
[Settings] .....
-NCPUCount=4
- -

-GPS timeout -

-
[Settings] ....
-GPSDogTimeout=6
- -

-OCPN must get a valid position report (e.g. RMC, GLL, etc) every six seconds (default) or else the ownship icon will go grey, and many other functions will stop working. Adjustment to the defaut value may be necessary on, for example, a very busy network. -

- - -
- - -
- - diff --git a/data/doc/advanced_features/extended_marks.html b/data/doc/advanced_features/extended_marks.html deleted file mode 100644 index 56cb3fd4fa..0000000000 --- a/data/doc/advanced_features/extended_marks.html +++ /dev/null @@ -1,188 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:extended_marks - - - - - - - - - - - - - - - - - - - - - -
- - - -

Extended Marks

-
- -

-For the basics of marks see this page: Marks and Routes
- -

- -

-The properties of Extended marks described on this page expands the use of marks.
- -It is now possible, for example, to make a interactive Cruising Pilot.
- -An extended mark is sometimes called a POI, a point of interest.
- -

- -

-The “Mark/WP Properties” looks like this for a default mark. -

- -

- -

- -

- -

- -

-The dialog is available by double-clicking the mark, in the right-click menu or through the Route Manager. -

- -
- -

The Basic tab

-
-
    -
  • Name: Give the mark a suitable name. This will be visible on the chart, but can be hidden by un-ticking the Show Name box.
    -
  • -
  • Icon: Change the default icon for the mark. Only the “Name” will be displayed if selecting the “Empty” icon.
    -
  • -
  • The position of the mark: You can drag the mark with the mouse to the desired position or enter the correct Latitude and Longitude in these fields.
    -
  • -
  • Right clicking anywhere in the latitude or longitude display gives you the sub dialog shown above. Latitude and longitude can be copied separately or together. A copied lat/long will be available in the paste buffer, and will be displayed if you activate the “Jump to position…” dialog. It is also possible to paste a position. A Paste will try to be smart about parsing the format, and accepts a lot of different syntaxes. Even the GPX <wpt lat=“0.00” long=“0.00”> should work.
    -
  • -
  • Arrival Radius Read more in Options Setting , where the default is set. The arrival radius can also be set individually for each waypoint.
    -
  • -
  • Range Rings Show range rings, number of rings, ring spacing, units and color.
    -
  • -
  • Description: Enter anything about the mark. Long descriptions can be read easier by switching to the Description Tab. See examples below.
    -
  • -
- -

- -

- -

- -

- -

-Links: Marks can, as an option, have embedded links to the Internet or the the local computer. These are either opened in the default browser or through the default application, for example for pictures or pdf files. -For security reasons, the links does not work for launching other programs. -

- -

-Create a link by pressing Add. Give the link a good description in the new dialog. -Enter an Internet address in URL or find a local file through the button Local File.. -

- -

- -

- -

-The new link will appear under Links. Add more links as required. -

- -

-Edit links by pressing the “Edit” button. The description will change from “Links are opened in the default browser.” to “ Links are opened for editing” when the button is pressed. The color of the “Edit” button gets a grayer shade when it is pressed down. Press once more to release the button. Press once - the button is down. Press again - the button is released and goes up. -

- -

- -

- -

- -

- -

-Right-click an existing link for a related action menu. -

- -

- -

- -

-In the illustrated case, the link was to a local JPG picture, that opens in the default program associated with the jpg extension. -

- -

- -

- -

-If the mark belongs to a Layer, it can't be changed. A warning about this appears above the name of the mark
- -

- -

- -

- -
- -

The Description Tab

-
- -

-This is simply an expanded view of the Description box in the Basic tab. -

- -
- -

The Extended Tab

-
- -

-Show on Chart: Untick this box, and the mark will not show on the chart. To make it visible again, use the Route Managers Waypoint Tab. Click the “Icon” column, to the far left, on the line with the waypoint.
- -GUID is a unique identifier for the mark. -

- -
- - -
- - diff --git a/data/doc/advanced_features/inland_ecdis.html b/data/doc/advanced_features/inland_ecdis.html deleted file mode 100644 index caa31349f7..0000000000 --- a/data/doc/advanced_features/inland_ecdis.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:inland_ecdis - - - - - - - - - - - - - - - - - - - - - -
- - - -

InlandECDIS

-
- -
- -

European Inland Waters ECDIS & AIS

-
- -

-For the inland waters of Europe there are some special regulations in force. Vessels over 20m in length should have an Inland AIS and an inland ECDIS. (Since Jan 2017 compulsory in Germany, with the rest of europe to follow). OpenCPN from version 4.6 and higher has a special mode to comply with the rules for Inland ECDIS version 2.3 in information mode. -

- -

-Under Options > User Interface there is a checkbox Use settings for Inland ECDIS. When checked OpenCPN will: -

-
    -
  • Startup in 'Dusk' mode. (To prevent blinding if startup at night)
    -
  • -
  • Startup with the 'Standard' layers visible.
    -
  • -
  • Hide several toolbar buttons that are of no use for inland waters and charts. Toolbar can still be changed, but changes are not saved. At startup the same minimum toolbar will be shown.
    -
  • -
  • An extra toolbar with buttons for switching layers and pre defined zoom levels will popup.
    -
  • -
  • AIS targets that have no compass connected for heading information will be shown as octogram.
    -
  • -
  • The blue-paddle for starboard to starboard meetings has now the compulsory form. (a blue square with white border) If the blue-paddle information is available but the paddle is not set only a white line is drawn.
    -
  • -
- -

-Remember that you only comply with regulations if OpenCPN is in inlandECDIS mode, using the most recent inland ENC charts, no other programs are running on the computer and the computer screen is readable from the cunning position. -

- -
- -

Additional Information

-
- -

-The Inland Waterways ECDIS checkbox changes the User Interface and AIS to the requirements of the EU Inland Waterways (CCNR). -

- -

-Also please refer to INTERNATIONAL STANDARD FOR RACKING AND TRACING ON INLAND -WATERWAYS Word Document for more information. -

- -

-Note that if your User Interface is acting unexpectedly, not saving settings, and opening in night mode, this checkbox may have been selected inadvertently. See FAQ - Why aren't my settings saved? -

- -
- - -
- - diff --git a/data/doc/advanced_features/low_power_systems.html b/data/doc/advanced_features/low_power_systems.html deleted file mode 100644 index 669aa2a4df..0000000000 --- a/data/doc/advanced_features/low_power_systems.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:low_power_systems - - - - - - - - - - - - - - - - - - - - - -
- - - -

Low Powered Systems

-
- -

-This is an advanced subject.
- -Beginners need only bother, if they have a system with very low resources and if the system feels very sluggish. The background is that OpenCPN, quite aggressively uses memory, to speed up the application, this can backfire in certain situations…. -

- -

-There is a simple memory management scheme, for use with systems that has limited resources.
- -Two modes are available, only one of which can be active at any given time.
- -The modes must be specified in the “opencpn.conf” file, called “opencpn.ini” in Windows and Mac.
- -

- -

-1. Application memory limit target. Try to limit the total memory used by OCPN to the specified value, approximately. Specify this mode by: -

-
[Settings]....
-MEMCacheLimit=xxx
- -

-Where xxx is memory use target in Mbytes. Overrides NCacheLimit below.
- -

- -

-2. Open chart limit. This is the default mode under Linux, and the default value is 20 open charts at any one time. -

- -

-Modify this limit by the following: -

-
[Settings] ....
-NCacheLimit=yy
- -

-Where yy is the maximum number of simultaneously open charts.
- -

-
    -
  • If you do not enter any memory management specification in the config file, the following defaults apply:
    -
    -
  • -
  • Linux systems has a soft memory limit at 50% of available RAM. Open chart limit is 20 charts.
    -
    -
  • -
  • Windows and Mac…Application memory limit target is used. Target limit is 50% of available physical RAM, up to a maximum of 1 gigabyte.
    -
  • -
- -
- -

Settings for increased speed.

-
- -

-Texture Settings -

- -

-In Options→Display-Advanced Tab activate “Disable Full Screen Quilting” to start with. -

- -

-Use OpenGL if your hardware is up to it. If you are using OpenGL on a low-spec machine, you will have better performance if you -

-
    -
  1. Disable texture caching, or\
    -
  2. -
  3. Pre-build the texture cache in a region of interest. That is, move the boat to say Dover. Then do Options→Advanced>(OpenGL)Options→Build Texture Cache. You do not need to wait the entire time, which may be hours for a large chart set. “Skip” out when the distance reported is 100 miles or so.
    -
  4. -
- -

-Eventually, after steady use, your texture cache will be filled automatically in the background, and performance will increase steadily. -

- -
- - -
- - diff --git a/data/doc/advanced_features/maximise_screen_display.html b/data/doc/advanced_features/maximise_screen_display.html deleted file mode 100644 index 0911834324..0000000000 --- a/data/doc/advanced_features/maximise_screen_display.html +++ /dev/null @@ -1,118 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:maximise_screen_display - - - - - - - - - - - - - - - - - - - - - -
- - - -

Maximize Screen Display

-
- -

-The default display is shown here: -

- -

- -

- -

-The display can be maximized to this. -

- -

-maxscreen1.jpg -

- -

-Gone are the Menu Bar (at the top), the Status Bar (at the bottom) and the Toolbar. -

- -

-Loss of the Toolbar? Not really … just click on the icon in the upper left corner to display the Toolbar for a specified time. -

- -

-And the location, COG and SOG that are displayed in the Status Bar can be displayed on the Dashboard plugin. -

- -

-maxscreen4.jpg -

- -

-SETTINGS -

- -

-The settings to maximize the display are on Options/User Interface page. -

- -

-I prefer to increase the Toolbar auto-hide time to 4 sec ILO the default of 2 sec. -

- -

-maxscreen2.jpg -

- -

-maxscreen3.jpg -

- -

-CAUTION: Do not check the ‘Enable Touchscreen interface’. A bug In OpenCPN 4.6.1 will cause the chart ‘piano keys’ to sometimes turn black. -

- -

-maxscreen5.jpg -

- -

-Terry Sargent 14 May 2017 -

- -
- - -
- - diff --git a/data/doc/advanced_features/navigation_data_backup.html b/data/doc/advanced_features/navigation_data_backup.html deleted file mode 100644 index 036d030abf..0000000000 --- a/data/doc/advanced_features/navigation_data_backup.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:navigation_data_backup - - - - - - - - - - - - - - - - - - - - - -
- - - -

Navigation Data Backup

-
- -
- -

Saving sessions

-
-
    -
  • The navobj.xml.[1..x] takes care of your session data backup. This means that when you start OpenCPN it “remembers” the state of your last session.
    -
  • -
  • A rotating backup of navobjects is automatically created on every program run. OpenCPN keeps backups of the last 5 runs. This can be changed.
    -
  • -
  • Change the number of navobject backups. In the opencpn.ini/opencpn.config file you can find a Configuration Setting to control the number of backups kept, defaulting to KeepNavobjBackups=5. This value can be changed using a text editor.
    -
  • -
  • The backups are then stored in files navobj.xml.[1..x] (in the same directory as the ini file) where .1 is always the newest backup and the oldest is removed on the next program run. The file that will be loaded on next start is called navobj.xml.
    -
  • -
  • The backups are only rotated if the navobj.xml file has changed since the last backup was created. This prevents overwriting good backups with a broken version, more than once.
    -
  • -
  • Note that the navobj.xml files reside in a folder that is hidden by default by Windows. More information is available here: OpenCPN Installation.
    -
  • -
  • To load an old backup, exit the program. Find the backup you want to use. Rename it navobj.xml. Start OpenCPN!
    -
  • -
  • The navobj.xml.[1..x] files are gpx files and it is also possible to directly import them back into OpenCPN. Press the “Import GPX” button in the Route Manager.
    -
  • -
- -
- -

Upgrading OpenCPN

-
-
    -
  • Navobjects are not lost during a normal upgrade to a newer version.
    -
  • -
- -
- -

If trouble strikes...

-
-
    -
  • You have useful automatic rolling backups of navobj.xml, as described above.
    -
  • -
  • Copy them somewhere safe before you run OpenCPN again, as they are automatically rolled over, and you lose the oldest one for each invocation of OpenCPN.
    -
  • -
  • Rename the “best” one as navobj.xml, and the contents will be automatically used by OCPN.
    -
  • -
  • The OpenCPN logfile also serves as a backup through the “LOGBOOK:” entries.
    -
  • -
  • These can be used to reconstruct a GPX track. A windows utility for hat purpose is available here: https://github.com/nohal/LogBookExtractor/downloads
    -
  • -
- -
- -

Saving waypoints, routes, tracks and layers for future use.

-
-
    -
  • For a more permanent backup solution, to keep routes, waypoints and tracks etc, that you may need in the future, consider saving the data by using Route & Mark Manager or use Layers
    -
  • -
  • Be organized. Create a dedicated directory, for example GPX_Routes, to save files worth keeping. Be careful to name all files in a manner so the content is obvious, without having to import the file into OpenCPN.
    -
  • -
  • Export button Each tab in the Route Manager (except the Layer Tab) has a button “Export……”. Use this to export one Waypoint, one Route or one Track at a time. Multiple selection is possible in this version of OpenCPN (and several previous versions).
    -
  • -
  • To Create a layer, a collection of waypoints, routes and tracks by making the features to be included in the layer visible. Everything else should be deleted or hidden. Every object that is visible on the screen when maximum zoomed out, will be included, not just what is visible on the screen for the moment. When you are ready, use the “Export all visible” button to create the layer gpx file.
    -
  • -
  • To Change an existing Layer start with creating a backup of the existing gpx file, containing the layer, by copying it to a safe place. Make sure that no navigational objects are visible, that you don't want in the new version of the layer. Then use the Route Managers “Import GPX..” and load the layer to be edited. Perform your changes to the layer and press “Export All Visible…”, and save. If you made a backup, just overwrite the original file. Otherwise give the changed Layer a new name.
    -
  • -
  • Use your saved files by importing them back into OpenCPN. Press the “Import GPX” button in the Route Manager. Layers can be set up to load autmatically on starting OpenCPN. Read more in Layers
    -
  • -
- -
- - -
- - diff --git a/data/doc/advanced_features/network_repeater.html b/data/doc/advanced_features/network_repeater.html deleted file mode 100644 index 438a5e7582..0000000000 --- a/data/doc/advanced_features/network_repeater.html +++ /dev/null @@ -1,201 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:network_repeater - - - - - - - - - - - - - - - - - - - - - -
- - - -

Network Repeater

-
- -

-From Gilletarom's website some excellent information on Networking
- -http://www.plaisance-pratique.com/OpenCPN-Networking-repeater-to
- -

- -
- -

Opencpn network/RJ45 (Ethernet) cable

-
- -

-The means : -

-
    -
  1. OpenCPN, know IP of the server PC, has an RJ45 (Ethernet) cable or Wifi on both, PC
    -
  2. -
  3. Has set both networked PCs, cable or Wifi
    -
  4. -
  5. OpenCPN on the PC server
    -
  6. -
- -

-Setting OpenCPN on the PC server -

-
    -
  • Setting Options
    -
      -
    • connections
      -
        -
      • add Connection
        -
      • -
      -
    • -
    -
  • -
  • Set as follows by putting your IP address followed by : xx
    -
      -
    • Properties ⇒ “Network”
      -
    • -
    • Protocol ⇒ “UDP”
      -
    • -
    • Adress ⇒ your IP address followed by : “.x.x”
      -
    • -
    • Data Port com “10110”
      -
    • -
    • Output on this port “OK”
      -
    • -
    -
  • -
  • Set “Apply” and then “OK”
    -
  • -
- -

-ba_serveur_2-910db.jpg -

- -

-Setting OpenCPN on PC Receiver -

-
    -
  • Setting Options
    -
      -
    • connections
      -
        -
      • add Connection
        -
      • -
      -
    • -
    -
  • -
  • Set as follows by putting only this IP address, for UDP protocol : 0.0.0.0
    -
      -
    • Properties ⇒ “Network”
      -
    • -
    • Protocol ⇒ “UDP”
      -
    • -
    • Adress ⇒ “0.0.0.0”
      -
    • -
    • Data Port com “10110”
      -
    • -
    • Receive Input on this port “OK”
      -
    • -
    • Set “Apply” and then “OK ”
      -
    • -
    -
  • -
- -

-bb_receveur_2-78e4c.jpg -

- -
- -

Networking

-
- -

-On the server PC On the PC Receiver -

- -

-ca_serveur.jpg .. -cb_receveur.jpg -

- -

-For this example, all the NMEA data from the GPS and display of AIS data -

- -

-**On the server PC On the PC Receiver -

- -

-da_rezo-ocpn_w7.jpg .. -db_rezo-ocpn_xp.jpg -

-
    -
  • The emission readings and receiving NMEA sentences, under the AIS receptions.
    -
  • -
  • We see that every sentence received by the transmitter is immediately re-shipped by outgoing connection
    -
  • -
- -

-ea_nmea_emission_w7.jpg .. -eb_nmea_reception_xp.jpg -

- -

-NMEA information goes through the RJ45 cable or WiFi and are received on the other PC.
- -

- -

-With this application you can have a PC inside and another type tablet outdoors -

- -

-For more information on OpenCPN Wifi Networking, OpenCPN WiFi network between XP, W7 and W8 tablet, Creation of a network using a batch file see Pratiques et Techniques de la Plaisance -

- -
- - -
- - diff --git a/data/doc/advanced_features/nmea_sentences.html b/data/doc/advanced_features/nmea_sentences.html deleted file mode 100644 index 8883f12f16..0000000000 --- a/data/doc/advanced_features/nmea_sentences.html +++ /dev/null @@ -1,734 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:nmea_sentences - - - - - - - - - - - - - - - - - - - - - -
- - - -

NMEA 0183 Sentences

-
- -

-For a comprehensive explanation of the NMEA 0183 protocol please read -

- -

-NMEA Revealed by Eric S. Raymond -

- -

-Please note the 2008 Obsolete Nmea Sentences list in the Eric Raymond document. -

- - -

-Other References -

- - -

-Note: OpenCPN does not use or recognize NMEA 2000 -

- -
- -

OpenCPN Recognized NMEA 0183 Sentences:

-
- -
- -

The Core Program:

-
-
    -
  • HDM - Heading, Magnetic
    -
  • -
-
    -
  1. Heading Degrees, magnetic
    -
  2. -
  3. M = magnetic
    -
  4. -
-
    -
  • HDG - Magnetic heading, deviation, variation
    -
  • -
-
    -
  1. Magnetic Sensor heading in degrees
    -
  2. -
  3. Magnetic Deviation, degrees
    -
  4. -
  5. Magnetic Deviation direction, E = Easterly, W = Westerly
    -
  6. -
  7. Magnetic Variation degrees
    -
  8. -
  9. Magnetic Variation direction, E = Easterly, W = Westerly
    -
  10. -
- -

-If HDG message also contains the variation and E/W flags then O will use that. If not then it will look in RMC message for a variation. If nothing there it will use WMM plugin unless user has selected the variation manually in options. -

-
    -
  • HDT - Heading, True
    -
  • -
-
    -
  1. Heading Degrees, true
    -
  2. -
  3. T = True
    -
  4. -
-
    -
  • RMB - Recommended Minimum Navigation Information
    -
  • -
- -

-To be sent by a navigation receiver when a destination waypoint is active. -

-
''
-                                                            14
-        1 2   3 4    5    6       7 8        9 10  11  12  13|  15
-        | |   | |    |    |       | |        | |   |   |   | |   |
- $--RMB,A,x.x,a,c--c,c--c,llll.ll,a,yyyyy.yy,a,x.x,x.x,x.x,A,m,*hh<CR><LF>''
- -

-Field Number: -

-
    -
  1. Status, A= Active, V = Void
    -
  2. -
  3. Cross Track error - nautical miles
    -
  4. -
  5. Direction to Steer, Left or Right
    -
  6. -
  7. TO Waypoint ID
    -
  8. -
  9. FROM Waypoint ID
    -
  10. -
  11. Destination Waypoint Latitude
    -
  12. -
  13. N or S
    -
  14. -
  15. Destination Waypoint Longitude
    -
  16. -
  17. E or W
    -
  18. -
  19. Range to destination in nautical miles
    -
  20. -
  21. Bearing to destination in degrees True
    -
  22. -
  23. Destination closing velocity in knots
    -
  24. -
  25. Arrival Status, A = Arrival Circle Entered
    -
  26. -
  27. FAA mode indicator (NMEA 2.3 and later)
    -
  28. -
-
    -
  • RMC -Recommended Minimum Navigation Information
    -
  • -
-
    -
  1. Time (UTC)
    -
  2. -
  3. Status, V = Navigation receiver warning
    -
  4. -
  5. Latitude
    -
  6. -
  7. N or S
    -
  8. -
  9. Longitude
    -
  10. -
  11. E or W
    -
  12. -
  13. Speed over ground, knots
    -
  14. -
  15. Track Made Good, degrees true
    -
  16. -
  17. Date, ddmmyy
    -
  18. -
  19. Magnetic variation, degrees
    -
  20. -
  21. E or W
    -
  22. -
-
    -
  • xxWPL - Waypoint Location Used to send routes and waypoints up to a GPS receiver. OpenCPN does not process these sentences as input.
    -
  • -
-
    -
  1. Latitude
    -
  2. -
  3. N or S (North or South)
    -
  4. -
  5. Longitude
    -
  6. -
  7. E or W (East or West)
    -
  8. -
  9. Waypoint Name
    -
  10. -
-
    -
  • xxRTE - Routes. Used to send routes and waypoints up to a GPS receiver.OpenCPN does not process these sentences as input.
    -
  • -
-
    -
  1. Total number of messages being transmitted
    -
  2. -
  3. Message Number
    -
  4. -
  5. Message Mode
    -
      -
    1. c = complete route, all waypoints
      -
    2. -
    3. w = working route, the waypoint you just left, the waypoint you're heading to, then all the rest
      -
    4. -
    -
  6. -
  7. Waypoint ID
    -
  8. -
  9. More Waypoints
    -
  10. -
-
    -
  • GGA - Global Positioning System Fix Data
    -
  • -
-
    -
  1. Universal Time Coordinated (UTC)
    -
  2. -
  3. Latitude
    -
  4. -
  5. Longitude
    -
  6. -
  7. GPS Quality Indicator
    -
  8. -
  9. Number of satellites in view, 00 - 12
    -
  10. -
  11. Horizontal Dilution of Precision (HDOP)
    -
  12. -
  13. Antenna altitude above/below mean-sea-level (geoid)
    -
  14. -
  15. Units of antenna altitude, meters
    -
  16. -
  17. Geoidal separation, the vertical difference between the WGS-84 elipsoid and the geoid
    -
  18. -
  19. Units of geoidal separation, meters
    -
  20. -
  21. Age of differential GPS data, time in seconds since last SC104
    -
  22. -
  23. Differential reference station ID, 0000-102
    -
  24. -
-
    -
  • GLL - Geographic Position, Latitude / Longitude
    -
  • -
-
    -
  1. Latitude
    -
  2. -
  3. N or S (North or South)
    -
  4. -
  5. Longitude
    -
  6. -
  7. E or W (East or West)
    -
  8. -
  9. Time (UTC)
    -
  10. -
  11. Status A - Data Valid, V - Data Invalid
    -
  12. -
-
    -
  • GSV - Satellites in view
    -
  • -
-
    -
  1. Number of sentences for full data / sentence 1 of 2
    -
  2. -
  3. Number of satellites in view
    -
  4. -
  5. Satellite PRN number
    -
  6. -
  7. Elevation, degrees
    -
  8. -
  9. Azimuth, degrees
    -
  10. -
  11. SNR - higher is better / for up to 4 satellites per sentence
    -
  12. -
-
    -
  • VTG - Track Made Good and Ground Speed
    -
  • -
-
    -
  1. Track Degrees
    -
  2. -
  3. T = True
    -
  4. -
  5. Track Degrees
    -
  6. -
  7. M = Magnetic
    -
  8. -
  9. Speed Knots
    -
  10. -
  11. N = Knots
    -
  12. -
  13. Speed Kilometers Per Hour
    -
  14. -
  15. K = Kilometers Per Hour
    -
  16. -
-
    -
  • GPwpl - Waypoint data, only when there is an active route (this is sometimes bidirectional).
    -
  • -
-
    -
  • APB - Autopilot Sentence “B” This is a fixed form of the APA sentence with some ambiguities removed.
    -
  • -
- -

- Note: Some autopilots, Robertson in particular, misinterpret “bearing from origin to destination” as “bearing from present position to destination”. This is likely due to the difference between the APB sentence and the APA sentence. for the APA sentence this would be the correct thing to do for the data in the same field. APA only differs from APB in this one field and APA leaves off the last two fields where this distinction is clearly spelled out. This will result in poor performance if the boat is sufficiently off-course that the two bearings are different. -

- -

-Field Number: -

-
    -
  1. Status V = LORAN-C Blink or SNR warning V = general warning flag or other navigation systems when a reliable fix is not available
    -
    -
  2. -
  3. Status V = Loran-C Cycle Lock warning flag A = OK or not used
    -
    -
  4. -
  5. Cross Track Error Magnitude
    -
    -
  6. -
  7. Direction to steer, L or R
    -
    -
  8. -
  9. Cross Track Units, N = Nautical Miles
    -
    -
  10. -
  11. Status A = Arrival Circle Entered
    -
    -
  12. -
  13. Status A = Perpendicular passed at waypoint
    -
    -
  14. -
  15. Bearing origin to destination
    -
    -
  16. -
  17. M = Magnetic, T = True
    -
    -
  18. -
  19. Destination Waypoint ID
    -
    -
  20. -
  21. Bearing, present position to Destination
    -
    -
  22. -
  23. M = Magnetic, T = True
    -
    -
  24. -
  25. Heading to steer to destination waypoint
    -
    -
  26. -
  27. M = Magnetic, T = True
    -
    -
  28. -
-
    -
  • XTE - Measured cross track error Measured cross track error is a part of the RMB message, for compatibility with some older equipment designed to work with Loran.
    -
  • -
-
    -
  1. Cross track error, measured
    -
  2. -
  3. General warning flag V = warning
    -
  4. -
  5. (Loran-C Blink or SNR warning)
    -
  6. -
  7. Not used for GPS (Loran-C cycle lock flag)
    -
  8. -
  9. Cross track error distance
    -
  10. -
  11. L - Steer left to correct error (or R for right)
    -
  12. -
  13. N- Distance units - Nautical miles
    -
  14. -
-
    -
  • AIVDM - Automatic Information System (AIS) position reports from other vessels
    -
  • -
-
    -
  1. Time (UTC)
    -
  2. -
  3. MMSI Number
    -
  4. -
  5. Latitude
    -
  6. -
  7. Longitude
    -
  8. -
  9. Speed Knots
    -
  10. -
  11. Heading
    -
  12. -
  13. Course over Ground
    -
  14. -
  15. Rate of turn
    -
  16. -
  17. Navigation status
    -
  18. -
-
    -
  • AIVDO - Automatic Information System (AIS) position reports from own vessel
    -
  • -
-
    -
  1. Latitude
    -
  2. -
  3. Longitude
    -
  4. -
  5. Speed over ground
    -
  6. -
  7. Course over ground
    -
  8. -
  9. MMSI, navigational status, ship type, call sign, destination, sizes (in AIS target list)
    -
  10. -
-
    -
  • xxTTM - Tracked Target Message
    -
  • -
-
    -
  1. Target Number (0-99)
    -
  2. -
  3. Target Distance
    -
  4. -
  5. Bearing from own ship
    -
  6. -
  7. Bearing Units
    -
  8. -
  9. Target Speed
    -
  10. -
  11. Target Course
    -
  12. -
  13. Course Units
    -
  14. -
  15. Distance of closest-point-of-approach
    -
  16. -
  17. Time until closest-point-of-approach “-” means increasing
    -
  18. -
  19. “-” means increasing
    -
  20. -
  21. Target name
    -
  22. -
  23. Target Status
    -
  24. -
  25. Reference Target
    -
  26. -
-
    -
  • xxTLL - Target Latitude and Longitude
    -
  • -
-
    -
  1. Target Number (not used/ignored)
    -
  2. -
  3. Latitude
    -
  4. -
  5. Longitude
    -
  6. -
  7. Name
    -
  8. -
  9. Status
    -
  10. -
  11. Reference Target (not used/ignored)
    -
  12. -
-
    -
  • xxOSD - Own Ship Data
    -
  • -
-
    -
  1. Heading, degrees true
    -
  2. -
  3. Status, A = Data Valid
    -
  4. -
  5. Vessel Course, degrees True
    -
  6. -
  7. Course Reference
    -
  8. -
  9. Vessel Speed
    -
  10. -
  11. Speed Reference
    -
  12. -
  13. Vessel Set, degrees True
    -
  14. -
  15. Vessel drift (speed)
    -
  16. -
  17. Speed Units
    -
  18. -
-
    -
  • FPROS - GPSGate Buddy Position Update.
    -
  • -
-
    -
  1. Latitude
    -
  2. -
  3. Hemisphere N/S
    -
  4. -
  5. Longitude
    -
  6. -
  7. Hemisphere E/W
    -
  8. -
  9. Altitude in meters above sea level
    -
  10. -
  11. Speed over ground in knots
    -
  12. -
  13. Heading over ground in degrees
    -
  14. -
  15. Date
    -
  16. -
  17. Time UTC
    -
  18. -
  19. Name of buddy this position info belongs to.
    -
  20. -
-
    -
  • CDDSC - Digital Selective Calling Information
    -
  • -
-
    -
  • CDDSE - Extended Digital Selective Calling Information, including a more accurate position.
    -
  • -
- -

-For more details on how OpenCPN interprets all recognized sentences, look at the “AisDecoderA.cpp” file in the source code. For the Dashboard plugin, look at the different files in the “nmea0183” directory. -

- -
- -

Dashboard Plugin recognized NMEA 0183 sentences

-
-
    -
  • DBT - Depth Below Transducer
    -
  • -
  • DPT - Depth of Water
    -
  • -
  • GGA - Global Positioning System Fix Data
    -
  • -
  • GLL - Geographic Position - Latitude/Longitude HDG Heading - Deviation & Variation
    -
  • -
  • HDM - Heading - Magnetic
    -
  • -
  • HDT - Heading - True
    -
  • -
  • MTA - Air Temperature (obsolete)
    -
  • -
  • MDA - Meteorological Composite (obsolete)
    -
  • -
- -

-This message is obsolete and NMEA recommends to use XDR transducer messages instead.
- -However, old instruments might still sending this message.
- -OpenCPN reads the second value “Barometric pressure, bars”, but only if the number provided is between 0.8 and 1.1
- -All other values are ignored.
- -

-
''
-$--MDA,x.x,I,**x.x,B**,x.x,C,x.x,C,x.x,x.x,x.x,C,x.x,T,x.x,M,x.x,N,x.x,M*hh<CR><LF> \\
-      |      |        |        |    |    |    |        |    |        |    | \\
-      |      |        |        |    |    |    |        |    |        |    Wind speed, meters/second \\
-      |      |        |        |    |    |    |        |    |        Wind speed, knots \\
-      |      |        |        |    |    |    |        |    Wind direction, degrees Magnetic     \\
-      |      |        |        |    |    |    |        Wind direction, degrees True \\
-      |      |        |        |    |    |    Dew point, degrees C \\
-      |      |        |        |    |    Absolute humidity, percent \\
-      |      |        |        |    Relative humidity, percent \\
-      |      |        |        Water temperature, degrees C \\
-      |      |        Air temperature, degrees C \\
-      |      **//Barometric pressure, bars// ** \\
-      Barometric pressure, inches of mercury''
-
    -
  • MTW - Mean Temperature of Water
    -
  • -
  • VLW - Distance Traveled through Water
    -
  • -
  • MWD - Wind Direction & Speed
    -
  • -
  • MWV - Wind Speed and Angle
    -
  • -
  • RMC - Recommended Minimum Navigation Information
    -
  • -
  • RSA - Rudder Sensor Angle
    -
  • -
  • VHW - Water speed and heading
    -
  • -
  • VTG - Track made good and Ground speed
    -
  • -
  • VWR - Relative Wind Speed and Angle
    -
  • -
  • VWT - True Windspeed and Angle (obsolete)
    -
  • -
  • XDR - Transducer Values
    -
  • -
-
            1 2   3 4       n \\
-            | |   | |       | \\
-  *  $--XDR,a,x.x,a,c--c, ..... *hh<CR><LF> \\
-
    -
  • Field Number:
    -
    -
  • -
  • 1) Transducer Type
    -
    -
  • -
  • 2) Measurement Data
    -
    -
  • -
  • 3) Units of measurement
    -
    -
  • -
  • 4) Name of transducer
    -
    -
  • -
  • x) More of the same
    -
    -
  • -
  • n) Checksum
    -
    -
  • -
-
    -
  • Example:
    -
    -
  • -
  • $IIXDR,C,19.52,C,TempAir*3D
    -
    -
  • -
  • $IIXDR,P,1.02481,B,Barometer*0D
    -
    -
  • -
-
    -
  • Currently, OpenCPN recognizes the following transducers:
    -
  • -
-
-
Measured Value | Transducer Type | Measured Data   | Unit of measure | Transducer Name
-------------------------------------------------------------------------------------------------------
-barometric     | "P" pressure    | 0.8..1.1 or 800..1100           | "B" bar         | "Barometer"
-air temperature| "C" temperature |   2 decimals                    | "C" celsius     | "TempAir" or "ENV_OUTAIR_T"
-pitch          | "A" angle       |-180..0 nose down 0..180 nose up | "D" degrees     | "PTCH"
-rolling        | "A" angle       |-180..0 L         0..180 R       | "D" degrees     | "ROLL"
-water temp     | "C" temperature |   2 decimals                    | "C" celsius     | "ENV_WATER_T"
------------------------------------------------------------------------------------------------------
-
    -
  • ZDA -Time & Date - UTC, day, month, year and local time zone
    -
  • -
-
    -
  • AIVDO - Automatic Information System (AIS) position reports from own vessel
    -
  • -
- -

-See details for AIVDO above in list. -

- -

-NMEA version 2.3.added a mode indicator to many sentences to indicate what
- -kind of fix the receiver has. The value can be one of
- - A=autonomous
- - D=differential
- - E=Estimated
- - N=not valid,
- - S=Simulator.
- - Sometimes there can even be a null value as well.
- - The A and D are the only vales that will indicate an Active and reliable Sentence.
- - This mode character has been added to the end of RMC, RMB, VTG, and GLL sentences.
- - Optionally, to some others as well, including the BWC and XTE sentences.
- -

- -
- - -
- - diff --git a/data/doc/advanced_features/opengl.html b/data/doc/advanced_features/opengl.html deleted file mode 100644 index 1359d85c65..0000000000 --- a/data/doc/advanced_features/opengl.html +++ /dev/null @@ -1,198 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:opengl - - - - - - - - - - - - - - - - - - - - - -
- - - -

OpenGL

-
- -
- -

What is OpenGL? An Overview

-
- -

-OpenGL is an open standard, cross platform, advanced graphic library. It uses the graphic cards processor (GPU) and memory, to speed up applications. With OpenCPN a user with a typical modern graphic card will have an enhanced experience. Much faster and smoother zooming and panning as well as clearer and sharper chart rendering. -

- -

-In OpenCPN, OpenGL is a choice; however. the old graphic engine is still there. OpenGL will not work for everyone. Performance may not be improved with embedded graphics chips, often found in older laptops and netbooks. -

- -

-Microsoft has gone from support to hostility towards OpenGL. There is currently a lot of trouble in Windows for all OpenGL applications, not just OpenCPN. OpenCPN has been forced to disable a handful of OpenGL features for all Intel OpenGL graphics drivers on Windows, for example. -

- -

-Mac OS X has full supports for OpenGL. -

- -

-For Linux the situation is slightly different. Linux supports OpenGL, as it generally tends to support open standards. The user is however dependent on a driver from the graphic cards maker, and their support for OpenGL. This may change with projects like nouveau, a free driver for nVidias cards. -

- -

-… - -

- -

-Without OpenGL and With OpenGL -

- -

-Heavy over zooming reveals some of the secrets behind OpenGL -

- -
- -

Why introduce OpenGL in OpenCPN?

-
- -

-The main reasons are: -

-
    -
  • Better performance, leveraging modern PC graphics cards that are ubiquitous and powerful.
    -
  • -
  • Better “eye candy”, such as smooth zoom and pan, with little impact on responsiveness.
    -
  • -
  • Future cross-platform support (e.g Android/IOS)
    -
  • -
  • Some features depends on OpenGL, such as horizontal text and numbers on skewed (course up) vectorcharts.
    -
  • -
- -
- -

Is OpenGL a good choice for everyone?

-
- -

-OpenCPNs performance with OpenGL is highly dependent upon your graphics hardware and drivers. -

-
    -
  • On some systems using Intel HD Graphics adapters, especially running 64bit editions of Windows 7, OpenCPN gets killed due to errors in the display adapter drivers. You may try to get updated drivers or as a workaround, on Windows run OpenCPN - no OpenGL from Start menu. On all the platforms, you can use the -no_opengl Command Line switch while starting the program to run it with OpenGL disabled.
    -
  • -
  • Some graphics chip sets (e.g.intel 945G) have rather poor OpenGL driver support, so that we cannot fully utilize the hardware acceleration potential of these systems.
    -
  • -
  • nVidia graphics, even very old cards, seem to perform very well.
    -
  • -
  • Performance may not be improved with embedded graphics chips as often found in older laptops and netbooks.
    -
  • -
  • There is a lot of trouble with OpenGL on Vista and W7. Microsoft implemented a new screen compositing model for Vista and later, which “broke” many OpenGL apps
    -
  • -
  • Conclusion:Using OpenGL with OpenCPN will be a significant upgrade for some users of OpenCPN, but OpenGL may not be “better” for everyone's OCPN application.
    -
  • -
  • So, user's choice. If OpenGL works better for you, then use it. If not, the old DC based graphics render system is still in place.
    -
  • -
- -

-Start using OpenGL -

-
    -
  • Find the latest driver for your graphic card. The driver that came with your operating system, is not likely to be the best. Start looking at your graphic card makers home page.
    -
  • -
  • Go to the ToolBox→Settings and tick the two boxes “Use Accelerated Graphics(OpenGL)” and “Enable Smooth Panning/Zooming”. Read all the details in the Options Setting > Display Tab.
    -
  • -
- -
- -

Other tricks

-
- -

-If you have a lot of graphic memory, or very little, try to add the following to your config (.ini on windows) file: -

-
  [Settings] ....
-  GPUMemorySize=nnn
- -

-where nnn is graphics card memory size, in MBytes. 256 MBytes is the default. -

- -
- -

Supplementary Software to test Graphics Adapter Opengl compatibility

-
- -

-Troubles in OpenGL mode?** -

-
    -
  • Make sure the proper updated drivers for your graphics card.
    -
  • -
  • Earlier Intel HP Graphics, chips do not offer full OpenGL support. This is where the opengl issues tend to occur.
    -
  • -
  • One good option is to get a newer graphics board that supports OpenGL fully. (I would suggest Nvidia, but there will be various opions about that.)
    -
  • -
  • Another option is to try adjusting the OpenCPN OpenGL settings, unchecking all the advanced features and testing.
    -
  • -
  • Then if there are still difficulties, running this software may show exactly what the problem is.
    -
  • -
- -

-This free adapter testing software is for various operating systems, including Windows 32bit and 64bit. -

- -

-GLview: OpenGL Extensions Viewer http://www.realtech-vr.com/glview/ -

- -

-This software tool tests your graphics card capabilities and makes a report log. It is useful in tracking down particular problems with OpenGL on a given system. The Developers can then help determine what is wrong. -

- -

-However when other software like GoogleEarth works OK with OpenGL on, then there are possibly other reasons why OpenCPN fails, related to the Opencpn OpenGL implimentation. There are many, many graphics cards and they have differing capabilities and sometimes the Opencpn opengl implimentation has to be adjusted for a particular card. -

- -
- - -
- - diff --git a/data/doc/advanced_features/portable_opencpn.html b/data/doc/advanced_features/portable_opencpn.html deleted file mode 100644 index 0e4b507fee..0000000000 --- a/data/doc/advanced_features/portable_opencpn.html +++ /dev/null @@ -1,213 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:portable_opencpn - - - - - - - - - - - - - - - - - - - - - -
- - - -

Portable OpenCPN

-
- -

-An updated version for OpenCPN 4.6.1 is also available -

- -

-The OpenCPN portable option allows the program to run from an USB stick, or run independent from, and parallel to a normal installation. -

- -

-Using Windows, it is not possible to run concurrent instances of OpenCPN, unless using the portable option. -

-
    -
  • You can start the regular OpenCPN and a portable version later. The other way around will not work.
    -
  • -
  • You can run multiple portable instances at the same time. It makes sense to run these from different folders, to avoid possible data corruption.
    -
  • -
- -

-To differ between various instances of the program, the titlebar on portable versions looks like this. -

- -

-
- -

- -

-It is thus possible to run multiple portable instances and identify each version. -

- -
- -

To create a portable Windows version

-
-
    -
  1. Create a new directory dedicated to the portable OpenCPN.
    -
    -
  2. -
  3. In a separate window, navigate to C:\Program Files (x86)\OpenCPN (on 64-bit systems) or C:\Program Files\OpenCPN (on 32-bit systems), and copy (don't move) the following data directories (with containing files) into this new directory:
    -
      -
    • doc/
      -
    • -
    • plugins/
      -
    • -
    • s57data/
      -
    • -
    • share/
      -
    • -
    • sounds/
      -
    • -
    • tcdata/
      -
    • -
    • uidata/
      -
    • -
    • wvsdata/ (only for OpenCPN 3.2.0 and earlier)
      -
    • -
    -
  4. -
  5. From the same OpenCPN folder, copy the following files into the new directory:
    -
      -
    • crashrpt_lang.ini
      -
    • -
    • CrashRpt1401.dll
      -
    • -
    • CrashSender1401.exe
      -
    • -
    • license.txt
      -
    • -
    • OpenCPN.exe (of course)
      -
    • -
    • Eight wxWidgets dlls beginning with the name “wxbase” (This needs an expert's attention)
      -
    • -
    -
  6. -
  7. Now navigate to C:\Windows\SysWOW64 (on 64-bit systems) or C:\Windows\System32 (on 32-bit systems) and copy the following files into the new directory:
    -
      -
    • msvcp100.dll
      -
    • -
    • msvcr100.dll
      -
    • -
    -
  8. -
  9. If running Windows, create MSDOS batch file “opencpn portable.bat” (or other name of user choice) containing the one line:
    -
  10. -
-
<code>
-opencpn -p
-</code>
- -

-This file must be in the new directory. If you want your batch file to be in a different directory, you must edit the batch file to include “cd” commands to navigate into the new directory before the line containing the -“opencpn -p” command. -

- -

-To run OpenCPN portably within this directory, simply execute the “opencpn portable” batch file. There may be a way to build a click-able shortcut to OpenCPN, with the -p option specified in the shortcut. But I could not figure it out. Windows insists upon a drive letter in the command line of the shortcut, which would defeat the whole purpose of portability.Thus, the batch file…. -

- -

-If the charts are also in the current dir, then the entire installation is “portable”, meaning there are no hard-coded drive letter dependencies, and all write activities occur in the current dir only. -

- -

-This setup works very well from a USB stick. -

- -
- -
Additional Notes for OpenCPN v4.1.xx and 4.2
-
- -

-Use these files they are more current -

-
    -
  • msvcp120.dll ←-better than msvcp100.dll
    -
  • -
  • msvcr120.dll ←-better than msvcr100.dll
    -
  • -
  • libcurl.dll ←-needed for chartdownloader and other features.
    -
  • -
  • 16 wxWidgets ←-Files in main directory, rather than the 8 mentioned, best to copy all.
    -
  • -
  • zlib1.dll ←-Also best to copy zlib1.dll
    -
  • -
- -

-For a higher running priority see: Command Line -

- -
- -

A Linux version

-
- -

-On Linux, a similar functionality exists. The 32 and 64 bits issue is similar. -

- -

-32 bits version can be made to work on a 64 bits Linux by installing ia32-libs or multiarch support packages. The opposite way, a 64 bit version on a 32 bit system, will not work. -

- -

-Copy the opencpn executable binary and the data directories mentioned above to a local directory. -

- -

-In that directory, do: -

-
$ ./opencpn -p
- -

-This will cause all user data files to be created and used from within that local directory. -This can be useful for side-by-side testing… -

- -
- - -
- - diff --git a/data/doc/advanced_features/portable_opencpn_v2.html b/data/doc/advanced_features/portable_opencpn_v2.html deleted file mode 100644 index 43b5ffa86f..0000000000 --- a/data/doc/advanced_features/portable_opencpn_v2.html +++ /dev/null @@ -1,371 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:portable_opencpn_v2 - - - - - - - - - - - - - - - - - - - - - -
- - - -

Portable OpenCPN V2

-
- -
- -

How to create a portable OpenCPN program on a USB memory stick, including the split-screen configuration

-
- -

-The Help files in the OpenCPN program are out-of-date with the latest release 4.6.1. I will describe the method I have found to create a folder containing the necessary files and folders that can be copied to a USB memory stick (flash drive) and used directly with a Windows based computer. -

-
    -
  1. -
  2. -
- -

-Create a folder on the Desktop (or any convenient place) titled “Portable OpenCPN”. The necessary files and sub-folders will be placed in this folder. It’s the one that, when done, can be copied to a memory stick for portable use. -

- -

-portable01.jpg -

-
    -
  1. -
  2. -
- -

-On the C:\ drive locate the OpenCPN folder under Program Files (x86) -

- -

-portable02.jpg -

-
    -
  1. -
  2. -
- -

-Open this folder (right-click and select Open or double left-click). Select all files and folders (CTL-A) then right-click and select Copy to place these files and folders on the clipboard. -

- -

-portable03.jpg -

-
    -
  1. -
  2. -
- -

-Navigate back to the Desktop, open the Portable OpenCPN folder, right-click on the empty screen and select Paste. -

- -

-portable04.jpg -

-
    -
  1. -
  2. -
- -

-On the C:\ drive, locate the opencpn folder under the Program Data folder. (NOTE: The Program Data folder is a hidden file and must be selected to be shown (It’s a selection on Control Panel/Folder Options)). Open this folder, select all the files except Crash Reports and Copy to the clipboard. -

- -

-portable05.jpg -

-
    -
  1. -
  2. -
- -

-As before, return to the Portable OpenCPN folder on the Desktop and Paste these files and folders into that folder. -

-
    -
  1. -
  2. -
- -

-To enable the program to run from the memory stick it is necessary to use a ‘batch’ file for launching. The batch file is created by any text editor but saved with a ‘.bat’ suffix, not a .txt suffix.. -

- -

-I’ve used Notepad to add the words as shown. -

- -

-portable06.jpg -

- -

-Select File/Save As… -

- -

-portable07.jpg -

- -

-On the Save As screen select from the elevator Áll Files (*.*) Otherwiseit wants to save it as a .txt file. -

- -

-portable08.jpg -

- -

-On the next screen I have entered the name ÁLWAYS DBL CLICK HERE TO START.bat Note the suffix .bat. Now click on Save. The name for this file is up to you. If the name starts with the letter ‘’A’’ then it will be visible at the top of the files and under the folders when the folder is open. -

- -

-portable09.jpg -

- -

-… and save it with a click in the Portable OpenCPN folder on the Desktop. -

- -

-portable10.jpg -

-
    -
  1. -
  2. -
- -

-So far we have loaded the basic OpenCPN program on the memory stick but it will need charts and other items to be useful. Here I have created a ‘CHARTS’ folder under the Portable OpenCPN folder. From my host computer I have copied the charts as shown: the cm93 vector charts from 2007 (the best for the SEAsia waters) and my collection of .kap Overlay Charts for Indonesia and the Philippines that were created with the GE2KAP program. -

- -

-portable11.jpg -

-
    -
  1. -
  2. -
- -

-Other items I find useful I have copied from my host computer. -

- -

-The Layers and User icons folders are located in the Program Data/opencpn folder. These are copied and pasted into the Portable OpenCPN folder. Placing a Layers folder here allows the contents to be displayed or hidden with one click in the Route & Mark Manager within the OpenCPN program. The UserIcons folder contains additional icons from those in the default installation when describing marks you create in the program. These are available from the OpenCPN Downloads page on the internet. -

- -

-portable12.jpg -

- -

-I have plugins on my host computer that are in addition to the default ones that come with the OpenCPN program. To have these in the portable version I have copied them from my host computer into the plugins folder in the Portable CPN folder. -

- -

-portable13.jpg -

- -

-Other information on my host computer that I want copied over are Anchorages, Routes and Miscellaneous Waypoints. These are shown here. -

- -

-portable14.jpg -

-
    -
  1. -
  2. -
- -

-Let’s run the program! Double-click on the batch file. -

- -

-portable15.jpg -

- -

-portable16.jpg -

- -

-The batch file launches (it will stay running in the background) and the first welcome screen of the OpenCPN program. Click on OK and ….. -

- -

-portable17.jpg -

- -

-GPS CONNECTIONS -

-
    -
  1. -
  2. -
- -

-For ‘Stand alone’ mode. (The program is run from the memory stick but uses a GPS signal available on the host computer) This mode requires that a GPS signal be available, usually on some COM port. Assume such is the case where a USB GPS has been connected to the host computer and the signal is available on the COM1 serial port. -

- -

-Go to Options/Connections and click on Ádd Connection’ Click on the ‘’elevator’’ to display the host computer COM port then click on ‘’Apply’.’ -

- -

-portable18.jpg -

- -

-portable19.jpg -

- -

-This screen appears .. click on ‘’OK’’ The display shows the GPS input is active by the green bars in the UR and the boat icon is now red color. -

- -

-portable20.jpg -

- -

-portable21.jpg -

-
    -
  1. -
  2. -
- -

-For ‘Split-screen’mode. (The program is run from the host computer and also from the portable configuration) This configuration gives two displays of the OpenCPN program on the screen. This allows a close-up view and a zoomed-out view simultaneously. To do this the OpenCPN program is run from the host computer and the second display for the split-screen is run from a portable configuration. (The portable configuration can be on a memory stick or resident on the host computer). The problem to overcome is that running the OpenCPN program from the host computer, using a COM port, denies that COM port from any other use, i.e. it cannot also be used for the portable configuration. The solution is to output the GPS signal from the host computer on a local UDP network and receive the signal on the portable configuration from the UDP network instead of a COM port. -

- -

-The settings we will use are: Host computer - UDP IP 127.0.0.1, Port 10110, output Portable configuration – UDP IP 0.0.0.0, Port 10110, input -

- -

-On the host computer, go to Options/Connections. Click on ‘’Add Connection””. Click on ‘’Network’’, check the‘’UDP’’ button, insert numbers as shown, check the -

- -

-“”Output ..”” box and click on “”Apply””. -

- -

-portable22.jpg -

- -

-portable23.jpg -

- -

-You ‘may’ see this screen appear: -

- -

-portable24.jpg -

- -

-Check and uncheck the boxes as shown and click on ‘’Allow access’’ -

- -

-portable25.jpg -

- -

-Launch the portable OpenCPN program. Repeat as above to establish these settings: Click on ‘’OK’’. -

- -

-portable26.jpg -

- -

-Now display both programs and move the edges to show a split-screen display. Note that the GPS data is present on both screens. -

- -

-portable27.jpg -

- -

-portable28.jpg -

- -

-portable29.jpg -

- -

-HINT: When moving the edges of the two screens down, do not go into the ‘taskbar ’area, though it may be hidden. Avoiding this area will keep the screen configurations in the same split-screen mode when next re-launching the programs. -

- -

-VOILA! -

- -

-See, that wasn’t so hard was it? If you have problems or need help I am just an email away. Email: yachties(that symbol)yahoo.com -

- -

-Terry -

- -

-18 April 2017 -

- -
- - -
- - diff --git a/data/doc/advanced_features/route_to_autopilot.html b/data/doc/advanced_features/route_to_autopilot.html deleted file mode 100644 index a4521eef98..0000000000 --- a/data/doc/advanced_features/route_to_autopilot.html +++ /dev/null @@ -1,230 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:route_to_autopilot - - - - - - - - - - - - - - - - - - - - - -
- - - -

Route to Autopilot

-
- -
- -

Send a Route to the Autopilot, the basics

-
- -

-If an autopilot is connected to an output port, as defined in the Options→Connections tab, and a route is active, OpenCPN sends NMEA RMB, RMC, and APB sentences to the A/P. -

- -

-Read more in Options > Connections -Sending an Active Route to an Autopilot
- -in Options > Data Connections (at the bottom) for more information about connections and testing. -

- -

-Note that a Connections Output Port must be configured to send ECRMB, ECRMC and ECAPB NMEA sentences to the Auto Pilot. -

- -

-Also read about the Activate Route & Active Route Console and Active Route Console Window - Showing Active Leg Data -in Marks and Routes towards the bottom. -

- -

-It is essential to have turned on an Active Route in order to send waypoints to the Autopilot.
- -

- -
- -
Waypoint Advance
-
- -

-OpenCPN automatically shifts to the next waypoint in the route using an arrival radius of 0.05 miles (= 92.6 m) by default. This value can be changed in Options→Ships→Own Ship. The arrival radius can be adjusted in each waypoint properties dialog as well.
- -

- -

-This works fine in the general case. The A/P is watching the NMEA stream. It sees a new destination lat/lon, and new heading to steer, and then asks the user for confirmation to make the turn. Raytheon/Autohelm works this way. -

- -
- -

Simulation & Testing - Short description

-
- -

-To create outgoing ECxxx messages make a (left click menu) “Navigate to here” to a arbitrary point. You may need to filter outgoing sentences on the network connection to only send “EC” (and filter out the same on the incoming side to avoid feedback) so you don't receive them and then send duplicates. The information is scattered so use your browser to search for “autopilot”.
- -

- -
- -

Autopilots and Routes, the details.

-
- -

-Please read -Advance route waypoint on arrival only first. Here is a detailed discussion of Options→Ships→OwnShip→Advance route waypoint on arrival only. -With an Active Route, in the Active Route Console “This Leg” is visible near the upper right corner of the screen in the console: -

- -

- -

- -

-RNG (actual range) Distance to the next waypoint.
- -NR (normal range) Distance from destination waypoint to a line orthagonal to or at right angles to the current route segment which passes through ownship. When shown, NR is after RNG.
- -

- -

-
- -

- -

-There are two general conditions:
- -1. RNG=NR On course with no cross track error (XTE=0)
- -2. RNG>NR Off course (sailing perhaps) with cross track error (XTE>0)
- -When the difference is greater than 10% both values are shown in “RNG”
- -

- -

- -

- -

-The “normal” range is the second number shown. 1.88 in this case.
- -
- -The four diagrams below represent four different conditions:
- -1. RNG = NR and XTE=0 (Boat is on the route)
- -2. RNG > NR and XTE>0 (Boat is off the route), which corresponds with the dialog shows both RNG and NR (When there is a 10% difference between NR and RNG).
- -Additionally Waypoint Advance (Default and Option) Alternatives:
- -3. Waypoint Advance (Normal default).
- -4. Advance Waypoint upon Arrival only. (Option checked)
- -
- -Waypoint Advance (Normal default)
- -When following a Route OpenCPN normally decides to advance to the next waypoint if at least one of the following two conditions apply. -

-
    -
  1. NR (normal range) is less than the declared arrival radius. OR
    -
  2. -
  3. RNG (actual range) is increasing for 2 seconds. Ownship is moving away from the target waypoint, and has been for more than two seconds.
    -
  4. -
- -

-Waypoint Advance (Normal default) when Range (RNG) = Normal Range (NR) and XTE=0 or near 0
- -

- -

- -

- -

-Waypoint Advance (Normal default) when Range (RNG) is 10% > Normal Range (NR) and XTE >0 -

- -

- -

- -

-Option: Check Advance route waypoint on arrival only. With this activated., OpenCPN only advances the route to the next waypoint, if condition 1 above is true (NR<Arrival Radius). Condition 2 is ignored.
-
-Advance route waypoint on Arrival only (is checked) when Range (RNG) = Normal Range (NR) and XTE=0 or close
- -

- -

- -

- -

-Advance route waypoint on Arrival only (is checked) when Range (RNG) is 10% > Normal Range (NR) and XTE>0
-[Editor's Note: Diagram needs correction. Boat B location Normal Range should be shown at the arrival radus with boat staring turn.]
- -

- -

- -

- -

-Advance Waypoint upon arrival only (option) is useful when sailing and you can't lay the next mark and are forced to tack to reach it. It allows a ship to move away from waypoint without automatically advancing to next waypoint.
-Note: Waypoint Advance (normal default) is dependent on NR < Arrival Radius OR RNG increasing more than 2 seconds, so what this option does is overide that second condition.
-
-Advance Waypoint upon arrival only (option) ensures that the next current waypoint remains active
-1. NR<Arrival Radius is reached OR
-2. A line just inside of the Arrival Radius which is also “normal” or perpendicular to the marked route is reached. In this case there is a cross track error.
-
-On the other hand….
-Waypoint Advance (normal defualt) helps you if you really want to cut a corner by a large distance, in such a way that the “normal range” will never be less than (Arrival radius). The second condition, RNG increases for > 2 seconds, willl automatically advance the route to the next waypoint in this case. -

- -
- - -
- - diff --git a/data/doc/advanced_features/user_icons.html b/data/doc/advanced_features/user_icons.html deleted file mode 100644 index dfaa0e31b5..0000000000 --- a/data/doc/advanced_features/user_icons.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - opencpn:opencpn_user_manual:advanced_features:user_icons - - - - - - - - - - - - - - - - - - - - - -
- - - -

User Icons

-
- -
- -

A user can install his or her own icons to use with marks and "own ship".

-
- -

-The procedure goes like this: -

- -

-1. Create a directory called “UserIcons” in the same place that holds your opencpn.ini(config) file.
- -In MSW this is the same folder that holds the log file. Easiest way to find this is to go to the - button in the ToolBar and look all the way down in the first tab (About).
- -In Linux create the directory: /home/$USER/.opencpn/UserIcons.
- -

- -

-2. Add jpg icon files to this directory. Legacy .xpm iconfiles also works They can be any size. The name of the icon file becomes the name of the new waypoint icon. These new icons will appear on the Waypoint Properties dialog, and can be assigned to any waypoint. They can also be assigned in GPX Import files.
- -3.To replace the default own ship icon , just put a file ownship.xpm or ownship.jpg in the UserIcons directory, described above.
- -

- -

-4 For color-blinds and others, there is a yellow version available. Use the link to “bigdumboat” below or the different alternatives from S/V Revelations. Before using any yellow OwnShip icons, consider the special meaning of this color for the OwnShip Icon in OpenCPN. Read more here "GPS Setup and Status" -

- -
- -
- -

- -

- -
-
- -

- -

- -

- -

- -
-
- - -
- - -
- - diff --git a/data/doc/charts.html b/data/doc/charts.html deleted file mode 100644 index 31c74897d6..0000000000 --- a/data/doc/charts.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts - - - - - - - - - - - - - - - - - - - - - -
- - - -

CHARTS

-
- -

-
- -

- -
- -

Introduction

-
- -

-This section will cover the universe of charts thru the lens of OpenCPN: installing, using, finding, different formats supported, using purchased charts, and more. -

- -
- -

Options > Charts > Tabs

-
- -

-Chart Files Tab Install charts & manage directories
- -Vector Display Tab Vector Display options
- -Chart Groups Tab Create & Manage chart groups
- -Chart Downloader Tab Download & update free charts.
- -Chart Manual Installation Instructions for installing charts.
- -

- -

-1charts.jpg -

- -
- -

Chart Plugins - Fee Based

-
- -

-Information on these can be accessed through the online wiki:
-S63 Vector Charts Plugin
- -oeSENC Vector Charts Plugin
- -BSB4 Charts Plugin
- -NV Charts Plugin
- -

- -
- -

Chart Use and Management

-
- -

-Scaling Charts Use Scale tool to change chart scale.
- -Chart Quilting Display portions of charts at the same scale.
- -Chart Status Bar Chart Buttons for current charts at screen bottom.
- -Chart Information Right-click Chart Buttons at bottom of screen.
- -

- -
- -

Chart Resources

-
- -

-Chart Sources; Free chart sources list. (see online wiki).
- -Chart Formats Supported chart formats.
- - Background GSHHS Shoreline
- -High Resolution Background GSHHS Shoreline (see online wiki)
- -

- -
- -

Advanced Chart Work

-
- -

-IMHO ECDIS ECDIS Standards
- -Advanced Chart Work
- -CM93 Offsets How to correct Offsets at your own risk.
- -Chart Conversion Manual, Kap, Imgkap, libBSB GE (see online wiki)
- -

- -
- - -
- - diff --git a/data/doc/charts/advanced_chart_work.html b/data/doc/charts/advanced_chart_work.html deleted file mode 100644 index 28781986d9..0000000000 --- a/data/doc/charts/advanced_chart_work.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:advanced_chart_work - - - - - - - - - - - - - - - - - - - - - -
- - - -

Advanced Chart Work

-
- -

-The process of making a chart from a “picture of a chart”, including geo-referencing is called “Chart Conversion”. -How to do Chart Conversions is in a separate document
- -

- -

-Chart Conversion (view online)
- -

- -

-If this link does not work you will find the information on the website under
- -

- - - -
- - -
- - diff --git a/data/doc/charts/chart_downloader_tab.html b/data/doc/charts/chart_downloader_tab.html deleted file mode 100644 index 3d5d2830b1..0000000000 --- a/data/doc/charts/chart_downloader_tab.html +++ /dev/null @@ -1,290 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:chart_downloader_tab - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Downloader Tab

-
- -
- -

Chart Downloader

-
- -

-The Chart Downloader Plugin is now included in your OpenCPN installation. It lets you download, install and keep up to date the navigational charts provided by various free governmental sources worldwide directly from within OpenCPN's Toolbox. -

- -

-The supported charts include both the raster and vector charts for the US waters provided by the NOAA, official raster navigational charts published by Argentina, Brasil and New Zealand (covering also huge areas of the Pacific ocean) as well as electronic charts of the inland waterways of the USA and more than a dozen European Union countries. -

- -

-For Manual Installation Instructions but Chart Downloader is preferred. -

- -
- -

A Few Basic Concepts

-
- -
- -

Chart Catalogs

-
- -

-The Chart Downloader relies on catalogs of charts. A catalog is an XML file containing the names of charts along with the most recent chart update date and time together with the Internet address of the actual chart data. Before being able to download any charts we have to configure and download one or more chart catalogs. -

- -

-The catalogs are provided by the agencies publishing the charts (NOAA and the Army Corps of Engineers in the USA) and by the ChartCatalogs project created by the author of this plugin. When a catalog is loaded the Chart Downloader automatically scans the existing charts on your computer looking for updated or new charts listed in the catalog. -

- -
- -

Chart Downloader Tab

-
- -

-In the current version of OpenCPN, Chart Downloader is automatically included. -

- -

-This is what the plugin looks like when first opened by clicking Chart Downloader -

- -

- -

- -
- -

Using the Chart Downloader

-
- -

-The screen has two sections. -

- -

-The top section is for Chart Catalogs. -

- -

-Some chart sources provide many different catalogs for the same set of charts. For example, in the USA, NOAA provides chart catalogs for each state, region and Coast Guard district as well as the huge complete set. -There are also separate catalogs for raster (RNC) and vector (ENC) NOAA charts. -The first step in getting new charts is to select the appropriate Chart Catalog, make sure you think first though - having everything is not always the best option to organize your charts, so especially in the US, consider using more smaller catalogs over the one with the complete set of thousands of charts. -

- -
- -

Adding a chart source

-
- -

-Click the button to get the dialog. There are catalogs for all the free chart sources worldwide known at the time of the release of this plugin. The catalogs are organized in a folder structure. Open each folder to see subfolders. Open subfolders to see catalogs. Select any catalog you like by clicking the catalog description. -

- -

-5ad702b840787080111986d68eeef27d.jpg -

- -

-After clicking the catalog you want, the “Chart Directory” will be automatically filled in. This is the directory on your computer where the catalog and the charts for this catalog will be downloaded. If the recommended directory is acceptable click “OK”. -

- -

-First time users will find it much easier to accept this default. Otherwise you can use the “Browse” button to browse to another directory where you want the catalog and charts to be kept. Once you are happy with the Chart Directory click “OK”. -

- -

-In case you selected a path to save the charts not covered by the current OpenCPN configuration, the plugin configures it for you. -

- -

-You can check the configuration on the “Chart Files Tab”. For more details about managing your charts, you should definitely read Chart Files Tab - Installing Charts
- -

- -

-1pleaseupdate.jpg
- -

- -

-Now you will see the Chart Catalog listed in the Catalogs section. Note that it will say (Please update first) under the Released column. -

- -

-Click the catalog name then click the “Update” button. The Downloader will retrieve the catalog from the server. After the catalog is saved a list of charts will appear in the lower section. Each chart has a check box. If the box is checked then that chart is scheduled to be downloaded. Depending on the Preferences you selected earlier the boxes will be automatically checked. You can check or uncheck individual charts or use the right mouse button to check and uncheck groups of charts. -

- -
- -

Updating the catalogs

-
- -

-The US agencies update their catalogs on a standard weekly schedule, related to the Notice to Mariners releases. The catalogs from the Chart Catalogs project are updated occasionally, without any fixed schedule. You should select the chart source and click the Update every once in a while to get the latest chart updates. -

- -
- -

Selecting charts for download

-
- -

-You can select the charts to be downloaded by ticking the check boxes in the list of charts. In case you want to select multiple charts at once, right-click in Chart Window will show a context menu, allowing you to -

-
    -
  • Select all
    -
  • -
  • Deselect all
    -
  • -
  • Invert selection
    -
  • -
  • Select updated
    -
  • -
  • Select newly released
    -
  • -
- -

-charts. You can configure the plugin to automatically preselect the updated and/or new charts after an update of the chart catalog in the preferences. -

- -

- -

- -

-NOTE: In addition to the right-click chart selection, you can Highlight a chart, then use “Spacebar” to check or uncheck. Then hit the down or up button and repeat. This is faster than Mouse clicking for groups of files. -

- -
- -

Downloading charts

-
- -

-After selecting the charts for download, click the “Download selected charts” button to start downloading the charts. It can be a lengthy progress and a dialog box showing progress will pop as each chart is downloaded. If any charts do not download correctly a warning will pop up at the end. The status of the charts that have been downloaded successfully will change to Up to Date. Sometimes a slow or flaky Internet connection will cause a chart not to download and the status will remain the same. You can just click the Download selected charts button again give them a second chance. -

- -

-A recent improvement is the use of a separate CPU thread (when it is available) for downloading charts. -

- -

-Chart Folder Tab and Chart Group Tab reminder. A reminder box will pop up to tell you that you have to notify OpenCPN where to find the charts. We’ll do that in the next step. -

- -
- -

After the download

-
- -

-Upon Closing the Chart Downloader will automatically complete a Scan and Database Rebuild of the Chart Database, so the charts will be ready for use. For vector charts, one sensible step remains. Go to Options→Charts→Chart Files and press the button Prepare all ENC Charts. This will preprocess all new vector charts and updates, and prevent delays when actually using the charts -

- -

-If you should see the dialog below please Update the internal chart database and the plugin will remind you about it with a dialog. -

- -

- -

- -

-For more details about managing your charts, you should definitely read Chart Files Tab - Installing Charts -

- -

-To make it short, go to Options > Chart Files Tab and tick the Scan Charts and Update Database checkbox and when you close the Toolbox using the OK, your newly downloaded charts will be scanned and made available for viewing. -

- -
- -

Checking the downloaded charts

-
- -

-The button Show Local Files on the lower right will open your default file manager in a separate window, which allows you to check files and directories easily. -

- -

- -

- -
- -

The Preferences

-
- -

-You can customize the behavior of the plugin to certain extent. To access the preferences, select the Chart Downloader plugin on the Options > Plugins Tab and click on the Preferences button -

- -

- -

- -

-The Default Path to Charts option allows you to set the top directory for all your charts, used to construct the suggested locations for the chart sources you configure. -

- -

-The All updated charts and All new charts check boxes tell the plugin which charts you want to select for download automatically upon a catalog update. -

- -

-The Allow bulk update of all configured chart sources and charts checkbox adds a new button to the Chart Downloader Tab, allowing you to update and download all the charts you are managing using the plugin with a single click. The behavior of this function depends on the aforementioned check boxes - either it downloads only new or updated charts or both. -

- -
- - -
- - diff --git a/data/doc/charts/chart_files_tab.html b/data/doc/charts/chart_files_tab.html deleted file mode 100644 index 07fc513112..0000000000 --- a/data/doc/charts/chart_files_tab.html +++ /dev/null @@ -1,399 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:chart_files_tab - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Files Tab

-
- -

-
- - -

-
The potential danger to the mariner increases with digital charts because by zooming in, he can increase the chart scale beyond what can be supported by the source data. The constant and automatic update of the vessel’s position on the chart display can give the navigator a false sense of security, causing him to rely on the accuracy of a chart when the source data from which the chart was compiled cannot support the scale of the chart displayed.
-Bowditch 2002 Ed p 412.
- -
- -

Installing Charts

-
- -

-For the first time user, the easiest path is to use Chart Downloader Tab First, even if your primary charts are found somewhere else. It's possible, even desirable, to find charts in many places that the Chart Downloader doesn't cover (e.g. CM93 Vers 2). But when getting started, take the easier path. You will learn how things work and will make better choices when adding charts from other sources.
- -
- -
- -
- -Free Brazilian charts OpenCPN doesnot come with any pre-installed charts. It is up to the user to find and install charts. Read on, and you will find detailed information about which chart formats that OpenCPN can display, as well as pointers to all available charts for OpenCPN, free downloads as well as commercial, that we know of. -

- -

-
- -

- -
- -

Background Chart

-
- -

-
- -OpenCPN comes with a worldwide background map, in GSHHS format, displayed if no charts are available for an area. -
- - -
- -
- -To install charts, OpenCPN must be pointed to a directory containing Charts of one of the recognized -

- -

-Chart Formats Don't point OpenCPN to individual charts. You must specify the directory that contains the charts. -
- -

- -
- -

Where do I keep my charts ?

-
- -

-
- -The installation tells you to go to the Options→Charts→Chart Files tab to install charts. -
- -When you press the “Add Directory” button the default directory will be “My Documents” for Windows, and the users home directory, for Linux and Mac. These are good places to keep your charts. Create a “Chart” directory, and maybe some sub directories, to keep your charts in, and you can't go far wrong. -
- -We suggest you can create a “Chart” directory, and possibly two or three sub directories, “RNC” and “ENC” and possibly “CM93” to keep your charts in, and you can't go far wrong. Seasoned users knows where they want their charts. -
- -Regard charts as data, independent of OpenCPN. Store them in a place that is convenient for you and that is left alone by the operating system. -
- - -
- -The main consideration for charts is storing them in a directory where they will not be tampered with or moved accidentally. -
- -

- -
- -

Installing Charts

-
- -

-
- -Open the Options Dialog by clicking
- -You are sent to the first tab “Display”. Tick the box “Show Chart Outlines”. That will help you visualize the loaded charts.
- -
- -
- -Then click the tab “Charts” and then the tab “Chart Files”.
- -
- -
- -
- -There are no charts loaded. To add charts we have to add a directory that contains charts of a recognized format. To get started press “Add Directories” and navigate to your chart-directory. -
- -
- -
- -Exactly how the dialog looks like depends on your operating system, and is not a part of the core OpenCPN.
- -When clicking the button “Open” above, the highlighted chart directory is added to the box “Directories”. The screen-shots are from Linux, but this process works similarly on all platforms. Add more chart directories using the same process again. It's OK to load both raster- and vector-charts together.
- -
- - -
- -All that remains is to click the “Apply” button. OpenCPN will then process your selection. You can now start using your charts. When you are done with your settings click “OK” and the Options Dialog closes. If you are just adding a chart directory, it works fine to just click the “Ok” button.
- -The charts often come in a compressed package eg. a ZIP archive. You must first uncompress them to your disk to be able to set them up. The following screenshot shows the file and directory structure of the NOAA raster charts (RNC) on a local disk -
- - -
- -Note that in OpenCPN you must add directories (folders) containing charts, not the individual charts.
- -For BSB4 and nv-charts, first install the latest plugin version, then point OpenCPN to the correct chart directories and finally do a “Full Database Rebuild”.
- -Eager to get some charts quickly, to get started? Go to: Use the integrated Chart Downloader Tab -

- -
- -

Check your charts after installation

-
- -

-
- -This step is important if you just installed some old BSB charts, say from the ninties, or charts of dubious origin. For example, there are a lot of old Maptech charts that uses the Geodetic Datum “Unknown”.
- -It is not a problem with recent charts.
- -OpenCPN Version 4.0 will reject charts without a projection and add a note in the log about the problem.
- -Charts with an unrecognized Geodetic Chart Datum will be loaded as if they were WGS84. This may lead to unacceptable errors. The Chart Information Dialog will contain the sentence:“Warning: Chart Datum may be incorrect.” , and the log will contain a note with the words “Chart datum {XXXX} invalid on chart”.
- -For practical use, it's very important that the implication of this is understood.
- -Read up on the subject in the Chart Info page -

- -
- -

Start using your charts

-
- -

-
- -You can click and drag the chart with your mouse. The cursor changes to an triangular green arrow near the edges of the OpenCPN window, left clicking in this situation, pans the chart in the direction of the arrow. The scroll wheel zooms in and out. Left clicking anywhere centers the view on that position. Right clicking brings up a menu with useful actions. Exactly what the menu contains depends on the circumstances. Read the rest of the manual for a full explanation.
- -
- -If you are running OpenCPN for the first time you may see the background chart instead of the charts you installed. That simply means OpenCPN is pointed at a location that is not on any of the charts you installed. Click and drag, or use the arrow keys, to move the view-point to the location of one of your installed charts as described under “A few hints” below. Look for the rectangular outlines of the installed charts. An alternative is to right-click, and then click “Jump to position”. Enter a location that is within the perimeters of your entered charts. The first time you start OpenCPN the view will be centered on Georgetown in South Carolina.
- -
- -Quilting Chart Mode is the default display mode. In this mode all available charts at the viewpoint will be quilted together seamlessly according to certain roles. Read more in Chart Quilting.
- -The other display mode is Single chart Mode were only one chart at a time is used. It is possible to read all the information printed in the perimeter of a raster chart. To change to another chart, select and click in the Chart Selection Bar. Read more in Chart Status Bar.
- -
- -Starting with vector charts? -

- -

-If you are new to vector charts, including CM93 v2, on OpenCPN follow this quick-start guide: -
- -Go to Options {:opencpn:opencpn_user_manual:settings.jpg?nolink&32×32}} Charts> Vector Chart Display and copy the settings below for the Display Category. -
- - -
- -Press this button in the ToolBar to toggle text display. Alternatively, the “T” hotkey does the same thing. -
- -These are not the “perfect” settings, but you will see most of what you expect from a vector chart. -
- -As soon as you have made yourself reasonably comfortable with OpenCPN and before using Vector Charts for actual navigation, make sure you understand all the settings in the Options> Charts> Vector Display Tab by reading the Vector Display Tab page.
- -
- -

- -
- -

Loading Vector Charts

-
- -

-
- -When using a vector chart for the first time, OpenCPN has to process the data, and transform the information to an internal display format. Click the green chart rectangle in the chart-bar to start the process.
- -
- -This can take some time, depending on your computer. This internal SENC chart, is saved for future use. The created files are quite large, but is in a format optimized for quick loading. OpenCPN is trading, creation time and size, for fast rendering when actually using the vector chart. The SENC files are saved in the SENC directory, in the same place as the opencpn.conf file - opencpn.ini on windows.
- -To avoid getting a very long series of SENC charts being built at the same time, use single chart mode, for better control. This is certainly called for in areas that are densely populated with vector charts. Single chart mode and quilting are explained on this page Chart Quilting .
- -You probably do not want to build SENCs for all of your loaded S57 ENCs unless you plan to actually go there…. -

- -

-
- -The new and easy way to do all this in OpenCPN version 4.8.0 is to go to Options→Charts→ Chart Files and press the button “Prepare all ENC Charts”. The button is found at the bottom left of the dialog. The process will take quite some time, depending on the computer and number of charts, the first time. Adding a few charts or updating existing charts should be quick once the initial processing is done. -

- -
- -

Updating Vector Charts

-
- -

-
- -Publishers of Vector Charts, such as NOAA and EAHC issues regular updates. OpenCPN updates the created SENCs automatically. The chart itself, the base-chart, is named “name”.000 , the first update is “name”.001 and so on. As a user you only have to make sure that the update files are saved in the same place as the base-chart. In the case of a new edition of the chart a new “name”.000 file is issued. Just replace the old file with the new file and OpenCPN will update the SENC file. Don't forget to remove the updates to the old edition of the chart. -
- -In case of missing revisions in a series of updates errors may be introduced. OpenCPN will pop up a warning dialog with this content: -
- -

-
- - - -
“ S57 Cell Update chain incomplete ENC features may be incomplete or inaccurate. Check the logfile for details.”
- -
- -

CM93 Charts

-
- -

-
- -CM93-version2 Charts are different from the S57 vector charts, and has it's own data structure consisting of a number of folders and files. To load these charts in OpenCPN just add the top directory to the list of “Active Chart Directories”.
- -In the top CM93 directory is an empty file with the “.EXD”, for example 20110803.EXD. The format is YYYYMMDD.EXD. This is the version, or edition, of the CM93 -v2 release.
- -OpenCPN supports partial CM93 datasets, covering one or a few of the available regions. There is also support for multiple, as well as multiple partial, CM93 datasets.
- -The CM93 top directory contains a number of (144) subdirectories named from
- -“00300000” to “04501020”, as well as six other files. These sub directories each cover a geographical area of 40° x 40° . The first four numbers describes the latitude and the last four, the longitude of the SW corner of the area covered.
- -
- -This is a typical content of the CM93 V2 top directory.
- -
- -The key to understanding the numbers is to realize that CM93's coordinate system of the world starts at the South Pole or to be exact at lat -90° long 0° and from there proceeds North a East with a factor of 3 for each degree of lat and long.
- -The tile 00300000 hence has the SW corner at lat from -90° + 0030:3 = -80° or 80°S to and longitude 0°E , and covers the area from 80°S latitude to 40°S and from 0° longitude to 40°E.
- -Looking at 04501020 it brakes down to lat -90° + 0450:3 = 60° and long 1020:3 = 340° subtracting 360° results in -20° or 20°W. So we have he SW corner at 60°N and 20°W .
- -One more example, the tle 03900840 has the SW corner at 40°N and 80°W.
- -
- -Each of these sub-directories in turn contains directories with the individual charts. Ordered in scale from smallest to largest they are Z,A,B,C,D,E,F and G. Where Z contains overview charts and G contains harbor plans. Note that, generally, not all of these are present in each subdirectory.
- -

-
    -
  • Z covers 40° x 40° deg area and OpenCPN typically uses 1:3.000.000 scale
    -
  • -
  • A covers 20° x 20° deg area and OpenCPN typically uses 1:1.000.000 scale
    -
  • -
  • B covers 10° x 10° deg area and OpenCPN typically uses 1:200.000 scale
    -
  • -
  • down to..
    -
  • -
  • G covers 20' x 20' and OpenCPN typically uses 1:3500 scale.
    -
    -
  • -
- -

-The individual chart tiles in these directories have the same logic in the naming scheme as described above.
- -
- -A few hints. If you ticked the “Show Chart Outlines” box under the “Display” tab the loaded charts will be outlined in red for raster and green for vector charts. In CM93 the charts will be outlined in purple, but only in Single Chart Mode. The smallest scale charts in CM93, the Z scale and A scale charts, will not be outlined. Neither will all available charts be visible as outlines at the same time. The reason for this is computing speed and clarity. Generally the next level or two of larger scale charts are shown. When large scale plans are available directly from A scale charts, with no intermediate charts, the outline of the larger scale charts will be visible from a zoom level between 1.5 and 2.0, but only, as already mentioned, in single chart mode and with chart outlines switched on. Generally in areas where only A or Z scale charts are available, expect potentially dangerous omissions. -

- -

-Warning, do not use CM93 small scale charts alone for navigation without referring to other sources. -

-
    -
  • Be aware that it is possible to “Over-zoom” charts in OpenCPN. A warning will appear on the display. Please respect that warning. It is recommended to not zoom more than a factor 2, for safe navigation. The actual zoom-factor appears in the lower right-hand corner of the display.
    -
  • -
  • It is safe and reasonably efficient, to put all your charts except the CM93 database in one large directory, and set that directory in Options→Charts→Chart Files. The CM93 database contains its own file and directory structure. The top-level directory only, of this database, should be loaded, as described above.
    -If you do a lot of chart downloads, updates, etc., then it will be faster to break the charts folder into smaller groups, and specify them individually in the Options > Charts > Chart Files dialog. Consider using Chart Groups Tab
    -
    -
  • -
  • Scan Charts and Update Database ” Use this option if you have made any changes to the contents of your chart directories, as for example after downloading new charts from NOAA, etc. It need not be checked if directories are added or subtracted, as the entire database will be scanned and updated automatically in this case.
    -
  • -
  • Force Full Database Rebuild” is mainly aimed at users converting or correcting existing charts, in a situation where changes are made to the geo-referencing, outline of the chart, or other attributes in the kap file header section.
    -
  • -
  • OpenCPN, supports Mercator Charts, Transverse Mercator Charts, Universal Transverse Mercator (UTM) Charts and Polyconical Charts (used in parts of US and Canada). Charts using other projections will not be displayed. A note about the reason for the display refusal, will be found in the “opencpn.log”.
    -“Other” projections could be Lamberts Conformal Conic Projection, mainly used in high latitude polar areas.Gnomonic charts, mainly used in older, larger scale BA charts, for smaller areas, for example harbor plans, in scales larger than 1:50,000. Newer editions of these charts are generally re-issued as Transverse Mercator charts. Gnomonic projection charts are also traditionally used for Great Circle Sailings. Such charts are not needed in OpenCPN, as Great-circles are handled internally.
    -
  • -
  • OpenCPN is not suited for Polar Navigation N/S of about 70 degrees. As long as there are Mercator charts available, OpenCPN is OK though. There are some charts available up to 80 N, for example Norwegian chart for the Northern part of Svalbard. The Mercator projection is not generally suited for polar areas, with quickly converging meridians. Small scale (less than 1:100,000 ) high latitude Transverse Mercator Charts, with clearly converging meridians, cannot be displayed correctly. Other projections suited for polar areas can't be displayed at all in OpenCPN.
    -
  • -
- -

-A Linux/Unix Note
-These operating systems have a problem handling chart names containing spaces and non ASCII characters. A typical example is Swedish chart names.
- -To sort this out use the utility program "detox“. Detox changes the file names so space becomes “_”; ”(“ and ”)“ become ”-“; and “å”,”ä“ and “ö” become “a”,”a“ and “o”, etc. -

- -

-To see what “detox” suggests to do, try a dry run first, like this:
- -

-
detox -n File_with_swedish_charts > outfile \\
- -
- - -
- - diff --git a/data/doc/charts/chart_formats.html b/data/doc/charts/chart_formats.html deleted file mode 100644 index 3888828fb7..0000000000 --- a/data/doc/charts/chart_formats.html +++ /dev/null @@ -1,194 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:chart_formats - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Formats

-
- -
- -

OpenCPN supported chart formats

-
- -
- -

Raster Charts

-
- -

-BSB Versions 1, 2 and 3, with chart files ending with “.kap”. Many of these charts also comes with a text file with the “.bsb” extension, that is not used at all in OpenCPN.
- -This is the de facto standard format used by the US NOAA, New Zealand and Brazil, just to name a few. -

- -

-BSB Version 4, with chart files ending with “.cap”
- -works with a non free plugin, for Windows only. See the PlugIns download page. This format is used for Canadian charts and others. -

- -

-Nv-charts with chart files ending with “.eap”
- -are supported through a non free plugin, for Windows only. See the PlugInsdownload page. “nv-charts” are available for many parts of the world. -

- -

-NOS/GEO Version 1, with chart files ending with “.nos” and “.geo”
- -Subsequent versions are probably supported but need to be tested. However, this format is obsolete for new charts. -

- -
- -

Vector Charts

-
- -

-S57 ENC charts, with chart files ending with “.000”.
- -ENC update files (ending with .001, .002, …) are included automatically, if present, and must be placed in the same directory as the corresponding base chart (.000). OpenCPNs internalSENC files has a “.S57” file extension. -

- -

-Senc (Proprietary)
- -If a chart is said to be a S57 Vector chart, and has a different file ending, it is likely to be a SENC file, a processed version of a “.000” chart file, in a proprietary, platform specific format, that OpenCPN can't handle, unless the extension is “.oesenc”. -

- -

-

- -

-Inland ENCs
- -OpenCPN supports the international Inland ENC standard (S57 based). -

- -

-S63 Encrypted ENC charts, with chart files ending with “.os63”.
- -This chart format is supported in OpenCPN from version 4. It is the format for all vector charts from national hydrographic offices worldwide. Apart from being encrypted, S63 charts are exactly the same as S57. -

- -

-All S63 charts worldwide, from O-charts.org are available for purchase. -

-
    -
  • The support is through a two part plugin, one part open source and the other part closed. The encryption and the commercial aspect is handled by a separate entity, o-charts.org
    -
  • -
- -

-CM93 Version 2.
-(C-map Version 3, and later, are in a preprocessed proprietary SENC format and are not supported.) -

-
    -
  • Read this please: “The first thing to check if using CM93 is the version!!! Of course we read that version 3 could not be used but we didn't verify it to the bitter end. It was our fault. One way to tell what version you have is that V2 has extra chart folders plus extra files which include the .EXD file. V3 does not have the extra files.”
    -
  • -
  • Read the whole sad story with a happy ending On Cruisers Forum. So use CM93 Version 2
    -
  • -
  • Check Chart Files tab go to the directory that is listed and have a look at the files you see. If you have the whole world, there should be 144 folders with 8 digit numeric names, and a handful of separate files. If you see less than 144 folders, that's OK. It just means you don't have the whole world. If the folder does not look like that then it is not the standard CM93 format. – If they don't work, verify that they are Version 2.
    -
  • -
- -
- -

Pictures of charts, can be converted, and used.

-
- - -
- -

Not supported formats that can be converted.

-
- -
- -

WCI charts

-
- - -

-The necessary utilities for making or converting charts usually only run on Windows or Linux. For Mac OS X, use boot camp, Parallels or VMware to run one of these operating systems. -

- -
- -

OziExplorer

-
- -

-Charts consisting of picture in one of the standard formats, together with a georeferencing “.map” file, can be converted to a bsb kapfile. and a more developed windows version Map2kap-Ozi-2- OpenCPNOzi charts of the ozfx2 or ozfx3 format can not be converted with this tool. These Ozi formats are not documented and proprietary, and cannot be displayed in OpenCPN. -

- -
- -

HDR/PCX Charts

-
- - -

-The HDR format is from an era when computer-memory and processing power were less powerful than today, as a consequence these charts are not of the same quality as more modern charts. Furthermore, most of these charts are not using WGS 84 as reference datum. These charts should not be the first choice, but can be useful if nothing else is available. -

- -
- -

Other formats that are not supported.

-
- -

-The Hydrographic Chart Raster Format, HCRF, used by the United Kingdom Hydrographic Offices' ARCS (Admiralty Raster Chart Service). This is also due to proprietary encryption algorithms and copyright issues. UKHO is now alone in using this format, since New Zeeland switched to the BSB/Kap format and Australia no longer publishes official raster charts. -

- -

-Charts from Mapmedia, Navionics, C-map (with the exception of CM93 version 2), Garmin and various other private vendors, are not supported, for the same reasons as for the other proprietary charts. It is not possible for users to convert these charts to an OpenCPN recognized format, but it is possible for these companies, to release OpenCPN plugins, if they wish. -

- -
- - -
- - diff --git a/data/doc/charts/chart_groups_tab.html b/data/doc/charts/chart_groups_tab.html deleted file mode 100644 index 92874ed1fd..0000000000 --- a/data/doc/charts/chart_groups_tab.html +++ /dev/null @@ -1,178 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:chart_groups_tab - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Groups Tab

-
- -

-If this is a new of, or if new chart directories need to be added, use:
- -Options>Charts>Chart Files Tab or
- -Options>Charts>Chart Downloader Tab
- -to Add the new chart directories. -

- -

-Then click OK to exit from Options and to Scan Charts and Update Database .
- -After the update finishes, select:
- -Options>Charts>Chart Groups Tab
- -in order to Add a New Group. -

- -

-Now, directories of charts or individual chart file(s) can be added to the chart group(s). -

- -

- -

- -

-In Options→Charts select “Chart Groups Tab” -

- -

-You will see two panes. The top pane contains “All Available Charts”, which are the charts you have installed. The bottom pane allows you to create, edit, and delete Groups. Note that there is always an “All Charts” group. This Group is not editable. New Groups which you create may have chart directories or individual charts added to them by selecting the item in the top pane and touching the “Add” button. -

- -

-You may also remove individual charts or directories from Groups by selecting the desired item in the bottom pane, and touch “Remove Chart”. Please note that “removing” an item from the Group does not remove it from your “Available” set of charts. The item is simply made unavailable when the Group is in use. -

- -

-It is a good idea to have a empty chart group, only the background Map will be shown. “Unlimited” zooming is allowed. This can be useful for very large scale plotting, for example. -

- -
- -

Chart Groups solve the following problem

-
- -

-You may have many charts loaded in your active database. Some of them have overlapping coverage at the same scale, so that when quilted the logic does not know which of potentially several charts at the same scale to choose from. Some examples: -

-
    -
  1. In the Bahamas there are a few publishers of charts, covering the same areas, with radically different presentations. Sometimes you may want to see one set (say planning charts of small scale), and other times you only want navigation charts of the best scale possible.
    -
  2. -
  3. Leave a Group empty, in which case only the background chart will be displayed, very useful sometimes.
    -
  4. -
  5. Pilot charts as one Group, normal navigation charts as another Group, makes it possible to quickly switch between them.
    -
  6. -
  7. You have both Raster and Vector charts of the same area and want to be able to display each type separately, and switch quickly between them.
    -
  8. -
  9. In another universe, NGA charts in one group, standard NOAA RNCs in another, standard NOAA ENCs in another group, British UKHO in a third group or even a group with both ENC and RNC of a particular USCG District.
    -
  10. -
  11. The Chart Group function allows us to define multiple Groups, with different chart directories in each group. The Group desired for viewing may be selected quickly, through the right-click menu, without adding or deleting charts from the Active database.
    -
  12. -
- -

-If there are no chart directories listed under All available charts you will not be able to “Add” Chart Groups. A newly added chart directory (also called a folder) cannot be added to a Chart Group unless the Chart Database has been Updated . -

- -
- -

Using your Groups

-
- -

-From version 4.8.0 it's possible to quickly change between the first 10 listed chart groups. The numerical keys 0,1,2……..9 corresponds to the chart groups 1,2,3…..10, whatever their name is. It is very simple to use, for example just press “4” and the display changes to show chart group #4 that the user added. Note that group “0” always contains the “All Charts” Chart group. -

- -

- -

- -

-In this illustration the navigator generally uses the US charts, when available. Coming into Baia do Porto Santo a detailed chart would be great, but no such US chart is available on board. A switch to the UK chart group solves the problem. -

- -

- -

- -

-Select the Group you want to use, by a right-click context menu item called “Chart Groups”. As you switch Groups the logic tries to select a chart and scale that closely matches the situation present before the switch. As you may understand, sometimes the fit is not reasonable, so the resulting view may be surprising. -

- -

-Finally, if you have no Groups defined, as in the default installation, all installed charts are always available. -

- -

-Chart Groups and CM93 -

- -

- -

- -

-It is possible to have multiple instances of CM93v2 in different Chart Groups. Above we have 5 instances loaded in various chart groups. The view is of “All Active Charts”. -

- -

-OpenCP also supports multiple partial CM93 data sets. -

- -

-The instances are loaded, from left to right, in the order of the chart groups. -

- -

-In this situation, only the leftmost instance of CM93, that is not excluded from the quilt, will be displayed. Above, it is the instance represented by the yellow rectangle. -

- -
- - -
- - diff --git a/data/doc/charts/chart_manual_installation.html b/data/doc/charts/chart_manual_installation.html deleted file mode 100644 index a03e44c502..0000000000 --- a/data/doc/charts/chart_manual_installation.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:chart_manual_installation - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Manual Install

-
- -

-Chart Downloader is the easier, preferred way to install charts, but at times manual techniques are useful. -

- -

-For this example, we will use the freely distributed NOAA US charts. NOAA's Chart Download website Bring this page up in your browser. On the left, -

- -

-Click on Download ENCs (electronic navigational charts for Vector Style charts - ENC (vs Raster Charts) -

- -

-Download your desired region. For this example, we selected the State of California, CA_ENCs.zip -

- -

- -

- -

-Unzip all those folders (US1EEZ1M, etc…) to a location on your hard drive. For this example we used My Documents/charts. -

- -

-Start OpenCPN, and point it to your chart directory Settings > Charts > Chart Files > Add Directory (remember My Documents is actually something like C:\Users\user-name\Documents\Charts) -

- -

-Click Select Folder -

- -

-Tick boxes “Scan Charts and Update Database” and “Force Full Database Rebuild” -

- -

- -

- -

-Fix up a few of your Chart settings, mine are below, more info Vector Display Tab -

- -

- -

- -

-​Check your new ENC charts into the Chart Downloader to stay current with Chart Updates, more info Chart Downloader Tab -

- -

-Go to Settings > Charts > Chart Downloader Click Add and navigate to the section that you downloaded. For example it is USA > ENC > by States > CA - California -

- -

- -

- -

-You should also hit the Select Folder button and navigate to where you put your ENC charts. Once you hit OK on that window, a list of all your charts should populate in the bottom half of the window. -

- -

- -

- -

-Click Update All, and your charts will update, and continue to update. -that's it! -

- -
- - -
- - diff --git a/data/doc/charts/chart_quilting.html b/data/doc/charts/chart_quilting.html deleted file mode 100644 index 612a79c8d5..0000000000 --- a/data/doc/charts/chart_quilting.html +++ /dev/null @@ -1,290 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:chart_quilting - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Quilting

-
- -

-Chart quilting is a way to display parts of several charts together on the screen, redrawn to the same scale. -

- -

-Former Limitation Removed - With the introduction of OpenCPN 4.2; Raster Mercator charts, Raster Transverse Mercator charts, Raster Polyconic charts and Raster skewed charts, of these same projections, may exist in the same quilt. The transition from one type of projection to another is seamless. Quilting the skewed charts is very computationally heavy and can't be used in non-OpenGL, make sure you have the use of accelerated graphics (OpenGL) enabled in ToolboxDisplayAdvanced. -

- -
- -

Quick Start

-
-
    -
  1. Go to Options→Display→General→Enable Chart Quilting. Tick the box.
    -
  2. -
  3. Another, more simple way, is to use the “Q” short-cut key to toggle quilting on/off.
    -
  4. -
- -

-Zooming in, automatically brings up larger scale charts, if available. Panning reveals a continuous quilt of the available charts. If you started with a raster chart, only raster charts will, with the exception noted below, be in the quilt. The same logic applies to S57 and S63 Vector Charts (ENCS). Make sure you are familiar with the -Chart Status Bar as this will help you interpret all available information. -

- -

-The quilt, like a single chart can be displayed North Up or Course Up -

- -
- -

Read more

-
- -

-Own Ship Auto Follow and Display Orientation
- -

- -

-The one quilting exception occurs when quilting Raster or ENC charts. If a Raster or ENC chart is not available to be displayed and a CM93 ver2 chart of suitable scale is available, then the CM93 ver 2 chart will be added to the quilt. -

- -
- -

What is the use of Quilting?

-
- -

- -

- -

-In single chart mode, getting near the edge of the chart there is no information outside the chart. You manually have to change to the next chart, by selecting one of the charts in the chart bar.
- -

- -

- -

- -

-The situation changes dramatically when quilting mode is activated. The amount of relevant information on the screen increases, and the next chart is automatically available. -

- -
- -

Displaying charts

-
- -

-OpenCPN has two modes of displaying charts, single chart mode and quilting mode. In a new installation, quilting is on by default. -

- -
- -

To activate single chart mode

-
- -

-Go to Options→Display→General and deselect the box Enable Chart Quilting. This mode only shows one chart at a time, and a switch to other charts must be done by clicking another chart in the Chart Bar. All printed general chart information, outside the chart proper, can easily be read. -

- -
- -

To activate chart quilting

-
- -

-Go to Options→Display→General and tick the box Enable Chart Quilting, or use the shortcut key Q to toggle quilting. Tick the box “Show Chart Outlines” at the same time as this will help you see individual charts. -

- -
- -

Full Screen Quilting

-
- -

-Options→Display→Disable Fullscreen Quilting. -By default all visible charts of an appropriate scale are used in the quilt. With this box checked only charts that overlap the center of the screen are used in the quilt. Checking this box may give a performance boost in certain circumstances. -

- -
- -

To determine if Chart quilting is on

-
- -

-There are some visual indications on screen to confirm if quilting is on or off. -

-
    -
  • If the right click menu contains the entry “Hide This Chart”, quilting is on. Clicking the entry excludes the chart from the quilt.
    -
  • -
  • The colored rectangles in the status bar have rounded corners and the white borders of the charts are invisible when quilting is on. When quilting is off in ToolBox→Settings, the colored rectangles have “square” corners.r.
    -
  • -
  • When hovering with the mouse pointer over a inactive raster chart button in single chart mode, a thumbnail of the chart is displayed in the upper left corner of the screen. At the same time an information box pops up above the button with details about the chart. This changes with quilting, as the thumbnails are replaced with a transparent reddish high-lighting of the charts that is a part of the present quilt or has a larger scale than the reference chart in the quilt.
    -
  • -
  • The exception to the last rule is CM93 charts. When an area is only covered by CM93 charts, indicated by a long yellow chart button in the status bar, and in quilting mode, no info-box is displayed and no reddish highlighting takes place.
    -
  • -
  • CM93 individual cells are outlined in magenta.
    -
  • -
- -

-With chart quilting more than one chart can be displayed and active at the same time, in the screen above, for example there are two pale blue buttons, as there are two raster-charts in this quilt. In single mode only one chart button is highlighted at a time. -

- -

-Depth units. that are normally shown in the upper right corner of the display (if activated in the toolbox), are only displayed in quilting mode if all participating charts uses the same unit. -

- -

-Many of these features are illustrated in this screen-dump. -

- -

- -

- -

-This is a quilt consisting of three raster charts, two that are actually displayed and one smaller scale chart that is hidden behind the larger scaled charts of St Croix. -

- -

- -

- -

-This is the button for the not displayed chart in the quilt. -

- -

-The mouse pointer is over the middle raster chart and the chart information box is shown, together with the red highlighting of the chart on the screen. -

- -

-If the chart info box contains much less info than above, just click the button to display the chart, then go back and hover with the cursor over the chart button again. The full info will now be available. -

- -

-No depth unit is shown in the quilt as the left chart is in Feet and the right in Fathoms and parts thereof. Notice the lack of zoom level in the status bar, a quilt , by definition, consists of several different zoom levels. -

- -
- -

Which charts are quilted?

-
- -

-There are several rules built into OpenCPN governing exactly how different chart styles reacts to the quilting mode. -

-
    -
  1. Raster charts and Vector charts are quilted separately. You can quilt either raster charts or vector charts, but not both at the same time.
    -
      -
    • The exception to this rule is: CM93 ver2 charts, if available, may be quilted with raster and vector charts under certain conditions e.g. the view is so far zoomed out that the rightmost (smallest scale) raster chart is too small to be useful.
      -
    • -
    -
  2. -
  3. CM93 ver2 charts can be quilted separately.
    -
  4. -
  5. BSB4 and nv-charts, using plugins, quilts with other Raster Charts, following the rules above.
    -
  6. -
- -
- -

User control

-
- -

-Users can control if an individual chart, is allowed in the quilt or not. -

-
    -
  • Right clicking on any chart in a quilt in the chart-bar and clicking “Hide This Chart” on the pop up menu, removes the chart from the quilt. The chart button in the Status bar changes to {opencpn:manual:not_participate.jpg?nolink&60×20}}.
    -
  • -
  • The same thing can be achieved through the right-click menu when clicking on a displayed chart.
    -
  • -
  • To activate the chart again right click this button an then click “Add this chart to quilt”
    -
  • -
- -
- -

Controlling the scale of the quilt view.

-
- -

- -

- -

-The “quilt reference chart” is the left-most, largest scale chart, highlighted in the chart bar. This is the left of the two pale blue chart buttons above. -

- -

-Click the next chart blue button “one-to-the-right” of the of the current reference chart. The reference scale of the quilt will be decreased, but the viewpoint will not change. The same logic applies if clicking a chart-to-the-left of the present reference chart, except that the scale of the quilt will increase. Zooming in/out will also move the reference chart to the left/right. -

- -
- -

Known issue with some NOAA ENC:s

-
- -

- -

- -

-Some NOAA ENC:s are produced with “holes” in. OpenCPNs handles almost all of these cases. The picture above is from S:t Croix in the Caribbean, using an old version of OpenCPN. There are still some gray areas in this vicinity but only if the scale is larger than 1:10,000. Very few users are likely to notice this.
- -The gray rectangle above is a “hole” in a chart, where a smaller scale chart with coverage exists. The “hole” is due to the fact that this area wasn't surveyed to the scale of the chart.
-
-Clipped Objects
- -Clipped objects at the edge of quilted vector charts S57/S63 of different scales may not show the complete object.“ -

- -
- - -
- - diff --git a/data/doc/charts/cm93_offsets.html b/data/doc/charts/cm93_offsets.html deleted file mode 100644 index db151996ba..0000000000 --- a/data/doc/charts/cm93_offsets.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:cm93_offsets - - - - - - - - - - - - - - - - - - - - - -
- - - -

CM93 Offsets

-
- -

-Caveat lector -

- -

-There is absolutely no guarantee that a correction, based on one point, as described below, will be valid for the whole chart cell. Be very careful when using this feature.
- -

- -

-Starting with offsets. -

-
    -
  • Go to Single Chart Mode (non-quilted), with cm93 charts displayed. Use Q or F9 to toggle quilting on/off
    -
  • -
  • Zoom/Pan to the region of interest.
    -
  • -
  • Right click and activate “CM93 Offset Dialog”
    -
  • -
- -

- -

-
    -
  • In the list of cells/MCOVR IDs, selected the one MCOVR of interest. The coverage area for this MCOVR object will be outlined with a heavy yellow border.
    -
  • -
- -

- -

- -

-Some cells have built in corrections already applied. The values wgsox and wgsoy, are offsets to bring the original chart cell to WGS84. See the first and third cell in the picture above. The values are for information only, and cannot be changed. These corrections are generally correct, but not always. Sometimes the corrections are wrong and sometimes there are no corrections where there ought to be. This is where this manual offset feature comes in handy. -

- -

-In order to use this feature effectively, one needs a geographically known reference point. As an example, say there is a NAVAID present on the chart cell with known WGS84 lat & long, as from a light list. In this case, one can drop a waypoint on the chart, edit the waypoint properties to the known lat/lon, and then use the CM93 Offset Dialog to slew the cell/MCOVR so that the dropped waypoint coincides with the NAVAID feature on the cm93 cell (chart). -

- -

-You may also use a geographical feature such as a Cape or point whose location is absolutely known, as by reference to observation, or by rendering on another, more accurate chart such as a trusted scanned raster chart or georeferenced photo chart. -

- -

-To see how this feature works, here is an example from the South Pacific. -

- -

- -

- -

-This is Tongareva, also called Penhryn atoll. A mark, with a triangle is dropped at the westernmost point of the Island. -

- -

- -

- -

-Zooming out to next smaller scale chart makes the triangle mark jump NNE. Time for some corrections, as we, at least for the purpose of this example, are confident that the larger scale chart is correct.
- -

- -

- -

- -

-Quite large corrections brings the chart into reasonable agreement. -

-
    -
  • Use the spin controls on the right side of the dialog to adjust the desired user offsets. It is also possible to write numbers directly. Notice that positive corrections is towards North and East.
    -
  • -
  • In some cases it is not clear exactly which M_COVR ID that represents your position. A simple test will reveal if a mark reacts to (large) corrections.
    -
  • -
  • The offsets are automatically saved in the binary MCOVR cache files found in the program data directory as CM93/…
    -
  • -
- -
- - -
- - diff --git a/data/doc/charts/imho_ecdis.html b/data/doc/charts/imho_ecdis.html deleted file mode 100644 index 51975ee49c..0000000000 --- a/data/doc/charts/imho_ecdis.html +++ /dev/null @@ -1,197 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:imho_ecdis - - - - - - - - - - - - - - - - - - - - - -
- - - -

IMHO ECDIS

-
- -
- -

IMO ECDIS

-
- -

-
- -IMO RESOLUTION A.817 (19)
- -PERFORMANCE STANDARDS FOR ELECTRONIC CHART DISPLAY AND
- -INFORMATION SYSTEMS (ECDIS)
- -……
- -
- -APPENDIX 2
- -SENC INFORMATION AVAILABLE FOR DISPLAY DURING ROUTE PLANNING
- -AND ROUTE MONITORING
- -

- -
- -

1. Display base

-
- -

-Permanently retained on the ECDIS display, consisting of:
- -

-
    -
  1. coastline (high water);
    -
    -
  2. -
  3. own ship's safety contour, to be selected by the mariner;
    -
    -
  4. -
  5. indication of isolated underwater dangers of depths less than the safety contour which lie within the safe waters defined by the safety contour;
    -
    -
  6. -
  7. indication of isolated dangers which lie within the safe water defined by the safety contour such as bridges, overhead wires, etc., and including buoys and beacons whether or not these are being used as aids to navigation;
    -
    -
  8. -
  9. traffic routeing systems;
    -
    -
  10. -
  11. scale, range, orientation and display-mode;
    -
    -
  12. -
  13. units of depth and height.
    -
    -
  14. -
- -
- -

2. Standard display

-
- -

-To be displayed when the chart is first displayed by ECDIS, consisting
- -of:
- -

-
    -
  1. Display Base
    -
    -
  2. -
  3. drying line
    -
    -
  4. -
  5. indication of fixed and floating aids to navigation
    -
    -
  6. -
  7. boundaries of fairways, channels, etc.
    -
    -
  8. -
  9. visual and radar conspicuous features
    -
    -
  10. -
  11. prohibited and restricted areas
    -
    -
  12. -
  13. chart scale boundaries
    -
    -
  14. -
  15. indication of cautionary notes
    -
    -
  16. -
- -
- -

3. All other information

-
- -

-All other information displayed individually on demand, for
- -example:
- -

-
    -
  1. spot soundings
    -
    -
  2. -
  3. submarine cables and pipelines
    -
    -
  4. -
  5. ferry routes
    -
    -
  6. -
  7. details of all isolated dangers
    -
    -
  8. -
  9. details of aids to navigation
    -
    -
  10. -
  11. contents of cautionary notes
    -
    -
  12. -
  13. ENC edition date
    -
    -
  14. -
  15. geodetic datum
    -
    -
  16. -
  17. magnetic variation
    -
    -
  18. -
  19. graticule
    -
    -
  20. -
  21. place names
    -
  22. -
- -
- - -
- - diff --git a/data/doc/charts/vector_display_tab.html b/data/doc/charts/vector_display_tab.html deleted file mode 100644 index 8fdffee77d..0000000000 --- a/data/doc/charts/vector_display_tab.html +++ /dev/null @@ -1,846 +0,0 @@ - - - - - opencpn:opencpn_user_manual:charts:vector_display_tab - - - - - - - - - - - - - - - - - - - - - -
- - - -

Vector Display Tab

-
- -

- -

- -

-OpenCPN makes a serious effort to be compliant with IHO standards for ECDIS display of cartography. -

- -

-Starting with vector charts requires some learning. In some respect they are different than paper/raster charts. This page deals mainly with the specifics of OpenCPN and is not a vector-chart tutorial. -

- -

-See David Burch's book “Electronic Chart Navigation”, and the 2013 (or later) US Chart 1, available from: US ChartNo1.pdf . -

-
- -

-Note: On the forum there are quite a few questions regarding these chart symbols. -

- -

-
- -

- -

-Read on to find out more. Chart Information Objects and Quality of Data -

-
- -

- -

- -

-First One very important setting for vector charts is handled directly from the main toolbar. This button toggles all text displayed on a vector chart On and Off. The hotKey “T” is an alternative for toggling the text. In OpenGL mode, all text will always be horizontal when using the “Course Up” option. -

- -

-Second Double clicking on a vector chart, as long as the cursor hasn't changed to a green arrow near the edges, brings up an information dialog, displaying the available vector-chart information at the selected point. Scroll down to see all the information. An alternative to double clicking is right-clicking an select “Object Query”. Note that a single normal (left) click will center the chart at that point. -

- -

- -

- -

-The example shown above is the result of double-clicking on a lighthouse in a busy area. -

- -

-Exactly what is shown in this dialog depend on the settings described below in “Display Categories”. -

- -

-Third It is possible to select what font is used for the text on vector charts. There is an entry in Options > User Interface > Fonts in the dropdown menu select ChartTexts. Here you select what font-face to use, and a template size. Weight and final size of the displayed texts depends on the charts you are using, but if the charts contain various weights and sizes, they will all scale together depending on what size you select. -

- -

-Options > Charts > Vector Charts Tab is where everything else is handled. -

- -

-If the S63 chart plugin is active, there will also be a “S63 Charts” tab. . -

- -

-vector-display.jpg -

- -
- -

Display Categories

-
- -

-If you are new to OpenCPN and vector charts please start with the “All” Display Category, to avoid risks and possible confusion. The Display Category is selected from the drop down menu. More below. -

- -

-Navigators have the choice of three different pre-defined presentations of ENC content, Base, Standard and All. OpenCPN also has the very flexible Mariners Standard, which is better described as “Mariners Choice”. -

- -
- -

Base

-
-
    -
  • Displays general information, including coastline, safety-contour, isolated danger,
    -
  • -
  • buoy, beacon traffic separation zone, etc.
    -
  • -
  • From the IMO definitions:
    -
  • -
  • Display Base means the level of SENC information which cannot be removed from the display, consisting of information which is required at all times in all geographic areas and all circumstances. It is not intended to be sufficient for safe navigation.
    -
  • -
- -
- -

Standard

-
-
    -
  • Everything in “Base” and aids to navigation, fairways, channel limits, restricted navigation zones, restricted areas, etc..
    -
  • -
- -
- -

All

-
-
    -
  • Everything in “Standard” and more. This level shows all informatio, not contolled in other settings options. More about what the IMO ECDIS says about the content of these three levels. This is also a good choice for actual, underway, navigation, avoiding the possible risks involved in “Mariners Standard”. See more below.
    -
  • -
- -
- -

Mariners Standard

-
-
    -
  • Reset to STANDARD button. Change the tick marks to match STANDARD.
    -
  • -
  • Select All button. Select all items.
    -
  • -
  • Clear All button. Clear all items.
    -
  • -
  • These buttons only work with Mariner's Standard.
    -
  • -
  • Users can use the filter tick box to set the display of items. A large set of filters, about 186, can be employed. They are all to the IHO S57 standard (Caris.com), but has been given a label that is easy to understand.
    -
  • -
  • Note that Mariners Standard gives the user a much wider choice of what to display, however it conforms to the approved IHO recommendations IHO S57 (s-57.com).
    -
  • -
  • NOTE: We now follow strictly the IHO recommendations. This modification will appear in the next OCPN Beta series. See FS#2091
    -
      -
    1. Items classed as DISPLAYBASE are always displayed in Mariners Standard, and may not be removed by the user.
      -
    2. -
    3. Following S52 guidelines, four special safety items (“OBSTRN”, “WRECKS”, “DEPCNT”, “UWTROC”) are also visible in BASE and Mariners Standard, if their attributes (depth relative to containing depth area, mainly) require them to be so displayed.
      -
    4. -
    5. The selected Safety Contour is always displayed in Mariners Standard.
      -
    6. -
    7. User is free to add/remove items whose classification would normally have them appear in STANDARD or OTHER categories, allowing user customization if desired. These selections will be persistent across OCPN sessions.
      -
    8. -
    9. There is a “Reset to STANDARD” button, which does what it says.
      -
    10. -
    -
  • -
- -

-
- -WARNING - it is possible to suppress essential information with “Mariners Standard”. If in doubt, switch to the “ All ” Display Category, or use the “Select All” or “Reset to Standard” button for Mariners Standard. -

-
    -
  1. The first time you use a vector chart with a brand new installation you will see nothing, if you use Mariners standard. Why?
    -
  2. -
  3. The Mariners Standard list of Feature types is empty on a fresh install. When you load the first vector chart, the list is populated with the Features that are discovered on that particular vector chart.
    -
  4. -
  5. The default visibility of the added Features in Mariners Standard category now shows all features as the are discovered.
    -
  6. -
  7. If you load another ENC, any newly discovered Feature types are added to the list, again with viz=0, off. However, the visibility of Feature types as set previously by the tick boxes is not modified.
    -
  8. -
  9. Use the “Select All” button frequently until you have initiated all the charts you intend to use and-or the feature list is fully populated.
    -
  10. -
- -
- -

Vector Chart Hot Keys

-
- -

-The Hot Keys or Keyboard Shortcuts below all work in “ALL” and “Mariners standard”. The hotkeys also work in the other display categories, as long as the feature exists in the category. In “Base” for example, “S” works, but “L” does not. Features are toggled on-off with the keys. -

- -

-Note: Hot Keys can be different for OS's. See Keyboard Shortcuts -

-
    -
  • T Texts. The visible text is still affected by the settings in the Vector Charts settings tab.
    -
  • -
  • L Lights. Lighthouses as well as buoys etc are all affected.
    -
  • -
  • S Soundings.
    -
  • -
  • A Anchoring. This will affect information needed when anchoring. Anchor berth and Anchorage areas. Submarine cables and pipelines. Type of bottom. Mariners Standard -Anchor berth and Anchorage area display categories.
    -
  • -
  • O Chart Outlines.
    -
  • -
  • Watch the active GIF image below as it changes using hot keys.
    -
  • -
- -

- -
- -

- -
- -

Practical Use

-
- -

-A general recommendation would be to use the “All” display category or “Mariners Standard” with “Select All” marked , and then switch of certain features as required. As an example let's look at passing through the British gas fields in the SW North Sea -
- - -
- -
- -This is not easy, so we want to get rid of all those red and yellow circles.
- -Double click on one of the platforms, square with a dot. -
- -
- - -
- -
- -At the top it reads “Light (Lights)”, which means that you clicked on a light, which belongs to the Feature Class “Lights”. Find “Light” in the Mariners Standard list of available filters, and uncheck it. -
- -
- - -
- -
- -Press the “Apply” button -
- -
- - -
- -
- -Much better In this particular case, there is a shortcut, use the Hot Key “L” to toggle all lights on/off.
- -
- -Display -
- -

- -
- -

Display

-
- -
- -

Depth Soundings

-
- -

-Turns the depths on and off. Other settings also affects when soundings are displayed, for example “Reduced Detail at Small Scale”. The bold black numbers are not soundings. Instead they refer to heights of nearby islets or cays. On official paper charts the soundings are printed in italics. -
- - -
- -
- -The bold number 20 refers to the land height of the unnamed cay SW of the number.
- -Safety Depth is set to 20 m, so the 20 m contour stands out in black.
- -
- -How soundings behave when zooming. “Chart sounding symbols” are represented by small raster images. As a chart is zoomed in, these raster symbols will increase in size by about 2x. Currently they increase in size well after the “Overzoom” notice, for the largest scale chart available.
- -

- -
- -

Chart Information Objects

-
- -

-Provides information about the chart itself. With this switch on, an object query reveals such information as the buoy system for the area, the Quality of the Survey, the latest NTM update and sources for the chart. -

- -

-On raster-charts there is often a diagram showing the sources and age of surveys of the charts. -

- -

-On vector-charts, when activated, symbols are shown all over the screen. An object query of these symbols gives the details. When using “Mariners Standard” and “Chart Information Objects” is ticked, it is possible to get rid of the quality symbols covering the chart by unchecking “Quality of data”. -

- -

- -

-
    -
  1. On paper or Raster charts there is usually a source diagram showing the dates of the survey of different parts of the area covered by the chart.
    -
  2. -
  3. If the source is from ,say 1850, we know that it's an unreliable lead-line survey. On the other hand if it's a recent survey done with a multi-beam sounder it's a quite reliable chart.
    -
  4. -
  5. The same info is present in modern vector charts, but in a different format. Click image for larger version Name: rty.jpg Views: 7 Size: 48.5 KB ID: 157270 This is essential info about the reliability of the chart. At the same time you definitely don't want to see this info all the time. To see this information in OpenCPN you have to activate “Chart Information Objects” in vector settings.
    -
  6. -
  7. Most users just want to get rid of the triangles, but please consider that information informs you about the Quality of the Survey Documentation.
    -
  8. -
- -
- -

QUALITY OF DATA

-
-
    -
  1. Category of Zone of Confidence = Un-assessed.
    -
  2. -
  3. The feature being rendered is S57 Text relating to M_QUAL, called “Quality of Data” in “Mariners Standard”
    -
  4. -
  5. This is a meta-object describing the quality of data shown. The Attribute of interest is CATZOC, or “Category of Zone of Confidence”.
    -
  6. -
  7. The value on most US ENC's is “6”, or “Un-assessed”. Thus, the 'U'.
    -
  8. -
- -

-Quality of Data -

- -

-CATZOC Quality of Data -

- -

-Development of New Data Quality -Representation in ENCs -

- -
- -

How to remove those "U" and *** on my vector charts (M_QUAL and CATZOC)?

-
-
    -
  1. In Options > Charts > Vector Charts Tab when using Display Category “All”, Uncheck “Chart Information Objects” which hides the “U” symbols .
    -
  2. -
  3. In Options > Charts > Vector Charts Tab for a finer grain control when using Display Category “Mariners Standard”, In the selection List Box, Uncheck “Quality of Data” which hides the “U” symbols.
    -
  4. -
- -
- -

Buoys-Lights

-
- -
- -

Bouy-Light Labels

-
- -

-Displays names and purposes of aids to navigation, such as number or name of buoys, information about conspicuous objects etc. -
- -

- -
- -

Light Descriptions

-
- -

-This tick box control display of light characteristics. Checking this displays a label with a text describing the marker or lighthouse's characteristics. -
- -

- -
- -

Extended Light Sectors

-
- -

-It is often difficult, on a vector chart, to see exactly what the light-sectors are supposed to do. -
- - -
- -
- -Activating the Extended Light sectors clarifies the situation. All sectors are extended and leading white sectors are emphasized in yellow and extend the full nominal range of the light. Just hold the cursor over a light and the extended sectors are activated. -
- -
- - -
- -
- -Light sectors as narrow as 0.3° are displayed. -
- -
- - -
- -
- -This sector is 0.5°. -
- -A light sector is extended if:
- -The words “Leading” or “Directional” can be found in the Object Query. -
- -Otherwise, the rules are -

-
    -
  • The sector is < 15° wide.
    -
  • -
  • It is White.
    -
  • -
  • The light also has Red and-or Green sectors.
    -
  • -
- -

-These rules work quite well, but there are exceptions that are difficult to catch.
- -As always, it's the responsibility of the navigator, how a light and its sectors are used for practical navigation. -
- -
- -vector-display-scale.jpg -
- -The parameters above are described in more detail below. -

- -
- -

Chart Text

-
- -
- -

National text on chart

-
- -

-Vector charts may have attributes with the texts in the national language. For example a Russian chart with texts in Cyrillic. With this option activated OpenCPN will display text in the local language and character set, in this case Russian written in Cyrillic. -

- -
- -

Important Text Only

-
- -

-Displays only a bare minimum of text essential for navigation, such as course and bearing in a leading line (range) and bridge clearances. -

- -
- -

De-Cluttered Text

-
- -

-Even when using “Reduced Detail at Small Scale”, there are cases when text labels overlaps or overwrites other labels and creates a cluttered impression. Ticking this box tries to clear the view, dropping overlapping text labels in the interest of legibility. The labels that get dropped are the last that would have been drawn. But, as there is no built-in priority scheme for text labels in ENC vector charts, this setting may hide needed information. -

- -
- -

Chart Detail

-
- -
- -

Reduced Detail at Small Scale

-
- -

-A Check makes sure that a minimum scale is required before certain objects are shown. If this box is not checked, everything is always shown, leading to very cluttered view at small scale (zoomed out). -

- -
- -

Graphics Style

-
- -
- -

Paper chart

-
- -

-Draw the markers and lights just like the printed paper chart. -

- -
- -

Simplified

-
- -

-Uses icons to represent the same. Some like the one and some the other, a matter of taste. Paper Chart mode closely follows the IHO standard standard in this area. This mode is currently more developed than the simplified mode, as it has a higher priority in the development effort. -

- -
- -

Boundaries

-
- -
- -

Plain

-
- -

-Normally just uses a dashed line. -

- -
- -

Symbolized

-
- -

-Also uses triangles pointing into the area. -

- -
- -

Colors

-
- -

-Depth on the chart can be displayed with either 2 or 4 colors. This setting is closely related to the “Depths Settings”. -

- -
- -

2 Colors

-
- -

-With 2 Colors and using a relatively large scale, -

-
    -
  • Areas with depth less than “Safety Depth” is blue
    -
  • -
  • the rest is white.
    -
  • -
- -
- -

4 Colors

-
- -

-With 4 colors, there are different colors for areas less than “Shallow Depth”, -

-
    -
  • Areas between “Shallow Depth” and “Safety Depth”
    -
  • -
  • Areas between “Safety Depth” and “Deep Depth”
    -
  • -
  • Areas deeper than “Deep Depth”.
    -
  • -
- -
- -

Depth Settings

-
- -
- -

Units

-
- -

-Units for depths is set in Options > Display > Units. All depths units are rounded off to the nearest number. If the value is half way between, the nearest higher number is used. Underlined values indicates drying heights.
- -

- -
- -

Feet

-
- -

-Only whole digits are shown. A value of 12 feet covers all soundings between 11.5 feet and 12.4 feet. -

- -
- -

Meters

-
- -

-Meters are shown as whole numbers for depths greater than 30 m. Depths below 30 m are shown as whole meters and decimeters as subscript, like this 127 This is the same as 12.7 meters and is shown for all soundings between 12.65 m and 12.74 m. -

- -
- -

Fathoms

-
- -

-Fathoms are shown as whole numbers for depths greater than 31 fathoms. Depths below this value are shown as whole fathoms and tenths of fathoms as subscript. Compare to the notes above for meters. -

- -
- -

Shallow, Safety and Deep depths

-
- -
- -

Safety Contour

-
- -

-The most important of these three settings, it affects the presentation of depths and dangers. The safety depth directly affects the displayed bold safety contour. -

-
    -
  • OpenCPN can only display contours that are already built into the chart. If the safety depth is between two built in contours, the deeper one will be the safety contour, displayed bolder than the other contours.
    -
  • -
  • Depths less than the safety depths will be printed in black, depths greater than this value will be printed in gray. So it is possible to see gray depths inside the safety contour, depending on settings.
    -
  • -
  • One example of how the safety depth affects the chart display is how isolated dangers, for example a wreck is displayed.
    -
  • -
- -

-
- -
- - -
- -
- -The safety contour is 3.6 m and the wreck is marked by the magenta cross, as the wreck is surrounded by safe water but the depths over the wreck is less than the safety depth. -
- -
- -
- -
- -The safety contour is 5.4 m and the wreck is marked as wire swept to 3.3m. -
- -
- -

- -
- -

Other Settings

-
- -

-Important as they affect how the different depths are colored. -

-
    -
  • They can help you identify a deep channel for example, or they can, in the worst case scenario, prevent you from being aware of a shallow area.
    -
  • -
  • There is no setting that fits all circumstances. For example a Sea Mount with a depth of 20m in the middle of an ocean should be regarded as “shallow” and be avoided, while 20 m depth in a harbor approach in protected water, probably is safe.
    -
  • -
  • The Depth Settings controls the coloring of the water as a function of depth.
    -
  • -
  • By setting the Safety and Deep water right you will have a visible border to show when to take care about shallow water.
    -
    -
  • -
- -
- -

CM93 Charts and ENC

-
- -

-Work very similar. The charts contain depth area features according to fixed depth cutoff zones, usually 5, 10, and 20 meters. -

-
    -
  • Intermediate values are not available in the database, if you select a value between those available, OpenCPN chooses the next higher value available for display of color.
    -
  • -
  • The charts are inconsistent in this area, depending on the country issuing the original charts. For example in UK and the Netherlands the depth contours in CM93 are 2, 5 and 10 meter while in US the are based on feet but expressed in meters, such as 3.7, 5.5, 9.1 and 18.3 m.
    -
  • -
  • Generally for both ENC and CM93, find these fixed depth cutoffs by double-clicking so the Object Query dialog pops up. The last entry is usually Depth Area. The two values in the range, represents these built in cutoffs.
    -
  • -
- -

-
- -

- -

-An example from UK with cutoff values of 5m and 10m. If for example as is the case on the South China Sea Hydrographic Commissions charts, the shallowest area has a range “0 m - 10 m”, there is, in most cases, no point in setting “Shallow Depth” to anything but 10 m. Find out these cut off depth for your area and set the “Depth Settings” with this knowledge together with your preferences and activity.
- -

- -

-With all the reservations above, the general case for 4 colors, will be described. -

- -
- -

Shallow Depth

-
- -

-Will color all water areas with water depths shallower than the set depth to a dark blue color. Soundings are in black. -

- -
- -

Safety Depth

-
- -

-Water deeper that Shallow but shallower that this depth will have a paler blue color. The Shallow Depth contour clearly marked with a thicker black borderline. Soundings less than this depth are in black, while soundings greater than this value are gray. -

- -
- -

Deep Depth

-
- -

-Water deeper than Safety Depth but less than Deep Depth will display a light gray color. The Safety Depth contour is clearly marked with black borderline. Water deeper than Deep Depth is displayed in white.
-Finally a word about drying heights, displayed in green. There is no detailed information available for drying heights, neither in CM93 ver2 nor in many ENC charts. Some ENC charts have negative ranges, for example “-2 m - 0 m” in areas with drying heights. This adds very little, as it really only gives the information that the drying height is less than the first value in the range, in an area of unspecified size.
-This situation is changing though. A set of new charts released in april 2012, by the Dutch Authorities, sets a standard for others to follow in this regard. See picture below. Modern Australian S63 charts are equally good.
-
-While a raster chart tells us that we need a Height of Tide that is 1.2m + safety margin + the draft of our own vessel.
-
-Heights of islands etc. are not available in CM93, while ENC charts, in many cases, have info about heights of summits and some contour lines. Is Balls Pyramid a high Island, that the name implies, or is it named with the same sarcastic humor as “Greenland” ? CM93 can't tell. -

- -
- -

CM93 Detail Level

-
- -

-The CM93 charts slider control that allows the user to adjust the screen complexity to suit the actual situation as well as the available processor capability.
-Normal settings depend on a combination of personal preferences and present usage of map. To see more details, the “CM93 Detail Level” slider, can be set to a higher positive number or for navigation in shipping lanes to a negative numbers. Typical zoom level 5 is good for fishing when as much details are possible is of interest. Zoom level of +1, zero or -1 is usually fine for normal use.
-Positive values give more detail, but at a cost: -

-
    -
  1. It simply takes longer to render larger scale charts covering more screen real estate.
    -
  2. -
  3. There will be more instances of gray (NODATA) areas surrounding the larger scale charts as you zoom out, unless quilting is activated.
    -
  4. -
  5. It can become dramatically slower if high detail is specified, and chart outlines are requested. In this case, the program has to read a lot more cells to get their outlines.
    -
  6. -
  7. Conversely, negative values give less detail. Zooms are faster.
    -
  8. -
  9. The slider can also be activated through the “d” hotkey, and displayed directly on the screen.
    -
  10. -
- -
- -

Vector Palettes

-
- -

-It's possible to change the whole look of a vector chart. One example below….
- -
- - -

- -
- - -
- - diff --git a/data/doc/editors.html b/data/doc/editors.html deleted file mode 100644 index e873985c04..0000000000 --- a/data/doc/editors.html +++ /dev/null @@ -1,183 +0,0 @@ - - - - - opencpn:opencpn_user_manual:editors - - - - - - - - - - - - - - - - - - - - - -
- - - -

Editors

-
- -
- -

Editors for Version 4.2

-
- -

-In no particular order, not even alphabetically, I found an old email list that I had started for those who helped get version 4.2.0 User Manual Ready. -

-
    -
  • Kathi Boswell
    -
  • -
  • Roel Smidt
    -
  • -
  • Dirk Smits
    -
  • -
  • Bob Evans
    -
  • -
  • David Kester
    -
  • -
  • Mike Rossiter
    -
  • -
  • Pavel Kalian
    -
  • -
  • Will Kamp
    -
  • -
  • Jon Gough
    -
  • -
  • Sean Depagnier
    -
  • -
  • Peter Tulp
    -
  • -
  • Hartmut Weckenmann
    -
  • -
  • Lars Tarnovski
    -
  • -
  • Gilletarom
    -
  • -
  • Hakan
    -
  • -
  • Thomas Hockne
    -
  • -
  • Rick Gleason
    -
  • -
- -

-Many thanks to everyone who contributed, and helped with sound advice and suggestions. it could not have been done without you! It's gratifying to note that many of you have continued to edit and improve the User Manual.
- -

- -

-Of course we should all thank those who worked so hard on this manual before, including Thomas Höckne -

- -
- -

Editors for OpenCPN Dokuwiki - Version 4.6

-
-
    -
  • Dave Register
    -
  • -
  • Kathleen Boswell
    -
  • -
  • Fabbian Dufoe
    -
  • -
  • Frederick Gleason
    -
  • -
  • Gilletarom
    -
  • -
  • Thomas Hochne
    -
  • -
  • John Macrae
    -
  • -
  • Teddy
    -
  • -
  • Drew Kerlee
    -
  • -
  • Hubert Kleis
    -
  • -
  • Mike Rossiter
    -
  • -
  • Jim Galbiati
    -
  • -
  • George Dew
    -
  • -
  • Steven Bromley
    -
  • -
  • Rick Gleason
    -
  • -
- -

-We looking for skilled and dedicated Editors to help with this migration of the Wiki! Volunteers please advise one of the Admins below or send rgleason a PM on Cruiser's forum PM Rick. Thank you! -We need 8 more editors. -

- -
- -

Administrators of OpenCPN Dokuwiki

-
- -

-The Dokuwiki Admin have special rights to configure and update the dokuwiki. They have access to the User list and ACL. -Contact an Admin if you would like to be a “Manager” who can Edit the pages. -

-
    -
  • Dave Register
    -
  • -
  • Kathi Boswell
    -
  • -
  • Mike Rossiter
    -
  • -
  • Thomas Hockne
    -
  • -
  • Fabbian Dufoe
    -
  • -
  • Rick Gleason
    -
  • -
- -
- -

Notes to Editors

-
- -

-See Edit User Manual -

- -
- - -
- - diff --git a/data/doc/faq.html b/data/doc/faq.html deleted file mode 100644 index 8b24e5e3c7..0000000000 --- a/data/doc/faq.html +++ /dev/null @@ -1,747 +0,0 @@ - - - - - opencpn:opencpn_user_manual:faq - - - - - - - - - - - - - - - - - - - - - -
- - - -

FAQ

-
- -
- -

Where is my log file?

-
- -

-Read this explanation - Getting Started -

- -
- -

Where is my config.ini file?

-
- -

-Read this explanation - Getting Started -

- -
- -

Where can I download the User Manual?

-
- -

-It is downloaded with the software, so use “?” icon and then “Help”! It is also available on the Website Download page Then scroll to the bottom under ARCHIVES. -

- -
- -

How to find all those files you are talking about?

-
- -

-A big contributing factor to this problem is that Windows default settings hides system files, and also by default, don't show file extensions. -

-
    -
  1. These settings can be changed however.
    -
  2. -
  3. In XP go to My Computer →Tools → Folder Options -View. Mark “Show hidden files and folders” and uncheck “Hide extensions for known file types”.
    -
  4. -
  5. Other versions of Windows are similar, but may not be exactly like this.
    -
  6. -
- -

-Now you should find the files we talked about in the previous paragraph. -

- -
- -

Is there a compatible Hardware List?

-
- -

-Keeping an updated list of all the devices available is virtually impossible. -

-
    -
  1. As long as your device is able to produce NMEA 0183, OpenCPN most likely won't have any problem understanding it.
    -
  2. -
  3. Rather than looking for a list, which can't contain everything, ask in the support forum whether your equipment of choice is likely to work with OpenCPN before going shopping.
    -
  4. -
  5. If still looking for lists, you may like the following links
    -
      -
    -
  6. -
- -
- -

Trouble with Installation, finding Charts, and connecting GPS & Instruments.

-
-
    -
  1. -
  2. -
  3. -
  4. -
  5. Installing Charts with Chart Downloader Plugin Chart Downloader
    -
  6. -
  7. Installing GPS GPS Setup and Status
    -
  8. -
  9. Instruments - Devices must provide NMEA 0183 data via Serial or Network with a range of protocols and settings available. The description for connecting to hardware is in the Options > Data Connections section. Connections and for additional assistance NMEA Sentences
    -
  10. -
- -
- -

OpenCPN crashes, what should I do?

-
-
    -
  1. It is highly unlikely that uninstalling and reinstalling OpenCPN is going to resolve anything, really. But if you can't resist the temptation, help yourself, it is equally unlikely that it makes the things worse.
    -
  2. -
  3. You should have a look into the logfile to find out whether it contains some clues that could help isolate the problem. If the crash is related to displaying a chart, try to isolate on which one and create the simplest possible scenario we could reproduce. You should try to get fresh charts.
    -
  4. -
  5. You should try disabling OpenGL if it is enabled or vice versa.
    -
  6. -
  7. While OpenCPN is not running, move the complete data folder (C:\ProgramData\opencpn on Windows, ~/.opencpn on Linux ~/Library/Preferences/opencpn / on Mac ) to a backup location and see whether something was rotten in your local OpenCPN data. Do not delete it if you want to keep your waypoints, routes and tracks!
    -
  8. -
  9. If on Linux, run opencpn from command line and see whether it produces a backtrace to help identify the cause of the crash.
    -
  10. -
  11. Still on Linux, you can use gdb or another debugger to get the backtrace and help identify the cause of the crash.
    -
  12. -
- -
- -

Why is recently updated OpenCPN performing badly?

-
-
    -
  1. Look in the opencpn.log file. Try closing Opencpn, deleting the opencpn.log file and then reopening OpenCPN to create a new log file, then use Opencpn to cause the trouble again. Then look at the Log file to find messages that are associated with the problem.
    -
  2. -
  3. Verify the problem is not from an old and outdated opencpn.ini file. Rename your opencpn.ini file for possible reuse later, and restart Opencpn to create a fresh new opencpn.ini file. Test for the problem.
    -
  4. -
  5. Do you have Chart Display problems? Try turning on or off OpenGL and Running update of the Chart Database.
    -
  6. -
  7. Do you have a problem with paid charts? see Oesenc or ocharts.
    -
  8. -
  9. Do you have old plugins? Disable and uninstall all external plugins with the plugin uninstall program. Test OpenCPN and then download new updated plugins and install them one at a time and test.
    -
  10. -
  11. Final Resort: Try starting over by uninstalling Opencpn following this approach.
    -
      -
    • Go to the ProgramFiles “OpenCPN” folder, and use the uninstall programs, preferably starting with the plugins, and ending with the OpenCPN.
      -
    • -
    • Check that the “opencpn” initialization folder of program data has been removed. Otherwise, do it manually.
      -
    • -
    • Use the CCleaner software to clean the PC Windows registry in particular. (option)
      -
    • -
    • Download OpenCPN again and all the plugins you need.
      -
    • -
    • Install OpenCPN.
      -
    • -
    • Run OpenCPN to verify that the operation is correct.
      -
    • -
    • Install, one by one, the plugins you need.
      -
    • -
    • Run each plugin before installing another one
      -
    • -
    -
  12. -
- -
- -

I have a problem so I reinstalled, but that did not help.

-
- -

-- Try this approach instead - Troubleshoot Installation -

- -
- -

GPS is not found by OpenCPN, but my GPS is working!

-
-
    -
  • -
  • -
  • But I know my GPS is working because the GPS program shows that it is working fine. Have you closed that program before trying to connect OpenCPN to the GPS? Only one program can connect to the GPS at a time.
    -
  • -
- -
- -

GPS is installed and I think its working, what next?

-
-
    -
  1. -
  2. -
  3. Perhaps you'd like to download some charts? We suggest using Chart Downloader.
    -
  4. -
- -
- -

Charts used to show, but using 3.0.2 and later, they no longer work.

-
-
    -
  1. OpenCPN used to display charts with an unknown projection as a Mercator chart. The same thing applies to an “UNKNOWN” or not recognized geodetic datum, where OpenCPN used to default to WGS84.
    -
  2. -
  3. This is no longer the case. If OpenCPN don't recognize the chart projection, it will not be displayed.
    -
      -
    • Potentially serious errors are thus avoided.
      -
    • -
    • The event is logged in the opencpn.log.
      -
    • -
    • Users may run into problems if a chart projection is stated as “UNKNOWN” even though it really is a prefect Mercator chart.
      -
    • -
    -
  4. -
  5. Unfortunately, some conversion tools take a shortcut and don't enter the “PR” tag in the kap-chart-header correctly.
    -
      -
    • The projection of a chart can always be found, and the “PR=UNKNOWN” should always be avoided.
      -
    • -
    -
  6. -
- -

-Official charts that OpenCPN really can't display, with a latitude < 70 degrees north/south, are very few indeed. Really only a handful of legacy, Gnomonic, large scale charts. Charts with “UNKNOWN” or blank geodetic datum are best avoided, they may be dangerously inaccurate. -

- -
- -

Many error messages when starting OpenCPN from Linux command line.

-
- -

-Messages like: -

-
    -
  • ALSA lib pcm.c:2217:(snd_pcm_open_noupdate) Unknown PCM cards.pcm.side ALSA lib audio/pcm_bluetooth.c:1614:(audioservice_expect) BT_GET_CAPABILITIES failed : Input/output error(5)” or
    -
  • -
  • (opencpn:8979): Gdk-CRITICAL : IA_gdk_drawable_get_size: assertion `GDK_IS_DRAWABLE (drawable)' failed
    -
  • -
  • '(opencpn:8979): Gdk-CRITICAL : IA_gdk_drawable_get_depth: assertion `GDK_IS_DRAWABLE (drawable)' failed Error opening coefficient file
    -
  • -
  • (opencpn:8979): Gdk-CRITICAL : IA_gdk_window_get_origin: assertion `GDK_IS_WINDOW (window)' failed
    -
  • -
- -

-are quite normal and have nothing to do with OpenCPN. Just ignore them! -

- -
- -

Why doesn't the plugin work?

-
-
    -
  1. It is best to keep OpenCPN and plugins updated to the most current version.
    -
  2. -
  3. If you are having trouble, it is likely you will be asked to update plugins and Opencpn to be current.
    -
  4. -
- -
- -

When will OpenCPN be ported to Android?

-
-
    -
  1. There are two versions in the Google Play Store. We suggest you will be happiest with the paid version created by D. Register because it is updated regularly and is current. There is a forum at http://bigdumboat.com/aocpn/forum/.
    -
  2. -
- -
- -

Why do vector charts take so long to load?

-
-
    -
  1. The behavior you see is expected for ENC charts. ENCs must be converted to internal SENC format before use for navigation. This takes a little bit of time, depending on your system capabilities. But it only has to be done once, and the converted SENCs are stored on your system for later use.
    -
  2. -
  3. All ECS systems must convert ENCs to SENCs. Some take longer, (like OpenCPN), so that subsequent access is faster. Some convert faster, leaving more work to do at the time of actual chart display. Its a design decision. OpenCPN is optimized for speed in real use, not for speed in conversion.
    -
  4. -
- -
- -

Why don't charts show at all zoom levels while quilting is enabled?

-
-
    -
  1. If I turn off quilting, I can select the individual maps just fine and zoom to any level on them. No amount of clicking/hiding the maps using the map bar at the bottom of the screen show the maps. Only a zoom allows them to be seen. This problem of disappearing maps happens all over the country at different zoom levels.
    -
  2. -
  3. Answer: OpenGL is turned off. Without OpenGL, OpenCPN will not quilt Mercator and Transverse Mercator charts together. Try enabling OpenGL with Options (wrench tool icon)> Display> Advanced. Click on the box between “Graphics” and “Use Accelerated Graphics (OpenGL)” to put a checkmark in the box.
    -
  4. -
  5. When OpenGL is enabled, OpenCPN will quilt Mercator and Transverse Mercator charts (and some other projections).
    -
  6. -
  7. If “Texture Compression with Caching” is enabled under “OpenGL Options” there will be a delay before each chart is displayed for the first time. Subsequent display of the charts in the cache will be faster.
    -
  8. -
- -
- -

Whenever a specific chart is opened, OpenCPN crashes. What's going on?

-
-
    -
  • Chances are the chart file is corrupted.
    -
  • -
  • Note the name and number of the suspect chart and replace it with a fresh download.
    -
  • -
  • Read the log file that may contain relevant information regarding the chart.
    -
  • -
  • Sometimes the bad chart blocks OpenCPN from restarting.
    -
  • -
  • Follow these instructions instead Troubleshoot Installation
    -
  • -
- -
- -

What are all those 'U' s or '*' astericks in triangle all over my Vector Charts?

-
- -

-Most users just want to get rid of the triangles, but please refer to the Quality of Data Documentation. -

-
    -
  1. In Options > Charts > Vector Charts Tab when using Display Category “All”, Uncheck “Chart Information Objects” which hides the “U” symbols .
    -
  2. -
  3. In Options > Charts > Vector Charts Tab for a finer grain control when using Display Category “Mariners Standard”, In the selection List Box, Uncheck “Quality of Data” which hides the “U” symbols.
    -
  4. -
- -
- -

What are those acronyms on the charts?

-
- -

-To learn the acronyms used in this application search the S57 'Object and Attribute' catalog at: http://www.s-57.com/
- -Also, when viewing ENC charts: -

-
    -
  1. “U's” show up all over the charts
    -
  2. -
  3. Text detail seems to be missing ..like bouy identification ..Bridge names and clearances etc…
    -
  4. -
  5. Depth sounding seem to disappear zooming in and out.
    -
  6. -
- -

-Hit Text: The A+ button. To show text. -

- -
- -

How to remove those pink crosses (isolated anger symbology)?

-
- -

-This isolated danger symbology is a part of the new ENC S57 presentation standard which OpenCPN complies with, get used to it. -OR -You can try to cover them with your depth setting. Look at the manual Vector Display Tab > Shallow, Safety & Deep Depths -Safety Contour”, where you will find an example of just how depth is taken into account when displaying the magenta cross. -

-
    -
  • Safety Depth = 2 meters almost of the pink crosses are covered, but not those in depths 2-5m.
    -
  • -
  • Safety Depth = 10 meters all pink crosses are covered and you have lost your pink friends.
    -
  • -
- -
- -

Kap files are no longer displayed correctly. Why?

-
-
    -
  1. Old versions of OpenCPN were correcting broken KAPs on the fly. (They work on 3.2 but not on any 4. release ) The new ones don't do it anymore as the number of damaged charts circulating around decreased significantly and we gained some extra performance during chart loading. Refer to these sections of the User Documentation too.
    -
  2. -
  3. To fix your charts, run bdbfix on them.
    -
  4. -
- -
- -

What causes spurious waypoints which must be deleted?

-
-
    -
  1. Condition: Multitude of repeated waypoints, which get copied when a waypoint is dragged. Sometimes a route WP is shifted, two routes are made, one with the name, the other unnamed.
    -
  2. -
  3. Possible Solutions: Determine if the addition of waypoints are from inadvertantly hitting the wrong keys on the keyboard, or the mouse.
    -
  4. -
  5. The other possiblity is that the navobj change file is corrupted. Close O and try to delete the change file In W8.1 it is found in C:\ProgramData\opencpn/navobj.xml.changes. Normally, after that O will work again.
    -
  6. -
- -
- -

Can I use my Seaclear wci or OziCharts?

-
- -

-See Use-seaclear-wci-charts and Oziexplorer to Opencpn -Also see Not supported formats that can be converted and Map2Kap and WCI Charts -

- -
- -

Can I import SeaClear routes and waypoints into OpenCPN?

-
-
    -
  • Yes. I had originally created and maintained all my routes and waypoints in SeaClear, exported them, loaded them into GPS Utility (for Windows) and saved them as text files.
    -
  • -
  • To import into OpenCPN I opened all my text files (routes and waypoints) with GPSUtility, saved that out as one big gpx file, and loaded it into OpenCPN. Works like a champ.
    -
  • -
  • I've edited them and saved them back out as GPX files with no trouble.
    -
  • -
  • Individual routes can be edited and saved in appropriately named GPX files.
    -
  • -
- -
- -

How to synchronize Routes, Waypoints & Marks with another computer?

-
- -

-Three ways to synchronize: -

-
    -
  • From the Route & Mark Manager > Route Tab, select “Export all visible” or highlight select routes and “Export Selected” to a gpx folder. Then use saved gpx file to import the Routes to another computer. For Marks pick the Waypoint Tab, select “Export all visible” or highlight select waypoints and “Export selected” to a gpx folder. Then import waypoints from the other computer.
    -
  • -
  • Copy the navobj.xml file to the second computer's navobj.xml file, which will overwrite your routes and marks on that computer. If you are connected via a network you can make a batch file to do this.
    -
  • -
  • To copy all waypoints or routes, make a copy & rename the navobject.xml file to .gpx file and import the waypoints, routes and/or tracks. This does all waypoints/routes/tracks at once.
    -
  • -
- -

-The navobj.xml file resides in the same folder as the opencpn.ini settings file, under the OpenCPN User folder. For windows this is usually “C:\programdata\opencpn\”. -The navobject.xml file is in in fact a .gpx file containing all waypoints/routes/tracks. -See Navigation Data Backup for more information. -

- -
- -

Jumping GPS!

-
- -

-GPS AIVDO Boat Position is Jumping many miles away. -

- - -
- -

Charts jump while Using Follow Ship Offset, Look Ahead & North up Modes

-
- -

-Chart Rotation Smoothing. When follow ship, offset mode, look ahead mode and north up mode are all turned on, the goal of the look ahead is to position the ship about 2/3 away from the farthest point directly ahead of the ship. Because the screen is a rectangle, the ship's position on the screen keeps changing, since the farthest point ahead is changing rapidly. Use Options > Display > Advanced Chart Rotation Averaging Time [new title] or Course-up Update Period _Time [old title] to smooth the chart rotation. It is actually another “always on” COG filter that smooths VP rotation and makes the chart much less jumpy. In conjunction with NMEA course and speed filtering the chart moves slowly in a nice way. -

- - -
- -

AIS Targets HDG and COG may be wildly different

-
- -

-The TRUE Heading reported in the target query is always as actually reported by the target. We do not apply variation to that value before presentation. So, what you see is no error. Of course, in situations with strong cross currents, or maneuvering, the reported HDG and COG may be wildly different. -

- -
- -

How can a SART Alarm be disabled or ignored?

-
- -

-MOB SART has been tested extensively. The methods for deactivation should work. See SART. Also Disable SART When Alert is active, find the Alert's MMSI number in the AIS Target List. Then Add a “New” MMSI number in Options→Ships→MMSI. Then Edit the Options→Ships→MMSI Properties to “ignore” this target. Then close the Options Dialog. Then “Acknowledge” the SART alert one more time, and no further alerts will be seen. If you restart OCPN, you will never get alerts for this target again. -

- -
- -

How to send routes to GPS via USB or via NMEA Serial connection

-
- -

-There are so many GPS models that the answer is a bit complicated. A lot depends on which GPS model you have. OpenCPN can communicate with many GPS receivers via a serial connection. Some GPS receivers have a serial connector that can be wired to a DB-9 serial connector. Newer ones have a USB port that will appear like a serial connection to your computer. Still newer ones appear to your computer like an external drive. -

- -

-If your GPS receiver shows up as a serial connection on your computer chances are you can upload routes and waypoints directly to it from within OpenCPN. The GPS and OpenCPN have to be set to the same communication protocol. If you normally have them set to NMEA (for updating the OpenCPN chart display with position data from the GPS) you may need to change a Garmin GPS to the GRMN proprietary protocol to upload routes, waypoints, and tracks. If your GPS doesn't show up as a serial connection you may still be able to transfer routes and waypoints to it outside of OpenCPN. If the GPS appears as an external drive on your computer try this. Use OpenCPN to export your routes and waypoints to a GPX file (read the User Manual section on the Route & Mark Manager for more details). Then use your operating system to copy the GPX file from your hard drive to your GPS. If that doesn't work, try GPSBabel or EasyGPS for the transfer. -

- -

-Depending on your GPS model and the way the route was created in OpenCPN you may wind up with a route on your GPS or just a list of waypoints. The route points may or may not appear as waypoints on the GPS. -

-
    -
  • Garmin has a program called Homeport which connects to most of their small GPSmap and Plotters which will upload/download waypoints and routes. I believe it will also import gpx routes.
    -
  • -
  • EasyGPS is a free program that allows you to transfer routes, waypoints, and tracks between your Windows computer and your Garmin, Magellan, or Lowrance GPS.
    -
  • -
  • GPSBabel is another free program that allows you to transfer data between your computer and your GPS. It runs on Windows, Mac, and Linux operating systems and supports a wide range of GPS models.
    -
  • -
  • There are also some helpful notes in the manual.
    -
  • -
  • -
  • -
  • -
  • -
  • The oBabel plugin uses GPSBabel to transfer routes without leaving OpenCPN.
    -
  • -
- -
- -

Night time Mode Title bar is too bright in Windows

-
-
    -
  • In Windows, Night, F5, mode. The title bar on the floating plugin window is a bit glaring (this mode is controlled by windows by way of a theme and is not possible to change from an application) .
    -
  • -
  • The best solution is to simply “dock” the dashboard window at night, either left or right. This brings the window decorations back under OCPN control, and we recently added logic to dim it in this mode.
    -
  • -
  • Dimming the screen, if it is available and goes far enough is often best. F6 General Dimming, in steps, of the entire Screen. (except Mac OS X ). OpenGL must be off.
    -
  • -
  • Otherwise the “Change color scheme' F5 button or (C, Ctrl+C, Ctrl+G). This may or may not work on your particular computer.
    -
  • -
  • -
  • -
  • For Linux users, who have little differentiation between shallow water colurs and land colours, try “F.Lux” which has a 2000k setting that makes the screen quite dull over the daytime colour palette. F.lux is confirmed as massive win on Linux. Daytime palette and use F7 to drop the brightness a bit more if needed. https://itsfoss.com/night-shift-flux-ubuntu-linux/
    -
  • -
- -
- -

How are fonts adjusted in the User Interface?

-
- - -
- -

How are fonts adjusted for the AIS Target List?

-
-
    -
  • The AIS Target List does not exist in UI > Options Fonts selection. AIS target list uses the “Dialog” font key in Options > User Interface, Fonts and Font Color..
    -
  • -
- -
- -

How are font sizes for vector chart Depth Soundings adjusted?

-
- -

-Out of the box, the “Depth” notation is unreadable. -

-
    -
  • Try Options > User Interface > Chart Object Scale Slider set on +4 or +5.
    -
  • -
  • The Chart Object Scale Slider is for Vector Charts only.
    -
  • -
  • Raster Chart cartography is superior and depths are very clear in comparision.
    -
  • -
- -
- - -
-
    -
  1. Opening the properties page, and adding a link to a JPG-image works fine. If I now edit the link, the image will no longer be displayed.
    -
      -
    1. The button “Edit” changes state. You click on it to switch the links above to “edit mode”, each click on any of the links opens the dialog allowing you to change it's parameters. After editing the link, you have to click on the button again and then a click on the links will again start opening whatever they link to. What will happen when you click on the link is explained in the text bellow the buttons and changes according to the “Edit button”. If it says “Links are opened in the default browser”, the linked file or internet address should open, given it exists, which gets us to..
      -
    2. -
    -
  2. -
  3. Similarily, if I export a waypoint with a link to another computer, the link will not open.
    -
      -
    1. The link is just a link, the file you link to is NOT “included” in the waypoint. When you transfer the waypoints to another computer, for links to local files to keep working, the files you link to would have to exist on the exactly same place on your disk there. Eg. The file that on computer A is C:\MyDocuments\MyPicture.jpg would have to exist with exactly the same file name, in the exactly same folder, on the exactly same disk on computer B.
      -
    2. -
    -
  4. -
- -
- -

OpenCPN and Great Circle Navigation

-
-
    -
  1. There is a Route Plugin for Great Circles.
    -
  2. -
  3. Raster charts display bearings and headings as straight, measurable lines on the chart. Similarly, Vector ENC's are rendered as Mercator projections in OpenCPN and most other ECS's for the same reason.
    -
  4. -
  5. For typical coastal navigation, errors which occur using rhumb line instead of great circle calculations are small for the distances usually covered by one chart.
    -
  6. -
  7. Mercator Charts and Mercator navigation is the standard for most navigational purposes. Other terms used instead of “Mercator Sailing” is “Loxodrome Sailing” or “Rhumb Line Sailing”.
    -
  8. -
- -
- -

OpenCPN 3.2.0 forward handles Great Circles directly

-
- - -
- -

Why aren't settings saved properly when I close Opencpn?

-
- -
- -
Not saving settings when exiting -due to Inland ECDIS is checked
-
- -
- -
European Inland Waterways ECDIS Mode
-
- -

-Issue just started with 4.8.0 where on exit doesn't save * Units * Configuration of toolbar * Starts in night mode I searched the opencpn.ini for these settings but not sure what I am looking for TBH. I also backed up this file and exited the program forming a new ini file, same issue. Any ideas? -

- -

-OpenCPN is probably set to use settings for Inland ECDIS European Inland Waterways ECDIS -

-
    -
  • Click the wrench (or spanner) icon on toolbar to open the “Settings” dialog.
    -
  • -
  • Select the “User Interface” tab, and
    -
  • -
  • look below the “Interface Options” for
    -
  • -
  • “Use Settings for Inland ECDIS Version 2.3”.
    -
  • -
  • Remove the checkmark on the “Use … Inland ECDIS…” line.
    -
  • -
- -
- -

Right-click > Navigate > To Here has a problem

-
- -

-The new Active Route always disappears and I try to recreate it and it disappears again. -

-
    -
  • If the distance to waypoint increases slightly then route manager says we have “arrived” and it tries to advance to the next waypoint.
    -
  • -
  • But in a simple “Navigate to here” scenario there is no next waypoint so it just assumes it has arrived at the destination.
    -
  • -
  • Also this problem may be due to some “noise” from the GPS position.
    -
  • -
  • Try setting Options > Ships > Own Ship in the Routes box check “Advance route waypoint on arrival only”.
    -
  • -
- -
- -

How exactly does NMEA 0183 HDG Sentence work?

-
- -

-If HDG message also contains the variation and E/W flags then O will use that. If not then it will look in RMC message for a variation. If nothing there it will use WMM plugin unless user has selected the variation manually in options. -

- -
- -

How do I save many waypoints to a Layer?

-
- -

-Question: Layers is a good feature, however I need a tool to create a layer with many waypoints (say 200 waypoints in Fiji). I'd like create a layer of all visible waypoints in a chart area that I have zoomed into. After creating the layer, I'd like to delete them from the waypoints list with a single command. -

- -

-Answer: Using the Route & Mark Manager -

-
    -
  • Import the waypoints into the Waypoints Tab.
    -
  • -
  • Select all the Waypoints by clicking & highlight the top waypoint, scroll to the bottom and while holding the Shift key, click to highlight all.
    -
  • -
  • Wait for all the waypoints to be highlighted.
    -
  • -
  • Click on the button “Export selected …”.
    -
  • -
  • Browse to choose the directory to save the waypoints, & name the file 'Fiji Waypoints'.
    -
  • -
  • Click on 'Save'.
    -
  • -
  • All the waypoints will be in one .gpx file which, when put in the Layers folder can be displayed or not in the Layers Tab by toggling the 'eyeball'.
    -
  • -
  • You can also use the 'List contents' in the Layers Tab to have the Waypoints displayed in the Waypoints Tab.
    -
  • -
  • When done you can clear the Waypoints Tab from the Layers tab by clicking on 'Unlist Contents'.
    -
  • -
  • -
  • -
- -
- - -
- - diff --git a/data/doc/favicon.ico b/data/doc/favicon.ico deleted file mode 100644 index 319e1f3bb6..0000000000 Binary files a/data/doc/favicon.ico and /dev/null differ diff --git a/data/doc/getting_around.html b/data/doc/getting_around.html deleted file mode 100644 index 65305ba12f..0000000000 --- a/data/doc/getting_around.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_around - - - - - - - - - - - - - - - - - - - - - -
- - - -

Getting Around

- - - -
- - diff --git a/data/doc/getting_around/chart_info.html b/data/doc/getting_around/chart_info.html deleted file mode 100644 index f5268f9b88..0000000000 --- a/data/doc/getting_around/chart_info.html +++ /dev/null @@ -1,270 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_around:chart_info - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Info

-
- -

- - -If you hover the cursor above one of the segments, representing a chart, in the Chart Selection Bar, a chart information box pops up. The chart info refers to the chart in the upper right corner, outlined in red and with pink-ish overlay.
- -
- -
- -
- -The information on a vector chart is similar.
- -
- -
- -For CM93, switch to single chart mode, to see the information.
- -If there seems to be a lot of information missing, it's because the chart has not been viewed in the present session. Get the chart up on the screen, then try again.
- -The Chart Info Box can be inactivated by hiding the Chart Bar. Use Hot keys
- -Ctrl + B to hide/show the Chart Bar. -

- -
- -

What does all the information mean?

-
- -

-
- -ChartFile: The file on the local computer where the chart is.
- -
- -Name: The Name of the Chart. Not all vector charts have names, while raster charts always have names.
- -
- -Scale: The scale of the chart.
- -
- -ID: The chart number. For raster charts this is the same as the number of the paper chart. Vector chart cells have their own numbering scheme.
- -
- -Depth Units: For raster charts this is the units for the printed soundings. For vector charts this is the sounding units set in Options → Display → Units → Depth.
- -
- -Soundings: The datum for soundings. It is the level that all printed depth figures refers to. Consult a text book on Navigation for details.
- -
- -Datum: The geodetic datum. This will be WGS 84 for all new charts, compiled later than about 1993.
- -If this value is unknown to OpenCPN, or stated as “UNKNOWN”, or the value is missing altogether, OpenCPN will load the chart using WGS84.
- -This is a potential source of errors and far from ideal. The reason is that a number of chart-agencies, at least in the past, failed to state the correct GD value.
- -See below for an example of this kind of chart.
- -
- -If the chart is not using WGS 84, but a named, recognized datum, OpenCPN will automatically add necessary corrections.
- -
- -Projection: OpenCPN accepts Mercator, Transverse Mercator, UTM or Polyconical projections.
- -
- -Source Edition: The Chart Edition.
- -
- -Updated: The date when the chart was released. Expect the chart to be updated to this date, unless otherwise stated.
- -

- -
- -

The OpenCPN Logfile

-
- -

-The file contains a wealth of information, and should be your first stop if your chart(s) don't load or if there is an error message. -

- -
- -

Chart Accuracy

-
- -

-First… make sure your GPS is set to output positions using the WGS 84 Geodetic Datum.
- -
- -If you see a warning like the one below:
- -
- -
- -Be careful. The warning means that the charts geographic accuracy is bad. The position of Own Ship may not be correct.
- -A visual warning is that Own Ship turns from Red to Yellow when receiving a gps signal.
- -
- -First is a real scale vector version and then the default OwnShip bitmap
- -
- -
- -There is no quick fix for a bad chart, but try to switch to another chart if using single mode chart display. If quilting is on, right-click on the chart button in the chart-bar and select “Hide this chart”. Both suggestions assumes that the bad chart can be replaced by other charts, which of course isn't always possible.
- -The chart will probably be OK for navigation with traditional methods. Use bearings, vertical or horizontal sextant angles of conspicuous landmarks to confirm your position, as well as soundings or any other available resources. -

- -
- -

Checking a chart for accuracy

-
- -

-A raster chart, using WGS 84, can easily be checked for the accuracy of the chart grid. This does not necessarily guarantee the position of the individual features on the chart. Refer to Calders book.
- -Activate Options → Display →General → Show Grid. A Latitude and Longitude grid will be displayed as a layer on top of the chart. This grid is OpenCPNs view of how a proper WGS 84 should look like. For raster charts this grid can be compared to the “printed” grid on the chart picture. Chart errors are too complicated to be treated in a few sentences. Refer to Nigel Calders book “How to Read a Nautical Chart” for an in depth but still easy to read text.
- -For a quick check, we are happy with a grid error that is in the region of 1 mm at the chart scale. For a chart in 1:50.000 this means an error of 50 m.
- -
- -Use OpenCPNs ability to grossly over-zoom a chart. Home in on a printed lat/long crossing. Below is a test on a commercial BSB3 chart in 1:60.000. The width of the printed grid - thick black lines - is about 12 m. The thin gray lines is OpenCPNs grid layer. The accuracy of this chart is very good.
- -
- -
- -
- -
- -
- -Another example. This time we are looking at a chart in 1:10.000. Very accurate.
- -
- -
- -
- -This method cannot be used unless the chart is WGS84. For other geodetic datums, expect a difference between the printed grid on a raster chart and OpenCPNs grid. To check for accuracy on this kind of chart find a wellknown object with an established position, for example a major Lighthouse, and compare this position with OpenCPN.
- -
- -Adjusting charts to agree with WGS 84.
- -This is an advanced subject.
- -For CM 93 read CM93 Offsets.
- - - -The work flow to correct any kap chart is: -

-
    -
  1. Use imgkap to extract the chart picture
    -
  2. -
  3. Copy the text header from the kap chart to a .txt file.
    -
  4. -
  5. Adjust the DTM values in the .txt file
    -
  6. -
  7. Use the imgkap with the picture and the .txt file to produce a new updated kap file.
    -
  8. -
  9. Check for accuracy and go back to #3 if necessary.
    -
  10. -
- -
- -

No Projection -> Chart rejected.

-
- -

-If the chart does not contain any information about the projection, OpenCPN doesn't know how to display it. Such a chart will not be loaded, but a note about the problem will appear in the log file.
-Missing a chart? Check your OpenCPN logfile. -

- -
- -

No Datum -> —<<< Warning: Chart Datum may be incorrect. >>>—

-
- -

-The message will be in the Chart Info Box.
-This is a warning that the chart probably is not accurate enough for GPS navigation. It still should be OK with traditional methods. A minimum recommendation is to check the GPS position with traditional methods, a couple of compass bearings, for example.
-
-One example, that unfortunately have lead to problems for a few yachts, is DMA/NGA chart 28201, Puerto Morelos, in Mexico, from 1995. This chart, based on a Mexican survey from 1905, has a Datum Note, similar to this:
-
-
-
-
-
-Comparing 28201 with CM93 that is correct, in this particular case. Note the substantial corrections applied in CM93,
- -

- -
- - -
- - diff --git a/data/doc/getting_around/chart_status_bar.html b/data/doc/getting_around/chart_status_bar.html deleted file mode 100644 index 96196dcd1b..0000000000 --- a/data/doc/getting_around/chart_status_bar.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_around:chart_status_bar - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Status Bar

-
- -

-
- - -
- -
- -
- -At the bottom of the display, is the Status Bar, activated from “Options→User Interface→Show Status Bar”. -
- -Just above the Status Bar is the 'Chart Selection Bar'. Ctrl+B toggles this bar on/off.
- -It shows all the available chart for the present view, represented by one colored segment for each chart. The order between the segments represents the scale of the charts. Largest scale to the left, smallest to the right. If CM93 is available, it is always furthest to the right.
- -The segmented color bars in the Status Bar represent: -

-
    -
  • Blue for Raster
    -
  • -
  • Green For ENC's
    -
  • -
  • Brown/Yellow for CM93 charts
    -
  • -
  • The current chart displays as a lighter shade of its color, or if quilting is active, the charts currently making up the quilt are displayed in lighter shade.
    -
  • -
  • The Chart bar below consisting of 12 segments shows a quilt of two active charts. Five charts in the quilt are hidden, due to small scale. CM93 is in it's place, to the right. Four charts of larger scale than the present view are available. The largest scale chart is a Transverse Mercator chart.
    -
  • -
- -

-
- - -
- -

- -
- -

Limitation

-
- -

-
- -The Chart Bar handles a maximum of 100 charts. The largest scale charts will be dropped first if more than 100 chart are available on a position. It is unlikely that this will be much of a limitation, but the possibility certainly exists if a lot of info charts, pilot charts and weather charts etc, are loaded. The symptom will be that large scale charts becomes impossible to display. -
- -When you hover the mouse pointer over the bar, and not in quilting mode, a thumbnail of the chart will appear under the Scaling Charts icons and a chart information box will pop up just above the button. If quilting is on, instead of a thumbnail, the chart represented by the button will be highlighted in a transparent reddish color. By clicking on the appropriate bar, or using the appropriate Keyboard Shortcuts, you will switch to the chart shown in the thumbnail. This feature is especially useful if you wish to view an ENC or a Raster chart of the same area. -
- - -
- -The bottom line starting from the left, a bar, that imitates a paddle wheel, if a gps position is received, and the gps position. Then follows SOG, COG, the position of the cursor, and course and distance from the gps position to the cursor. To the far right there is true Scale of the display and the Zoom Factor. The Zoom factor is the Scale (as above) divided with the natural scale of the chart. -
- -The buttons, or colored segments, are displaying a lot more information however. -
- - -
- -These buttons shows that the two charts are Transverse Mercator, and that single char mode is used as the corners of the segments are not rounded. -
- - -
- -This button indicates that the chart is a Polyconic chart. -
- - -
- -This button shows that the chart is Skewed, meaning that north is not up on the chart. -
- - -
- -This chart is excluded from quilting because of user action. Right click to include in quilting again. Notice the rounded corners due to quilt mode. -
- - -
- -The raster chart represented by this button don't participate in the quilt because it is hidden by other, larger scale charts. Vector charts are represented similar. -
- -To illustrate a lot of this, here is a screen shot in quilting mode. -
- - -
- -The screen is a quilt of two Polyconical charts. Hovering the mouse pointer over the left chart-button highlights the lager scale chart for Manitowoc. Two smaller scale charts that cover the area displayed on the screen are included in the quilt, but are invisible as they are covered by the larger scale charts. To view these charts, right-click anywhere on a chart in the quilt and select “Remove this chart from quilt”, one of these charts will now be shown in the quilt. -
- -The Brown right most button shows that CM93 version 2, charts are available for the area, but not currently displayed. -
- -The information box shows relevant information about the chart. -

- -
- -

To Hide the Chart Bar

-
- -

-Use these hotkeys: Ctrl + B hide/show the Chart Bar. -

- -
- - -
- - diff --git a/data/doc/getting_around/display_orientation.html b/data/doc/getting_around/display_orientation.html deleted file mode 100644 index 1f31dda2c6..0000000000 --- a/data/doc/getting_around/display_orientation.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_around:display_orientation - - - - - - - - - - - - - - - - - - - - - -
- - - -

Display Orientation

-
- -

- -

- -
- -

Chart Orientation and GPS Status Icon

-
-
    -
  • There are three main options for display orientation: North Up (for planning), Course Up (for navigating with a GPS) and Chart UP (for skewed charts). With Course Up OpenCPN uses COG (Course Over Ground). A head Up mode, is not available. The easiest way to change between these two modes is through the “Right Click” menu. One situation where course up might be considered is when navigating a river or a canal. The third orientation is when skewed charts are displayed, they are simply shown as “Chart Up”, but an optional setting exists to show them as “North Up”.
    -
  • -
  • In the picture below the Course Up is active. COG is 41Deg. Notice how all text on the vector chart, is aligned correctly. This only works in OpenGL mode. The red arrow, in the upper right corner, is always pointing North.
    -
  • -
- -

- -

-
    -
  • If the option “Show skewed raster charts as North-up” in the Options→Display→Advanced tab, is not ticked, the right-click toggle option “Course Up Mode/North Up Mode” will be replaced by “Course Up Mode /Chart Up Mode”, for skewed charts.
    -
  • -
  • If an electronic compass is available in the NMEA stream the own ship icon will be orientated according to this heading. The difference can be seen on the chart if there is a cross current, for example. The boat below is heading WNW but is being set SW. An AIS CPA, Closest Point of Approach is also visible.
    -
  • -
- -

-
- -

-
    -
  • This icon (blue color) to the far right in the ToolBar indicates that the display is in North Up mode. It may also indicate Chart Up mode for skewed charts, if chart up mode instead of North up mode i selected. See above
    -
  • -
  • The red version of the icon indicates Course Up mode. Clicking the icon toggles North Up / Course up. These settings can also be toggled in the rightclick menu, as well as in Options → Display →General Tab. In the Options-Display→Advanved Tab, the update period for course up, can be set. This comes in handy, for example, to prevent the display jerking around in a chop.
    -
  • -
  • The Course Up/North Up icon share a small dialog with the GPS indicator. This dialog can be toggled on/of with the “Ctrl + i” shortcut.
    -
  • -
  • Note that both the red and the blue arrows are always pointing North.
    -
  • -
  • Look Ahead! To see more of the chart in front of the boat, activate Options → Display → Look Ahead Mode. Your own boat will no longer be in the center of the screen. Instead it will be located away from the center, in the opposite direction to your present gps course(COG).
    -
  • -
  • Don't always Look Ahead! If you are at anchor, swinging on the hook produces random courses and low speeds.If Look Ahead is on in this situation the chart rendering will constantly be redrawn, with the boat in all possible lookahead positions as the course changes. To prevent this kind of scenario OpenCPN works like this:
    -
  • -
-
    -
  • If the boat speed is less than 1 kt, then lookahead is disabled.
    -
    -
  • -
  • If boat speed is greater than 3 kts, lookahead is enabled.
    -
    -
  • -
  • In between 1 and 3 kts, the lookahead “distance” is adjusted smoothly.
    -
    -
  • -
  • If the problems still there when doing more than 3 kts, consider using “Options→Connections → FilterNMEA Course and Speed data” to average out the “jumpiness”.
    -
  • -
-
    -
  • Show skewed raster charts as North-up. Skewed charts are normally showed “chart up”, as intended by design. If ticking this box, these charts are shown North-Up. In both cases, activating course up, works as expected, the difference is when course up is not on.
    -
  • -
  • Full Screen. Enter Full Screen Mode with the F11 toggle. Toggling full scree is also possible through the Menu Bar → View. Once in full screen mode the Right-Click-menu contains the item “Toggle Full Screen”.
    -
  • -
- -
- - -
- - diff --git a/data/doc/getting_around/gps_setup_and_status.html b/data/doc/getting_around/gps_setup_and_status.html deleted file mode 100644 index d3187cf9c9..0000000000 --- a/data/doc/getting_around/gps_setup_and_status.html +++ /dev/null @@ -1,175 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_around:gps_setup_and_status - - - - - - - - - - - - - - - - - - - - - -
- - - -

GPS Setup & Status

-
- -
- -

GPS Setup

-
- -

-
- -Please refer to -

- - -

- -

- -
- -

GPS Status

-
- -

-The default Ownship icon is rendered as grey if there is no valid gps position fix available and like this when a gps fix is available
- -
- -The GPS status is also indicated all the way to the right along the top of the screen, together with the North Up/ Course Up Indicator, unless this position is covered by the floating ToolBar. The GPS status is then found bottom left.
- -
- -This windows visibility is user settable in Options→User Interface→ Show Compass/GPS Status Window. Short cut “Ctrl-I
- -

- -

-The GPS Status Icons should be interpreted as follows: -

- -

- No GPS data at all, or position not available. -

- -

- GPS fix, the position is known and received from the GPS. Signal is frequent enough and good for navigation, satellite count is not available in the data feed . -

- -

- Active/Valid GPS data + GPS reporting 1 - 4 satellites. Only if satellite count is available from GPS receiver. -

- -

- Active/Valid GPS data + GPS reporting 5 - 9 satellites. Only if satellite count is available from GPS receiver. -

- -

- Active/Valid GPS data + GPS reporting 10+ satellites. Only if satellite count is available from GPS receiver. -

- -

-Ball: -A Ball could be 1,2 or 3 bars, the number of satellites is unknown because the GSV sentence may be unavailable. There is a good fix, the ball just means we get the position often enough. We know a good GPS fix requires a minimum of 4 satellites to resolve the four unknowns X,Y,Z (spatial) and t (time). That is the minimum and one more satellite is better because it is likely to be more stable. The Ball may be using position data with more than 4 satellites available, but not showing any bars because the sentence is filtered out by your network or multiplex filters. -

- -

-Bars: -The GPS may also send data about the satellite constellations (its name/the PRN, azimuth and elevation for each of the sats). The GSV Sentence contains this information. If your network or multiplex filters the GSV sentences out, the only indicator showing will be the Green Ball. -

-
    -
  • If there are many fluctuations in the number of bars, there might be problem with reception but there is no direct relation (such as many satellites = good quality). With more bars it is more probable that the fix is better (however there is no guarantee), and with more satellites the reception is more stable. Bars are interesting to watch in urban & treed environments, but for boating a minor issue in general. The bars are not better than the dot, the only difference really is they show we have data about the number of sats available.
    -
  • -
  • In real life, various gps receivers may behave slightly differently, especially when starting up and finding satellites. Five sats with a strong signal can give a better fix than ten at low elevation pinned on the horizon. Some modern designs of GPS chip sets disregard “low quality” sats and rely on few ones with optimal reception. What they will show in the GSV NMEA sentence - all sats in sight or just the ones used varies from manufacturer to manufacturer.
    -
  • -
- -

-The small dialog, containing the GPS indicator and the Course Up / North Up indicator, can be toggled on/off with the “Ctrl+i” shortcut. -

- -

-The GPS status, including available satellites, is also available as an instrument on the DashBoard. -

- -

-GPS and low accuracy charts. -

- -

-OpenCPN is checking loaded charts for accuracy as far as possible. If there is a problem with a chart, the chart info box that becomes visible when holding the cursor over the chart rectangle in the chart bar, will say ” Warning: Chart georef accuracy is poor.” -

- -

- -

- -

-A visual warning is that Own Ship turns from Red to Yellow when receiving a gps signal. -

- -

- -

- -

- -

- -

-First is a real scale vector version and then. the default OwnShip bitmap -

- -

-There is no quick fix for a bad chart, but try to switch to another chart if using single mode chart display. If quilting is on, right-click on the chart button in the chart-bar and select “Hide this chart”. Both suggestions assumes that the bad chart can be replaced by other charts, which of course isn't always possible. -

- -
- - -
- - diff --git a/data/doc/getting_around/keyboard_shortcuts.html b/data/doc/getting_around/keyboard_shortcuts.html deleted file mode 100644 index a69f433c80..0000000000 --- a/data/doc/getting_around/keyboard_shortcuts.html +++ /dev/null @@ -1,316 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_around:keyboard_shortcuts - - - - - - - - - - - - - - - - - - - - - -
- - - -

Keyboard Shortcuts

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Windows Linux OS X Comments
Menu Bar AltToggle if Show Menu is unchecked.
Zoom In +
Zoom Out -
Zoom In PgUp
Zoom Out PgDn
Fine Zoom In Alt +
Fine Zoom Out Alt -
Larger Scale Chart Ctrl+LeftArrowKey (or F7)Cmd+LeftArrowKey
Smaller Scale Chart Ctrl+RightArrowKey (or F8)Cmd+RightArrowKey
Panning Arrow keys
Panning Slowly Alt + Arrow keys
Quit OCPN Ctrl+QCmd+Q
Preferences Cmd+,
Full Screen F11Ctrl+Cmd-F
Auto Follow (on/off)Ctrl+A (or F2)Cmd+A
- -

-
- -

- -
- -

The List sorted by Keys

-
- -

-
- -Function Keys -

-
    -
  • F2 toggle Auto Follow on / off
    -
  • -
  • F3 toggle ENC Text.
    -
  • -
  • F4 activates the chart measure pencil. Esc Stops it
    -
  • -
  • F5 toggle Daylight, Dusk & Night mode, if built into the Chart ( “C”, Ctrl+C, Ctrl+G)
    -
  • -
  • F6 General Dimming, in steps, of the entire Screen. (except Mac OS X ) OpenGL must be off.
    -
  • -
  • F7 Larger Scale Raster Chart (Scale In) or Ctrl + Left-Arrow
    -
  • -
  • F8 Smaller Scale Raster Chart (Scale Out) or Ctrl + Right-Arrow
    -
  • -
  • F9 Chart Quilting . Toggle on/off
    -
  • -
  • F11 toggle Full Screen view.
    -
  • -
  • F12 toggle Chart Outlines
    -
  • -
  • SHIFT + F6 reverses the dimming.
    -
  • -
- -

-Hot Keys or Shortcut Keys -

-
    -
  • C change color scheme -new similar to Ctrl+C, Ctrl+G and F5
    -
  • -
  • L toggle ENC Lights on/off. “Mariners Standard” display category.
    -
  • -
  • O toggle Chart Outlines. or F12
    -
  • -
  • T toggle ENC Text or F3
    -
  • -
  • S toggle ENC soundings.
    -
  • -
  • A toggle bottom features, useful when anchoring. “Mariners Standard” Anchorage area & Anchor berth display category.
    -
  • -
  • D toggle Detail Slider (ENC & CM93). Hide only works, if the slider lost focus.
    -
  • -
  • M toggle Measure Tool F4
    -
  • -
  • Q toggle Chart Quilting
    -
  • -
  • + Zoom In
    -
  • -
  • - Zoom Out
    -
  • -
- -

-Alt Keys -

-
    -
  • Alt. Toggles Menu Bar on/off of Show menu is not checked.
    -
  • -
  • Alt + Arrow Keys. Moves the chart view in very small steps.
    -
  • -
  • Alt + “+“ for fine scale zooming in.
    -
  • -
  • Alt + ”-“ for fine scale zooming out.
    -
  • -
- -

-Control Keys -

-
    -
  • Ctrl + scroll wheel, zooming in/out in small steps
    -
  • -
  • Ctrl + Left-Arrow-Key Larger Scale Chart (Scale In) (F7)
    -
  • -
  • Ctrl + Right-Arrow-Key Smaller Scale Chart (Scale Out) (F8)
    -
  • -
  • Ctrl + A Auto Follow
    -
  • -
  • Ctrl + B toggle the Chart Bar.
    -
  • -
  • Ctrl + C Change color scheme - new similar to Ctrl+G, “C” and (F5)
    -
  • -
  • Ctrl + G* cycles through green, red and normal screen.
    -
  • -
  • Ctrl + I toggle small dialog, containing GPS status & Course/Up North Up Icons, on/off.
    -
  • -
  • Ctrl + M Drops Marker at current cursor position.
    -
  • -
  • Ctrl + N Activate next waypoint in an active route.
    -
  • -
  • Ctrl + O Drops Marker at current ownship position. (or Spacebar)
    -
  • -
  • Ctrl + Q Quits OpenCPN
    -
  • -
  • Ctrl + R Starts the Routing tool. Esc ends creating route.
    -
  • -
  • Ctrl + Y Redo Mark/waypoint create, move or delete.
    -
  • -
  • Ctrl + Z Undo Mark/waypoint create, move or delete.
    -
  • -
  • Ctrl + , the option Window is displayed.
    -
  • -
- -

-Numerical Keys -

-
    -
  • Keyboard number keys 0,1,2,…9 Changes view between the first 10 chart groups, if available.
    -
  • -
- -

-Other Keys and Clicks -

-
    -
  • Keyboard Arrow Keys. Moves the chart view.
    -
  • -
  • Left clicking on a chart, centers the chart on that point.
    -
  • -
  • Double clicking a vector chart, displays all info for that point (exception below).
    -
  • -
  • When the cursor becomes a green arrow, clicking pans in the direction od the arrow.
    -
  • -
  • Double clicking on an AIS target, displays the target query dialog.
    -
  • -
  • Double clicking on a mark or waypoint, displays the Mark Properties Dialog
    -
  • -
  • Double clicking on a route or track, displays the Route/Track Properties Dialog
    -
  • -
  • Right clicking on any chart, access a context sensitive menu.
    -
  • -
  • Esc ends the process of route creation or stops the measure pencil.
    -
  • -
  • Right Mouse click on chart View center lat & long
    -
  • -
  • Left Mouse click on chart moves to center of view (Touchscreen interface becomes a “Hand”)
    -
  • -
- -

-Scroll Wheel -

-
    -
  • Scroll Wheel, zooming in/out
    -
  • -
  • Alt + scroll wheel, zooming in/out in small steps.
    -
  • -
- -

-Cursor -

-
    -
  • When the cursor becomes a green arrow, clicking pans in the direction of the arrow.
    -
  • -
- -

-—- -

- -

-* Ctrl-G Works on some Windows systems (depending on graphic driver) -

- -

-* MAC Cmd+A overrides standard “Select all text in current text box”, might possibly be able to change to Ctrl+Cmd+A in next version. -

- -

-* Spacebar Drops Marker at current GPS position NOTE: This must be enabled by manual edit of the opencpn.ini file. [Settings] …”SpaceDropMark=1”, to activate this feature. [Settings] …“SpaceDropMark=0” deactivates the feature. -

- -

-NOTE: This list may not be completely detailed and correct for now, but it does try to establish all the shortcuts available. -

- -

-We may need to add some things to Caesar's Functional and tabular list to make it more complete. Please contribute ideas and corrections/improvements! -

- -

-
- -

- -
- - -
- - diff --git a/data/doc/getting_around/right_click_menu.html b/data/doc/getting_around/right_click_menu.html deleted file mode 100644 index d24b3e6cd1..0000000000 --- a/data/doc/getting_around/right_click_menu.html +++ /dev/null @@ -1,302 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_around:right_click_menu - - - - - - - - - - - - - - - - - - - - - -
- - - -

Right Click Menu

-
- -

-The right click menu is always available as long as the cursor is somewhere in the chart area. The content of this menu is very context sensitive. The reason for the “Focused Context Menus”, is to keep the number of options down to a reasonable level, and still be able to deal with all situations. Additionally, many Plugins add items to the right-click menu. -

- -

-There are basic right-click menus when clicking at a random point, and very focused menus when clicking on a waypoint, a route, a track or an AIS target. If you have just created or deleted a waypoint, or if chart groups are defined, there are further entries added to the basic menu. Some plugins also adds entries to the right-click menu when they are used. Below, the basic entries are explained.The more context specific entries are dealt with as the concerned feature is explained. -

- -
- -

The basic single charts right-click menus.

-
- -

-Below is first the rastercharts menu to the left and then the vector chart menu. -Available “hotkeys”, if any, are shown to the right. -

- -

- - -

- -

-Starting with the left menu for rastercharts. -

- -
- -

Measure

-
- -

-Activates a “pencil”. Move the pencil with the cursor. Put the tip of the pencil on a position that you want to measure from. Left-click, a dot Position with a circle around is created. Move the pencil with the mouse and see the distance and bearing from the point to the pencil-tip in “real time”. Left-clicking again creates a temporary waypoint. When moving the “pencil” again, distance and bearing, once again are shown from the temporary waypoint. The total distance from the original measure point, via the temporary wapoint(s) are also shown as “Route Distance”. Right click and mark “Measure Off” to stop measuring. -

- -

-For longer distances, specially on east.west courses on higher latitudes, the measure tool seamlessly switches to display and measure great circles instead of Mercator rhumb-lines. Read more Great-circle Sailing
- -

- -

-The “Create Route” tool works in a similar way, but you can't use the two tools at the same time. -

- -
- -

Max Detail Here

-
- -

- -

- -

-Displays the largest scale, most detailed chart, available in the position of the cursor.
- -It is assumed that there are more than one chart available at the position. -

- -
- -

Scale In

-
- -

-Displays the next larger scale chart.
- -It is assumed that there are more than one chart available at the position. -

- -
- -

Scale Out

-
- -

-Displays the next smaller scale chart.
- -It is assumed that there are more than one chart available at the position.
- -

- -
- -

Create a Mark

-
- -

-Drops a mark in the position of the cursor. Further explained on this page Marks and Routes
- -

- -
- -

Move Boat Here

-
- -

-Moves own boats position to the position pointed at. This item is only visible in the right click-menu if the GPS isn't connected.
- -

- -
- - -
- -

-Creates an instant active route from own boat to the position clicked. The option does not appear when following an active route. More about routes: Marks and Routes
- -

- -
- -

Center View

-
- -

-Activates a small dialog where latitude and longitude can be entered. Pressing “OK” centers the display on this position, keeping the same scale. If a position has been copied, and is in your copy buffer, it will be displayed as default values. OpenCPN accepts a wide variety of position formats. The values entered is kept during a session, but goes when restarting OpenCPN.
- -

- -
- -

Course Up Mode

-
- -

-Is shown because we are in North Up Mode. Clicking this entry changes the display to “North Up Mode.” It is a toggle switch between “North Up” and “Course Up”. Read more about display orientation: Display Orientation
- -

- -
- -

Hide This Chart

-
- -

-Hides the chart from quilting
- -

- -
- -

Chart Groups

-
- -

-Selector list of all defined Chart Groups. Very useful.
- -

- -
- -

AIS Target List

-
- -

-Shows a list of discovered AIS targets, if any. Read more on AIS
- -

- -

-Looking at the right click menu for vector charts, to the right above,we can see these additional entries.
- -

- -
- -

Object Query

-
- -

-Every point on a vector-chart has certain attributes, or information. This can vary from just the depth in mid ocean to much more. Double clicking is an alternative to display the object query dialog. Here is an example from a lateral buoy in the entrance channel to a medium sized port.
- -

- -

-
- -

- -

-The scrollbar on the right side of the dialog, reveals that more info is available by scrolling down. Much more about this on the Vector Display
- -

- -
- -
CM93 Offset Dialog
-
- -

-Apply corrections to CM93 chart cells through this dialog. Read more on the CM93 Offsets
- -

- -

-page in the Advanced section of this manual.
- -

- -
- -

The basic quilted charts right-click menus, for raster charts and vector charts

-
- -

- -
- -The only new item in the quilted menus is -

- -
- -

Hide this chart

-
- -

-The chart becomes excluded from the quilt. To show the chart again, find it in the chart bar, now marked with a red “X”, right click and press “Show this Chart”. Read more here: Chart Quilting -

- -
- -

Left Mouse Click

-
- -

-Left Mouse click on chart moves to center of view
- -When Options> UI > Touchscreen interface is checked Left-mouse Click becomes a “Hand” which will grab and pan the screen.
- -

- -
- -

Scroll Wheel

-
- -

-Scroll Wheel, zooming in/out
- -Alt + scroll wheel, zooming in/out in small steps.
- -

- -
- - -
- - diff --git a/data/doc/getting_started.html b/data/doc/getting_started.html deleted file mode 100644 index 0a66b1f5e4..0000000000 --- a/data/doc/getting_started.html +++ /dev/null @@ -1,190 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started - - - - - - - - - - - - - - - - - - - - - -
- - - -

Getting Started

-
- -
- -

OpenCPN 4.8.2

-
- -

-Welcome! This is the Documentation for the OpenCPN 4.8.2 stable release. (There are still areas that are not fully updated.) It is very easy and intuitive to get started with OpenCPN. The different menus, including the clever context-sensitive right-click menu, make it likely that you will find what you need. The program contains a lot of options to fit users with special demands and hardware. -

- -

-Required reading YachtValhalla's PDF Tutorial for the new user starting up Exploring OpenCPN v3.0 (pdf download) -

- -
- -

HELP, FAQ & OpenCPN User Manual

-
- -

-The most frequently asked questions by new users, seen in the OpenCPN Forum, are, in most cases, already answered in the OpenCPN USER MANUAL. If you are going to use this program for actual navigation, you need to read through this document to fully understand the scope of the program, as well as all the details. -

- -

-If you have difficulties finding a particular subject, please use your browser's built-in search ability, often called just “Find”. This works best using the stable release which is all on one web page. -

- -

-In the Program “OpenCPN” Press and then the Help Tab to access the built-in version of this document. The installed documentation will open in your default browser. This is the first place to go for help, read the documentation please. To download a current snapshot of this wiki as one huge web page, here (only works if you are online). Note that the details of downloading a single file html formatted properly have not been worked out yet. -

- -

-Also the Opencpn v4.8.0 User Manual can be downloaded as compressed HTML files and directories: -

- - -

-You will need to uncompress them into a new folder and use your browser to access the help files. -

- -
- -

To help you get started:

-
-
    -
  • Links in italic are internal to this document. Placing your cursor over a link will cause the link to be underlined.
    -
  • -
  • External links may be Bold, Underlined, or in the “http:/\…” format and need an Internet connection.
    -
  • -
  • Marks and Waypoints may have somewhat different definitions; however, in this document they generally mean the same thing.
    -
  • -
- -

-help-about.jpg -

- -
- -

Copy Settings File & Log File to Clipboard

-
- -

-If you encounter difficulties in using OpenCPN you may be asked to submit your Settings File and/or your Log File. This data will help the developers to diagnose your problem. -

- -

-To locate these files, in the program “OpenCPN” Press and then the About Tab and two tabs will show as shown below: -

-
- - - -
Copy Settings File to Clipboard Copy Log File to Clipboard Donate
- -

-Use these tabs for an easy way to copy these files, and then paste the clipboard contents to a document and attach it to a Cruiser's Forum post. -

- -

-As you can see above, also documents the people contributing to OpenCPN and a copy of the license OpenCPN uses, GNU GENERAL PUBLIC LICENSE Version 2. We are always looking for volunteers. -

- -
- -

Agreement Before Using OpenCPN

-
- -

-Here is the note that all users have to approve when installing the program. -

-
OpenCPN 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.
-OpenCPN must only be used in conjunction with approved paper
- charts and traditional methods of navigation.
-DO NOT rely upon OpenCPN for safety of life or property.
- -

-This is not a text on general navigation. We assume that you are familiar with nautical navigation. Reading this text and using OpenCPN will not in itself make you a “navigator”. -

- -
- -

IMPORTANT NEXT STEPS

-
- -

-Getting started using OpenCPN consists of 4 basic steps: -

-
    -
  • OpenCPN Installation Will lead you through installing OpenCPN on your particular OS and computer.
    -
  • -
  • Chart Installation of Charts to be read by OpenCPN (OpenCPN does not include charts)
    -
  • -
  • Charts Basic Features - Main Source for using charts
    -
  • -
  • GPS Setup to communicate with your computer and OpenCPN (Optional, but very useful) Completing these 4 steps will get you started and allow you to check out the program.
    -
  • -
- - - -

-If you still have questions or would just like to get in touch with other OpenCPN users, there is a large community behind OpenCPN. You can find us in this Cruisers Forum. -

- -

-If you are an advanced users with programming experience we recommend the Developers Manual.  (view online) -

- -
- - -
- - diff --git a/data/doc/getting_started/chart_installation.html b/data/doc/getting_started/chart_installation.html deleted file mode 100644 index c806a3cf46..0000000000 --- a/data/doc/getting_started/chart_installation.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:chart_installation - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Installation

-
- -
- -

Several steps suggested to obtain & setup charts.

-
- -

-For first time users we suggest you use the Chart Downloader Tab which helps to find and download free charts and is included with the installation of OpenCPN 4.2. If you choose to manually load charts please pay close attention to the following: -

- -

-Know the path to the the “Chart” directory. Make note of the Charts Folder path you selected. -

- - -

-If you choose to manually download charts, be sure uncompress and install them in your Charts directory -

- -
- -

Charts Overview

-
- -

-OpenCPN itself does not come with charts.
- -Charts are a complex subject. Having accurate and current charts is important for safe navigation.
- -There are a number of resources on this website and others to obtain charts.
- -However the USA provides free NOAA Charts and many other countries do as well. See Chart Sources below. -

-
    -
  • Charts Main resource for Charts.
    -
  • -
  • Chart Files Tab OpenCPN does not come with charts. Description of how to Install Charts.
    -
  • -
  • Chart Downloader Tab Chart Downloader provides an easy way to download and install free NOAA and RNC and ENC charts around the world. It is the easiest way to get started with charts. Download a few charts in your area and use them to learn, then later add more as needed. NOTE: Free charts are not assured everywhere.
    -
  • -
  • Chart Formats See why this is a complex subject
    -
  • -
  • Chart Manual Install Download & install yourself
    -
  • -
  • -
  • -
  • Background Map (GSHHS Low Res) - Installed, used by Opencpn for the initial rough background map.
    -
  • -
- -
- - -
- - diff --git a/data/doc/getting_started/gps_setup.html b/data/doc/getting_started/gps_setup.html deleted file mode 100644 index e20823239d..0000000000 --- a/data/doc/getting_started/gps_setup.html +++ /dev/null @@ -1,620 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:gps_setup - - - - - - - - - - - - - - - - - - - - - -
- - - -

GPS Setup

-
- -

- -

- -

-Below we describe only the basics of getting a gps up and running.
- -

- -

- -

- -

-For a full description of all options read Options Setting
- -
- -Make sure your GPS is not being used by some other program!!!! -Only one program can at one time use the connection. when your GPS program is using the GPS, Opencpn will not be able to do the same. Please quit all other programs using the same connection. -

- -

-Make sure your GPS is set to output positions using the WGS 84 Geodetic Datum. This is less of an issue nowadays, compared to, say 10 - 15 years ago.
- -Some units can't be changed, and is permanently set to WGS 84. The BU-353 is one of those. -

- - -

-Refer to GPS Setup & Status -

- -
- -

Windows 10

-
- -

-Windows 10 users generally must purchase a new GPS Puck specifically configured for Windows 10. For Example, the BU-353 which works with earlier versions of Windows does not work without an elaborate work around involving preventing automatic update of Prolific USB drivers by the OS. It is far easier and more reliable to simply purchase another Windows 10 compatible GPS Puck (similar to the BU-353 S4) and use the associated drivers.
- -
- - -

- -
- -

Windows XP/Vista/7/8

-
- -

-Note that the extensive use of the cheap gps mouse BU-353 as an example below, should only be seen as an illustration. -
- -To use OpenCPN with a GPS, a GPS receiver is needed. -

- -

-There are a variety of possible choices for a GPS receiver: -

-
    -
  • A computer, such as a Sony Vaio P has a built in GPS receiver
    -
  • -
  • A NMEA Expander to amplify a nmea stream to multiple listeners
    -
  • -
  • A hand-held GPS receiver
    -
  • -
  • A dedicated GPS receiver
    -
  • -
- -

-The remainder of this section describes using OpenCPN with a dedicated GPS receiver, however, the instructions for a dedicated receiver will be similar for any serial/USB connected NMEA data stream. -

- -
- -

A Dedicated GPS Receiver

-
- -

-There are several companies making dedicated GPS receivers. The Supplementary Hardware section for GPS devices lists several manufacturers. -

- -

-NMEA has traditionally been implemented as a serial protocol and therefore, even if a USB connection is used, there needs to be a USB to Serial Port conversion. The specific driver for the each GPS receiver will handle this conversion. -

- -
- -

An Example - Configuring BU-353

-
- -

-It is not necessary to use the installation disk to setup the BU-353. Following the steps listed below will result in the latest driver being installed. -

-
    -
  1. Download the latest driver from Prolific - http://www.usglobalsat.com/s-24-support-drivers.aspx#A
    -
  2. -
  3. Unzip and install the driver
    -
  4. -
  5. Plug in the BU-353.
    -
  6. -
  7. Start → (Right Click) My Computer → Properties → Hardware →Device Manager
    -or Start→Run devmgmt.msc
    -
  8. -
  9. Expand Ports
    -
  10. -
  11. Look for the “Prolific USB-to-Serial Comm Port” and note the com port number (e.g., COM4)
    -
  12. -
- -

-devicemanager-1.jpg -

-
    -
  1. Right click on the “Prolific USB-to-Serial Comm Port”. Choose Driver
    -
  2. -
  3. Select 4800 bits per second, 8 data bits, None parity, 1 stop bit, and None for Flow Control
    -
  4. -
- -

-prolific.jpg -

-
    -
  1. Start OpenCPN
    -
  2. -
  3. Click on the Options Icon
    -
  4. -
  5. Select “Connections”, and “Add Connection” and “Serial”
    -
  6. -
  7. Under “Data Port” select the Com port noted in #6
    -
  8. -
  9. Choose OK
    -
  10. -
  11. Select Auto Follow to center the map over your GPS location
    -
  12. -
- -
- -

Troubleshooting

-
- -

-There is a small LED located on the BU-353. If the LED is off there is no power being received. Check the connection. -

- -

-If the LED is solid it indicates the BU-353 is searching for a GPS signal. Try moving the GPS receiver to a clear location. -

- -

-If the LED is flashing it indicates the BU-353 has a position fix and is transmitting data. -

-
    -
  1. Try viewing the NMEA data stream in OpenCPN. Choose Options→Connections→Show NMEA Debug Window
    -
  2. -
  3. Alternatively, a diagnostic program is included on the installation CD called GPSInfo.exe. Launch this program to install the diagnostic utility.
    -
  4. -
- -

-If it appears that the NMEA data stream is being received, the most likely issue is that OpenCPN is not centered over your location. Click AutoFollow to center the map at your GPS location. -

- -
- -

Known Issues

-
- -

-If you change the USB port for the GPS receiver Prolific will reassign the COM port number. This will require repeating steps 4-12 above. If you are having trouble with Prolific drivers and an Error Code, try reading this page http://www.ifamilysoftware.com/news37.html -

- -

-On some computer / GPS receiver combinations when the computer resumes from Stand By the GPS receiver will no longer transmit its NMEA data stream, and only garbage instead of ASCII characters will be visible in the NMEA Data Stream Window. The red indicator led will not work.
-
-To change back to NMEA mode search for and download SIRFDemo.exe.
-Unpack and start. Set correct Baud rate and and com port as above.
-Click connect to data source button. Action → Switch to NMEA protocol, then exit.
-There are many more settings available in SIRFDemo.exe -

- -

-An alternative workaround for this issue is provided by using a COM port splitter such as XPort http://www.curioustech.net/xport.html -

-
    -
  1. Download XPort.
    -
  2. -
  3. Unzip it to a folder of your choice
    -
  4. -
  5. Double Click XPort.exe
    -
  6. -
  7. Set the Baud Rate to 4800
    -
  8. -
  9. Under Enable Ports add an entry for COM10
    -
  10. -
  11. Click “Find GPS”. The port returned should match the port identified in Step #6 in the Configuring BU-353 Section
    -
  12. -
  13. Select Prolific USB-to-Serial Comm Port in the check box section
    -
  14. -
  15. Return to OpenCPN
    -
  16. -
  17. Click on the ToolBox Icon
    -
  18. -
  19. Select GPS
    -
  20. -
- -

-Under NMEA Data Source change the Com port to COM10 -

- -
- -

How to use OpenCPN on a tablet windows 8 with GNSS Sensor

-
- -

-http://www.cruisersforum.com/forums/showthread.php?p=1341714
- -A small application that enables windows 8 tablets (or notebooks with GNSS sensor) to use OpenCPN. Tested and GNSS sensor seems to be able to pick up the signal quite well. See the details here: https://bitbucket.org/petrsimon/geol...ntcp/wiki/Home
- - - -

- -
- -

Linux

-
- -

-To proceed, the “user” you use on your computer must belong to a group that is allowed to open serial connections. This group is normally “dialout” on Debian based Linuxes, including Ubuntu, and “uucp” on Red Hat based distributions. Read more in Connections for Linux.
-Check your status by writing “groups” on a command line. The response will be all groups that the user belongs to. Make sure that “dialout” or “uucp” is included. If not, you have to add your user to this group. There are many ways to do this, one is to issue this command:
-“sudo usermod -a -G dialout $USER”. Logout of your current session for group changes to take effect.
-This applies to many Debian based distributions, for other distros just drop the sudo and do the command as root, using “su”.
-All major Linux distribution includes a graphical user settings dialog, where adding a user to a group, could be fixed. -

- -
- -

Two methods are available, direct connection or through gpsd.

-
- -
- -
We start with gpsd.
-
-
    -
  • Install the gpsd and gpsd-clients packages
    -
  • -
-
-$ sudo apt-get install gpsd gpsd-clients
-
    -
  • Go to Options→ Connections→ Add Connection and select “Network” plus the GPSD radio button. Address should be “localhost” and DataPorts should be set to 2947.
    -
  • -
  • On Ubuntu 10.04 and later, that is really all you have to do. When you plug in your gps this will trigger gpsd to start.
    -
  • -
  • “xgps” is client that comes with the gpsd-clients package, and is useful for testing that the gps and gpsd is working properly. If xgps isn't working, it's a gps or gpsd problem, not an OpenCPN problem
    -
  • -
- -
- -
Direct connection.
-
-
    -
  • Make sure that gpsd isn't running then connect your gps and start OpenCPN. On Ubuntu 12.04 the easiest way to achieve this is to uninstall gpsd.
    -
  • -
  • In the Options→Connections → Add Connection, select “Serial”.Set “dataPort to the port where you plugged in your gps. If you plugged in BU 353 this will probably be /dev/ttyUSB0.
    -
  • -
  • Choose 4800 baud, unless you know that the gps is set to something else.
    -
  • -
  • The gps should now work…if not, check the NMEA data stream window. If only binary garbage is visible, the gps has to be reset to NMEA mode, see more about this above in windows section. An alternative is to use gpsd, that will work with the gps in Sirf mode.
    -
  • -
  • To do this in Linux for BU 353 as well as many other gps:es, make sure that gpsd is running and that the package “gpsd-clients” is installed. On Ubuntu 12.04 gpsd needs to be temporarily installed. Make sure to kill any instances of gpsd with the command:
    -
  • -
-
 "sudo killall gpsd"
-
    -
  • This command will put the GPS into NMEA mode.
    -
  • -
-
  * $gpsctl -n 
-
    -
  • If that doesn't work, try
    -
  • -
-
$ gpsctl -f -n /dev/ttyUSB0
-
    -
  • This will force a low-level access, bypassing gpsd. For more information: $man gpsctl
    -
  • -
  • More information is as always available through “man gpsctl” Close down OpenCPN before running gpsctl.
    -
    -None of this is normally noticed when using gpsd, as this program reads both NMEA and SIRF binary sentences.
    -
  • -
- -
- -

More Linux hints

-
-
    -
  • If you can't connect to a physical port, such as /dev/ttyUSBO, indicated by a line in the opencpn.log file. Check that you, as a user, belong to the group “dialout”. To see which groups you belong to, run the command “groups”. Not all Linux distributions add the user to this group by default. To add yourself to the dialout group
    -
  • -
-
"sudo usermod -a -G dialout $USER"
-
    -
  • Check if gpsd is working:
    -
  • -
-
$ ps aux | grep gpsd
-nobody 12338 0.3 0.1 4124 1448 ? S<s 18:31 0:00 gpsd -F /var/run/gpsd.sock
-you 12356 0.0 0.0 3036 800 pts/3 S+ 18:32 0:00 grep –color=tty -d skip gpsd
-
    -
  • This or similar responses indicate that gpsd is running. If you only have something like the second line,…it is not running.
    -
  • -
  • Run the command
    -
  • -
-
"$ls -lrtd /dev/*|tail -10"
-
    -
  • and see the 10 latest created device files. Run this just after plugin in your gps to see which device was created.
    -
  • -
  • Determine which device your GPS is on your linux system by checking the startup. Look for a line that says something about GPS and /dev/ttyUSB# in the command “dmesg”
    -
  • -
  • Or even better, after connecting a gps mouse, BU-353, we look for a dmesg by running this command.
    -
  • -
-
$ dmesg | grep tty
-and get this response back.
-[13616.095305] usb 2-3: pl2303 converter now attached to ttyUSB0
-
    -
  • Add a script to start gpsd, if this is not done by your distribution. I saved mine as startgps and set the executable attribute. Edit line 3 to match your device, ie /dev/ttyUSB0
    -
  • -
-
#!/bin/sh
- sudo killall gpsd
- sudo gpsd -n -D 2 /dev/ttyUSB0
-
    -
  • Run the script:
    -
  • -
-
$ ./startgps
- -

-If this is a new installation, click on the Toolbox icon and configure your GPS source, chart directories, and other settings. -

- -
- -

Other Distributions

-
- - -
- -

Udev Rules

-
-
    -
  • If you have problem with, for example gps, connecting to different ports each time you restart udev is your friend.
    -
  • -
  • udev supports persistent device naming, which does not depend on, for example, the order in which the devices are plugged into the system. The default udev setup provides persistent names for storage devices.
    -
  • -
  • There is a lot about udev on the Internet. For OpenCPN specifics, read the cruisersforum.
    -
  • -
- -
- -

Bluetooth GPS

-
- -

-More user experience of setting up bluetooth GPS are welcome, as the notes below just reflects a few users experience. Please use the Forum. -

- -
- -

Ubuntu 10.10 and older.

-
- -

-If you have a bluetooth GPS you will need to first configure it through the standard Ubuntu Bluetooth “set up new device ” proceedure. Once you have done that you will need to find what the address of the GPS is. To do that you run this command: -

-
"sudo hcitool scan" 
- -

-it will then start looking for the Bluetooth GPS and hopefully find your GPS. You should see something similar to: -

-
Scanning …
-00:1C:88:10:D3:4D    iBT-GPS 
- -

-In this case I have a IBT-GPS at address 00:1C:88:10:D3:4D (Your GPS address will be different) -

- -

-Next we have to bind the GPS address to a “virtual” device OpenCPN understands in this case rfcomm0. We do this with the following command: -

-
sudo rfcomm bind /dev/rfcomm0 00:1C:88:10:D3:4D 
- -

-Note put your GPS address in this line -You should not have to run these commands each time your linux is restarted as it will remember your GPS address. -

- -

-Now all you need to do is go into OpenCPN Toolbox and select GPS. -Now in the NMEA Data Source options select from the pulldown menu: -“/dev/rfcomm0”, or write it in the box, if not present as an alternative. -

- -

-That's it - you should now have a Bluetooth GPS Connected. -

- -

-Ubuntu 12.04 -

- -

--Pair GPS with bluetooth icon --break connection with bluetooth icon --get device id: sudo hcitool scan --get channel for gps: sdptool records 00:02:78:0A:4E:E9 (put your actual number here) --sudo gedit /etc/bluetooth/rfcomm.conf #edit rfcomm input file. Text should be: -

-
# RFCOMM configuration file.
-#
-# $Id: rfcomm.conf,v 1.1 2002/10/07 05:58:18 maxk Exp $
-# rfcomm0 {
-# Automatically bind the device at startup
-bind yes;
- -

-' -

-
# Bluetooth address of the device
-device xx:xx:xx:xx:xx:xx;
- -

-' -

-
# RFCOMM channel for the connection
-channel 1;#use channel number as provided by sdptool records XX:XX:XX:XX:XX:XX
- -

-' -

-
# Description of the connection
-comment "Your GPS Device Here";
-}
- -

-' -

-
sudo rfcomm release 0 (not strictly neccesary) 
- -

-. -

-
sudo rfcomm connect 0 
- -

-You only need to to this once, not required if you reboot at this point). -

-
…connected /dev/rfcomm0 to 00:00:00:00:00:00 (whatever)
-Press CTRL-C for hangup 
- -

-in a separate terminal, you can test the connection with -

-
rfcomm show /dev/rfcomm0
-…rfcomm0: 00:08:1B:14:18:B6 channel 1 connected [tty-attached] 
- -

-Your bluetooth GPS should now be working in open CPN. -Run -

-
sudo opencpn
- -

-To check that it works (/dev/rfcomm0 under GPS NMEA data source). If it works, try running opencpn without sudo, chances are that you cannot see the gps. if this is the case, use the following fix: -

-
sudo usermod -a -G dialout $USER ''
- -
- -

Fedora

-
- -

-Run -

-
hcitool scan
- -

-to get the ID of your bluetooth gps device. -Make a file “rfcomm.config” and put it in /etc/bluetooth. -

- -

-This file is already present in Ubuntu, but needs editing for persistent connection. -

-
# RFCOMM configuration file.
-#
-# $Id: rfcomm.conf,v 1.1 2002/10/07 05:58:18 maxk Exp $
-#
-rfcomm0 {
-# Automatically bind the device at startup
-bind yes;
-# Bluetooth address of the device
-device XX:XX:XX:XX:XX:XX;
-# RFCOMM channel for the connection
-channel 1;
-# Description of the connection
-comment "Your GPS Device Here";
-} 
- -

-Change XX:XX:XX…. to your device ID -Open Opencpn and write /dev/rfcomm0 as GPS NMEA device. Note that you can add it yourself by writing directly into the scroll down box. -Permissions for /dev/rfcomm0 are for group “dialout”. Make sure you belong to that group. -The command “groups” will show all the groups you belong to. -Make sure that “gpsd” isn't running, issuing “killall gpsd” as root. -

- -
- -

Mac OSX

-
- -

-Attaching a GPS device to a Mac is done via one of the USB ports. Whether using a device with its own USB lead or via a serial-USB adapter lead or an NMEA multiplexer with USB port, the appropriate OS X driver needs to be installed. Nearly all hardware uses one of just two chip makes: those from FTDI or Prolific. Both those companies make OS X drivers available on their web sites, but manufacturers of GPS devices usually package the driver with device. -

- -

-When the driver is installed and the device connected, start OpenCPN, select the Toolbox and click the GPS tab. Open the “NMEA Data Source” menu & select the the device from the list. It is not always obvious which is the correct one, but in general the device will have a name starting: ”/dev/cu.“ or ”/dev/tty.“. Some manufacturers make it obvious, like ”/dev/cu.MiniPlex-99000125“, but others may be more generic, like: ”/dev/cu.usbserial“. Set the “NMEA Baud Rate” to 4800 and click “OK”. If the correct selection has been made, you should see the GPS status icon change from red to green. -

- -
- -

Virtualized Environments

-
- -

-Use of Virtualized Environments such as Parallels, VM, VirtualBox, etc to run an alternative version of Opencpn on your Mac or PC are beyond the scope of this section. However experienced users are invited to report the specifics about using USB ports with Virtual Configurations. Please be specific about the setup and software and explain how virtual USB ports work in that environment. These commenta will eventually make their way into this section. -

- -

-It should be noted that each Virtual Software handles virtualization of USB and Sharing differently. This can affect the connection and reliability of the connection for GPS. -

- -

-OpenCPN is user powered, so we depend on User's sharing their experiences. Please assist us. -

- -
- - -
- - diff --git a/data/doc/getting_started/help_fix_bugs.html b/data/doc/getting_started/help_fix_bugs.html deleted file mode 100644 index 76cfac79e2..0000000000 --- a/data/doc/getting_started/help_fix_bugs.html +++ /dev/null @@ -1,236 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:help_fix_bugs - - - - - - - - - - - - - - - - - - - - - -
- - - -

Help Fix Bugs!

-
- -

-If you experience a crash in OpenCPN, the developers are very keen on knowing why. This is how you can help making OpenCPN, even better. -

- -
- -

Windows

-
- -

-In OpenCPN ver 4.0 the semi-automatic Crash reporting for Windows is disabled by default.
- -Crash Reports are saved in the OpenCPN config directory, i.e. where the log file is stored now. End users may occasionally be asked privately to send these reports to a designated recipient.
- -
- -The semi-automatic Crash reporting can be enabled by editing the opencpn.ini file.
- -

-
[Settings] …..
-EmailCrashReport=1
- -

-Here is what you will see if OpenCPN causes a crash with the crashreport enabled.
- -
- - -
- -Provide additional information, such as your email or forum name, so the developers can contact you for more info, if necessary.
- -
- -
- -
- -This is what the report will contain. Use the “Export” button if yoy don't have an Internet connection at the time of the crash. Mail the report later.
- -
- - -

-
- - - -
Also, for fun, you may test this option by the keystroke Alt-F12. This will induce a benign crash, and give you a chance to see what it will look like before the real thing happens.
-Please don't send this kind of report by pressing “Send report”. Just press “Close the program” when you are done. Restart OpenCPN!
-This feature is temporary and will not be available in the Beta Release following 3.3.814.
- -
- -

Linux

-
- -

-
- -In Linux there is an excellent tool, “ddd”, the Data Display Debugger, to help the developers pinpoint where an error, or bug, is located in the source code. “ddd” is a graphical front-end to the text based “gdb”, the GNU debugger.
- -
- -Install ddd through Synaptic, Ubuntu Software Center or similar for other Linux distributions.
- -From a command line, in a Debian based Linux, such as Ubuntu, issue this command:
- -$sudo apt-get install ddd -

-
    -
  • The “$” sign above, just marks that this is a command line for a normal user. Do not include it in the actual command. This is a Linux convention used everywhere.
    -
  • -
- -
- -

Start ddd

-
- -

-To start ddd, find a command-line and
-$ddd opencpn
-
-ddd starts and this is what you will see.
- -

- -

-
- -

- -

-Click “Run”. If you don't get this small dialog, go to Program → Run, or hit F2
-This will start OpenCPN. Just continue in OpenCPN and proceed to create a crash.
-Then go back to the ddd window.
-This is how it will look like after a crash.
- -

- -

- -

- -

-
-
-Notice “Program received signal SIGSEGV, Segmentation fault.”
-This is programmers way of saying a “crash”. Exactly what this means, does not matter for a normal user. Interested anyway? Read more, http://en.wikipedia.org/wiki/Segmentation_fault
- -To actually help the developers we need a back trace from the crash. This is the path that the program followed in the source code, leading to the crash.
- -

- -

- -

- -

-
-Go to Status → Backtrace.
-This is what comes up, from this particular crash.
-
-
-The crash happened at #0 and this very short back trace started at #9.
-Your job now is to take a screen-dump, similar to the picture above, and send it on.
-Try to get as much of the back trace as possible, by expanding the Back trace dialog.
-This is important, so the developers can see the trouble point in the source code.
-Look at #3 above, ending in “….chart1.cpp:2367”. “chart1.cpp” is a part of the OpenCPN source code, and something on line 2367 was involved, directly or indirectly in the crash.
-Lines ending in “……… .so.0” are external libraries used to run OpenCPN.
-
-On the odd occasion, when the back trace is very long, the developers may still complain that they need to see more. -

- -
- -

Using gdb

-
- -

-Gdb, the command line debugger, is the answer.
-Start like this
-$gdb opencpn
-Gdb starts and you get the gdb command prompt (gdb).
-Just type “r”, for run and hit Enter. Like this:
-(gdb) r
-
-OpenCPN will now start, once again, make it crash.
-The console will look similar to below.
- -

- -

- -

- -

-
-All the lines before the “Segmentation fault” line, are just “chatter” from PortAudio and Gdk, and are not directly related to OpenCPN.
-
-To get a back trace, simply
-(gdb)bt
-That is type “bt”, for back trace, and hit enter.
- -

- -

- -

- -

-
-
-You will now have access to the full back trace, with more details and reverse order to “ddd”.
-Copy the text, and send it on.
-Press “q” to exit gdb.
-
-Send it on to the Programmers
-Tell the programmers about your findings through an entry in the tracker https://opencpn.org/flyspray/ , or through posting on the forum http://www.cruisersforum.com/forums/f134 , if you have found a new bug. -

- -
- - -
- - diff --git a/data/doc/getting_started/marks_and_routes.html b/data/doc/getting_started/marks_and_routes.html deleted file mode 100644 index ebbfa20660..0000000000 --- a/data/doc/getting_started/marks_and_routes.html +++ /dev/null @@ -1,298 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:marks_and_routes - - - - - - - - - - - - - - - - - - - - - -
- - - -

Marks and Routes

- - -

Marks Routes

-
- -

-
-Route Triangle Shipwreck MOB Create Route -

- -

-First right-click on the chart and pick “Drop Mark” -

- -

- -

- -

-Then right click nearby and select “Undo Create Waypoint” -

- -

- -

- -

-Or right-click on the Mark and select “Delete” -

- -

- -

- -
- -

Marks

-
- -

-Are the basic points that are used for many things, such as creating routes, marking fishing spots, good anchorages or anything of interest. -

- -

-Once a mark is created a focused right-click dialog becomes available, when clicking on the mark. -

- -

- -

- -
- -
Create a mark
-
- -

-There are a few ways to directly create marks. -

-
    -
  • at boat's position “Ctrl + O”.
    -
  • -
  • at cursor position “Ctrl + M”.
    -
  • -
  • at cursor position “Right-click” & press “Drop Mark”.
    -
  • -
- -

-Marks are created at the start of each leg in a route, and one at the end of the route. More about routes a bit further down this page. -

- -

-Marks created these ways will have a triangular icon, except for routes that uses a diamond, but no name. -

- -

-The default icon, when creating a mark, is possible by changing the the value “DefaultWPIcon” in the opencpn.ini (config) file. Use the name of any available icon in the properties dialog. -

- -

-More Detail In the [Settings/Others] section set the option DefaultWPIcon to one of: -

- -

-empty, airplane, anchorage, anchor, boarding, boundary, bouy1, bouy2, campfire, camping, coral, fishhaven, fishing, fish, floating, food, fuel, greenlite, kelp, light, light1, litevessel, mooring, oilbouy, platform, redgreenlite, redlite, rock1, rock2, sand, scuba, shoal, snag, square, triangle, diamond, circle, wreck1, wreck2, xmblue, xmblue_, xmgreen, xmgreen_, xmred, xmred_, activepoint -

- -

-values representing the default set of built-in icons or to a filename of any of your UserIcons, without the the path and .xpm extension. If you have a file called MyICON.xpm in the user icons folder, the value will be simply MyICON -

- -
- -
Move a Mark
-
- -

-You can move the mark by left-click-dragging it around. To prevent accidental movement of marks go to Options>Display>Advanced and click the box “Lock Waypoints”. -

- -

- -

- -
- -
Delete a Mark
-
- -

-You can delete a mark by right-clicking its icon, and selecting “Delete”. -

- -
- -
Undo-Redo a Mark
-
- -

-There is an built in undo/redo buffer for creating, deleting or moving marks or waypoints. If you have just created, deleted or moved a mark the right-click dialog will have relevant entries. The undo/redo, for moving or creating marks, follows a straight time-line and is not tied to an individual mark. -

- -

- -

- -
- -
Right-click on a Mark
-
- -

-Above is a right-click menu just after moving a mark a few times and undoing the last move, and one mark was deleted, and then the deletion was undone. CTRL + Z and CTRL + Y works as hot-keys for undo/redo. -

- -
- -
Mark Properties
-
- -

-All marks have properties that can be seen by right-clicking and pressing “Properties”, or even simpler just double click the mark. -

- -

- -

- -

-Read all about the properties dialog in Extended MarksMarks can be manipulated through the Route & Mark Managers Waypoints tab as well. Deleting a mark that is part of a route, will also change the route. Marks that are a part of a “layer” cannot be changed at all. Marks can also be imported into OpenCPN in a number of ways. Hidden waypoints are not offered as “Use nearby WPT” while creating a route.
-
-Read all about this in the Route & Mark Manager
-A general locking of all marks is available. Goto Options → Display →Advanced -and tick the box. This feature is handy, to prevent accidentally moving a mark. Activate this feature when underway, deactivate it when planning.
-The Man OverBoard mark can be activated through the icon in the toolbar, or through hitting Ctrl + Space-bar. The mark looks like the button and is dropped on own boats present gps position. This mark cannot be moved or deleted with the cursor or keyboard (by mistake), but can still be deleted from the Route/Waypoint manager dialog. More about Man OverBoard here.
-
-All the details of the Mark/WP Properties dialog are dealt with in Extended Marks -

- -
- -

Use your own Icons

-
- -

-OpenCPN comes with a handful of different icons that can be assigned to a mark. Right click or use the Route Manager and activate the properties dialog. The Mark Icon window in the dialog shows the available icons.
-
-A user can install his or her own icons to use with marks and “own ship”.
-
-1. Create a directory called “UserIcons” in the same place that holds your opencpn.ini(config) file. Instructions to find the directory (folder) location here: OpenCPN Installation
-
-2. Add .jpg image files to this directory. The legacy .xpm format works as well. The icons can be any size. The name of the file (without the extension) becomes the name of the new waypoint icon. These new icons will appear on the Waypoint Properties dialog, and can be assigned to any waypoint. They can also be assigned in GPX Import files.
-
-3. The User Iconspage contains links to a few sets of user contributed icons.
-
-4.To replace the default own ship icon , just put a file “ownship.jpg” or “ownship.xpm”, containing the ownship picture you prefer, in the UserIcons directory, described above.
-More about “ownship” icons and setting “ownship” size in Options Setting - Own Ship. -

- -
- -

Read about Creating Routes in Create Route

-
- -

-Located in Toolbar Button Pages -

- - -
- - -
- - diff --git a/data/doc/getting_started/opencpn_first_use.html b/data/doc/getting_started/opencpn_first_use.html deleted file mode 100644 index eb40dea956..0000000000 --- a/data/doc/getting_started/opencpn_first_use.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_first_use - - - - - - - - - - - - - - - - - - - - - -
- - - -

OpenCPN First Use

-
- -

-Here is what happens once OpenCPN is installed and you start the program for the first time.
- -
- -First this message greets you. Please remember what you agree to when clicking OK.
- -
- -
- -
- -Next OpenCPN prompts you to install charts.
- -
- -
- -
- -And sends you to “Options” to do so. Click on the Charts tab, to install charts. Read all about installing charts in Chart Installation
- -If you're not quite ready to install yet just click “OK” in the Options dialog.
- -
- -
- -
- -The worldwide background Map will greet you.
- -From here explore the different features in OpenCPN by clicking around, or read on…
- -
- -=====
- -
- -

- -
- -

IMPORTANT NEXT STEPS

-
- -

-
- -Getting started using OpenCPN consists of 3 basic steps: -

-
    -
  1. Chart Installation of Charts to be read by OpenCPN (OpenCPN does not include charts)
    -
  2. -
  3. Charts Basic Features - Main Source for using charts
    -
  4. -
  5. GPS Setup to communicate with your computer and OpenCPN (Optional, but very useful)
    -
  6. -
- -

-Completing these 3 steps will get you started and allow you to check out the program.
- -
- -If you still have questions or would just like to get in touch with other OpenCPN users, there is also a fairly large community behind OpenCPN. You can find us in this Cruisers Forum. -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation.html b/data/doc/getting_started/opencpn_installation.html deleted file mode 100644 index 2250f28d65..0000000000 --- a/data/doc/getting_started/opencpn_installation.html +++ /dev/null @@ -1,162 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation - - - - - - - - - - - - - - - - - - - - - -
- - - -

OpenCPN Installation

-
- -
- -

OS Installation pages

- - -

Software

-
- -

-Download your version of OpenCPN here -

-
    -
  • Use a “stable”, official release for actual navigation. The latest stable release is always available at the top of the download page or from Source Forge.
    -
  • -
  • Beta releases are snapshots of the development process, and may contain errors or temporarily be unstable. Show stoppers are normally fixed very quickly however. This is where the latest features first are seen. Most of the time the beta releases are quite stable and the OpenCPN team appreciate it if more experienced users test the releases and report back.
    -
  • -
  • The place to report bugs and suggest features is the Tracker. To reach from the OpenCPN.org pages click on the “Tracker” on the top menu. The sticky thread “Tracker/Flyspray - How and When to use it” (tab Forum) gives some hints.
    -
  • -
  • To see what version you are using either look in (Help) ? ? About or at the top of your display. A lot of information is also available in the Log file. See below.
    -
  • -
- -

- -

- -

-(#log-config) -

- -
- -

Location of Important Files. Log and config files.

-
-
    -
  • It is important to know the location of the log file and the configuration file, opencpn.conf (Linux) or opencpn.ini (Windows), on your computer. If you ask questions on the forum, there is a fair chance that you will be asked about the content in these files. Once you get familiar with OpenCPN, have a look at the files!
    -
  • -
  • Through out this documentation there will be many references to the configuration file, as it often is possible to change the default settings. This is an advanced subject once you are familiar with OpenCPN. All editing in the config files must be done with a text-editor, such as “notepad” in Windows, or notepad++.
    -
  • -
  • The configuration file is where all data, that needs to be persistent between sessions, are stored. The logfile keeps tab of what's going on in the current session.
    -
  • -
  • To find the locations of the files go to the ToolBar click on “About OpenCPN”, the button looks like a blue book with a “?” on the cover. Look at the bottom of the “About” Tab, highlighted below. The illustration below is from a Win XP. A quick way to view the logfile is to copy the full file path and then paste this into the address field in a web browser.
    -
  • -
  • For quick copying of the opencpn.ini and Log files use the two “Copy” buttons. This is useful for publishing on the forum if asked to do so. Please use the Forum “Code” button before pasting, as this guarantees an exact copy.
    -
  • -
  • On Linux the “opencpn.log” is in your home directory.
    -The “opencpn.conf” is in a hidden directory, called “opencpn”, also in your home directory.
    -For a quick way to view the files you can try these commands.
    -
     $gedit `echo $HOME/opencpn.log` 
    -
    $gedit `echo $HOME/.opencpn/opencpn.conf` 
    - -

    - Of course you can swap “gedit” for your favorite editor. -

    -
    -
  • -
  • On Windows 8, Windows 7, Windows 2000, XP and Vista the two files are more difficult to find, so use the “About” dialog as described above. On many windows installs the folder containing the logfile will also be hidden, so you need to change your systems “Folder Options” to show it.
    -
  • -
- -

-For example, the C:\ProgramData folder is by default hidden in Windows 7. Here's how to get to it. To access it you need to un-hide it by doing the following: -

-
    -
  1. Go to Control Panel > Folder Options
    -
  2. -
  3. Switch to View tab
    -
  4. -
  5. Select “Show hidden files, folders and drives”.
    -
  6. -
  7. Unselect “Hide extensions for know file types” to get this state:
    -
  8. -
- -

- -

- -

-Now you will be able to find your logfile. -

- -

-On Mac OS X , the logfile, “opencpn.log” , is in / Users/ “user name” /Library/Logs/ and the “opencpn.ini ” is in the / Users/ “user name” /Library/Preferences/opencpn/ directory. -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/android.html b/data/doc/getting_started/opencpn_installation/android.html deleted file mode 100644 index c256e663b6..0000000000 --- a/data/doc/getting_started/opencpn_installation/android.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:android - - - - - - - - - - - - - - - - - - - - - -
- - - -

Android

-
- -

-Any special instructions for cell phone? -

- -

-I think last time I installed, I just got it from the Google Play repository. Installed easily on a Tab 2, my Note 3's, and a Note 4. So I would just open up the Google Play store on your Android, and search OpenCPN. Click, and let it happen. -

- -

-Adjusting the settings is where you have to actually do some work yourself. You will have to point it to your chart collection on your phone. Try downloading a few NOAA charts to a directory on your phone. If you are like many Android users, this is the hardest part. -

- -

-A lot of users who have not dug deeply into Android do not realize that an Android phone is actually a computer that just happens to also be able to make phone calls. The thing is, much of the file system is sort of hidden and not readily and obviously accessible. The first thing you have to do is install a good file manager that makes it easy to at least access the storage on your device in a practical manner. I use Root Explorer. There may be better ones, I guess, but this is just the one I have always used. You do not need root to install or use this one, AFAIK but the Google Play store will tell you if it will install on your device. -

- -

-When you download the charts you want for initial testing of OCPN, you need to first figure out where they are stored. Probably /storage/sdcard0/Download or something like that. You should create a directory for your charts with a descriptive name like /storage/sdcard0/CHARTS/ or something like that. Typically the internal storage of your phone will be sdcard0 which is not removable, and the user installed microSD card will be /storage/sdcard1/ and the Android file system has other path names that will get you to the same places. You may want charts on your removable microSD card due to limited storage on your phone, or you may want them on your internal storage for slightly faster run time. -

- -

-Once you have charts on your phone and you know where they are, you can open up OCPN and in the Settings/Charts/Chart Files menu select “Add Directory” and a file browser will open. Navigate to your charts and hit “OK”. Then you will be back in the Chart Files menu. Click “OK” again and OCPN will build the chart database and then your charts will be loaded and ready to use. There are other settings to fiddle with but I don't want to write a book here and the app has a manual accessed by the question mark button. The crescent wrench is the settings button. Sometimes they disappear for some reason on my Note 3, not sure why, but they are always there when I start the app. -

- -

-Oh, and in your phone's settings menu, under “Location”, you may want to enable “Device Only” so that the actual GPS chip in your phone is providing location information to your phone, and not your cell phone network. -

- -

-— -

- -

-I'm not sure I get this. I have no “device only” option. When I go to location services it shows a bunch of my apps like contacts Cruiser forum, Phone, Etc and then Google location history and Sharing. -

- -

-Go back to “Location” in the Settings menu. Above the list of “Recent location requests”, you will see a “Mode” setting. Underneath it will probably say “High accuracy” which works nicely sometimes, like when you are near 3 or 4 cell towers with a good bearing split. But if you click on “Mode”, you can change it to “Battery saving” or to “Device only”. Pick “Device only” for marine use. -

- -

-It actually could be different depending on the Android version and phone type. On mine it's under Privacy and safety then election Location and it gives 3 choices: --Wi-Fi, Mobile data and GPS -- Wi-Fi and Mobile Data -- GPS -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/dedicated_marine_os.html b/data/doc/getting_started/opencpn_installation/dedicated_marine_os.html deleted file mode 100644 index 575f412b61..0000000000 --- a/data/doc/getting_started/opencpn_installation/dedicated_marine_os.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:dedicated_marine_os - - - - - - - - - - - - - - - - - - - - - -
- - - -

Dedicated Marine OS

-
- -

- -

- -
- -

XINUTOP

-
- -

-Another way to run OpenCPN or test it without installation on your current system is to use a specialized marine OS, which also include essential marine applications. Xinutop is a free an opensource Linux-Debian based solution and can operate on a large variety of x86 processors compliants. Xinutop can run as a live system on USB key. Perform a key is fast and simple, just download and grab the image. It can also be installed on a HDD/SSD, as primary, secondary or rescue OS.
- -
- -More under Supplementary Software Xinutop Marine OS
- -Infos and download at http://marinux.tuxfamily.org
- -See also in Supplementary Software -

- -
- -

OpenPlotter

-
- -
- -

The open-source sailing platform for ARM computers

-
- -

-There are people who buy boats but there are also people who build them, why not build your own electronics too? OpenPlotter is a combination of software and hardware to be used as navigational aid on small and medium boats. It is also a complete home automation system onboard. It works on ARM computers like the Raspberry Pi and is open-source, low-cost and low-consumption. Its design is modular, so you just have to implement what your boat needs. Do it yourself. -

- -

-You will need the basic parts and some optional parts. It will depend on what kind of data you want to collect, process or display and what kind of equipment your boat already has. -

- -

-http://www.sailoog.com/openplotter
- -Openplotter Cruisers Forum -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/fedora.html b/data/doc/getting_started/opencpn_installation/fedora.html deleted file mode 100644 index 728fde2580..0000000000 --- a/data/doc/getting_started/opencpn_installation/fedora.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:fedora - - - - - - - - - - - - - - - - - - - - - -
- - - -

Fedora

-
- -

-Using Linux repositories, an easier way to install and update. -

- -

-Installing in a different, easy way. RPM -

- -

-Installing on Fedora A full repo is now available and can be used to install and update opencpn.
- -To install the repo, please run this as root: -

-
dnf install [[http://je.onfray.fr/repo/fedora/23/x86_64/jeo-release-1.2-1.fc23.noarch.rpm|http://je.onfray.fr/repo/fedora/23/x86_64/jeo-release-1.2-1.fc23.noarch.rpm]]
- -

-[SethDart Reports 3/6/17]
- -I maintain my Fedora packages. Stable repo has 4.4, beta has 4.5.221. They are built for all current Fedora releases : that is #24 and #25 now, both for i386 (32 bits) & x86_64 (64 bits). I'm also building EPEL (RHEL/CentOS) packages for EPEL 6 & 7, x86_64 only. I can add more if requested. -

- -

-There's nothing magic in these packages : I regularly update my .spec file (cmake automatically generated one breaks dependencies with subpackages and libraries) The .srpm is then built in a separate chroot for each flavour using regular Fedora mock tool. I'll upload all these recipes to my github repo when I've enough time. -

- -

-When I tried to help building OpenCPN for OpenSUSE, I created a VM, it must be laying somewhere around. I can give it another try. -

- -

-Keep up the good work. Jean-Eudes -

- -
- -

Install above RPM

-
- -

-You can install the above rpm, no matter if you're using i386 or x86_64, be it Fedora 22 or Fedora 23, it'll work on all these (you should be able to install it right from your browser clicking the above link and then install)
- -By default, only the stable repo is enabled ; you can install opencpn-4.2 from your favorite package manager (dnf, Gnome package kit or KDE package kit). -

- -

-I've created two separate packages: -

- -

-opencpn with the program and the two default plugins
- -and
- -opencpn-doc with the whole html doc to browse it offline. -

- -

-When a new stable is released, you'll be automatically notified and able to update… so easy!
- -
- -Security/Trust: all packages are signed with Key ID: 7e53dbe19add462d -

- -
- -

OpenCPN for OpenSUSE and Fedora

-
- -

-From Dominig,
- -I keep a precompiled version of OpenCPN for OpenSUSE and Fedora ready to install in the OpenSUSE build system (OBS). As both distro are rpm based, it's very easy for me to suport both.
- -
- -Getting the correct wx release built and installed is a pain as notonly you need to get the right version built, but you also need to compile it with the right option set (no stl) and then make sure that the system does load what you want. Getting the right wx installed may require to change some priority or even wx repo manually on the target PC.
- -
- -My OpenSUSE wiki page is here.
- -

- - -

-Alternative: -

- - -

-I hope that it can help. Regards Dominig -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/linux.html b/data/doc/getting_started/opencpn_installation/linux.html deleted file mode 100644 index 713b908988..0000000000 --- a/data/doc/getting_started/opencpn_installation/linux.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:linux - - - - - - - - - - - - - - - - - - - - - -
- - - -

Linux

-
- -
- -

32/64 bit Ubuntu/Debian Distributions

-
- -
- -

32/64 bit Fedora / Cent OS

-
- -

-
- -If you are installing OpenCPN for the first time on a computer with Ubuntu, or any other Linux flavor, you have to go through a few steps to make sure that all dependencies are met. Ubuntu uses “deb” packages and Fedora uses the “rpm” packages. -

-
    -
  • For Debian based Linuxes: Make sure that you belong to the “dialout” group. To find out, run the “$groups” command. If you're not in “dialout”, add yourself with the command “$sudo usermod -a -G dialout $USER”. Check this straight away, it will save you from frustration later on. If there is a problem connecting the GPS to a physical port, such as /dev/ttyS0, the reason is probably that you don't belong to “dialout”.
    -
  • -
  • For other Linux distributions, replace “dialout” above, with the result of this command: $stat -c %G /dev/ttyS0
    -
  • -
  • It is recommended that you install the “xcalib” program, that is necessary to dim the screen for night time usage. Use your favourite package manager or just issue $sudo apt-get install xcalib from the command line (for debian based distros).
    -
  • -
  • It is recommended that you install the “xdg-utils” program, that helps the grib plugin compose a SailDoc grib-request-mail. Use your favourite package manager or just issue $sudo apt-get install xdg-utils from the command line (for debian based distros).
    -
  • -
  • On Ubuntu, start “System→Administration→Synaptic”. In Synaptic go to “Settings→Repositories” and tick the box “Community-maintained Open Source software (universe)”. Close Synaptic.
    -
  • -
  • Download the correct .deb or .rpm from Download OpenCPN.
    -
  • -
  • For Ubuntu, only use the download with an Ubuntu version number if you have exactly that version. Otherwise use the link “Download OpenCPN 3.X.X for all other *Ubuntu's”.
    -
  • -
  • Use the stable release for navigation en route, or if you just started using OpenCPN.
    -
  • -
  • Click on the downloaded package. An installation manager will guide you on most Linux distributions. All dependencies should automatically be installed. For most Linux installations, this is all you have to do. Consult the following 3 paragraphs if you run into trouble.
    -
  • -
  • If you have problems with dependencies, run the recommended command line in the next paragraph. First check that you really have downloaded the correct version of OpenCPN. se above.
    -
  • -
  • sudo gdebi
    -
  • -
- -

- <downloaded_opencpn_file.deb>. The command “gdebi” will automatically install the dependencies for you. -

-
    -
  • It is also possible to install the package via dpkg or rpm, on the condition that all dependencies are met. To make sure that this is the case on Ubuntu, open a terminal window to get a command line, (Applications→Accessories→Terminal) and copy and paste the following line:
    -
  • -
-
sudo apt-get install libwxgtk2.8-0 libwxbase2.8-0 wx-common libglu1-mesa libgl1-mesa-glx zlib1g bzip2 gpsd gpsd-clients xcalib xdg-utils libportaudio2 libkml0 libtinyxml2.6.2 liburiparser1 zlib1g libexpat1
- -

-Then proceed with the commands below. -

-
    -
  • For Ubuntu: $ sudo dpkg -i <downloaded_file.deb
    -For Fedora: # sudo yum install –nogpgcheck <downloaded_file.rpm>
    -
  • -
-
    -
  • The binary will be installed to /usr/bin/opencpn and the static data used by the program will be in /usr/share/opencpn
    -
  • -
  • If this is a new installation, click on the Options icon and configure your GPS source, chart directories, and other settings.
    -
  • -
  • If there is a problem with sound, make sure that you, as a user, belongs to the “audio” group. To find out, run the “$groups” command. If you're not in “audio”, add yourself with “$sudo usermod -a -G audio $USER”
    -
  • -
  • If you are running Debian Squeeze and want to install OpenCPN from the distributions .deb package, you will need to install with something like this in order to satisfy install dependencies related to libtinyxml:
    -$sudo dpkg -i –force-depends opencpn_3.1.1327-1_i386.deb
    -
  • -
- -
- -

Using Linux repositories, an easier way to install and update.

-
- -

-Installing in a different, easy way. -

- -
- -

Installing on Ubuntu

-
- -

-Add the OpenCPN ppa repository as explained in configuring Ubuntu PPA
- -- If you are using Synaptic, add the repository, reload the software sources as it suggests, search for and install opencpn
- -- No need to install anything manually -

- -
- -

Other 32, 64bits, the armhf architecture, Linux Distributions and the BSD operating systems

-
-
    -
  • Currently other distributions requires compiling the source. This will involve resolving various dependencies and is for folks comfortable with developing on Linux.
    -
  • -
  • Interested in maintaining a package for your favorite Linux distribution? Follow the SourceForge link above.
    -
  • -
  • This also includes the different BSD distributions. Report your experiences back to the forum.
    -
  • -
- -
- -

openSUSE notes

-
- -

-Starting with openSUSE 11.4 and onwards, wxWidgets framework is shipped in several mutually exclusive flavors — “STL”, “noSTL” (“wxContainer”), “ANSI”, — of which OpenCPN is only compatible with “noSTL” (“wxContainer”) flavor. -

-
    -
  • Older versions of OpenCPN support wxWidgets 2.8, which does not have a “default” flavor in openSUSE, and of which any flavor may be installed alongside with each other, but OpenCPN stricly requires “wxContainer”.
    -
  • -
  • Modern versions of OpenCPN, starting with beta branch 4.5, use functionality that is only available in wxWidgets 2.9, but since that branch is not packaged by openSUSE maintainers, then wxWidgets 3.0 becomes a must. That one defaults to “STL” flavor, which is not appropriate for OpenCPN and will result in multitude of mysterious compilation errors if used, — OpenCPN requires “noSTL”.
    -
  • -
- -

-To install the required wxWidgets 3.0, use the following command: -

-
sudo zypper install wxWidgets-3_0-nostl-devel
- -

-For legacy OpenCPN builds against the older wxWidgets 2.8, some virtual wx libraries (with no real content) must also be installed in addition to real-deal wx libraries themselves: -

-
sudo zypper install wxWidgets-wxcontainer-compat-lib-config libwx_baseu-2_8-0-compat-lib-wxcontainer libwx_baseu_net-2_8-0-compat-lib-wxcontainer libwx_baseu_xml-2_8-0-compat-lib-wxcontainer libwx_gtk2u_adv-2_8-0-compat-lib-wxcontainer libwx_gtk2u_aui-2_8-0-compat-lib-wxcontainer libwx_gtk2u_core-2_8-0-compat-lib-wxcontainer libwx_gtk2u_gl-2_8-0-compat-lib-wxcontainer libwx_gtk2u_html-2_8-0-compat-lib-wxcontainer
- -

-The above commands will also automatically trigger installation of underlying real-deal libraries and other dependencies if they were not present before. -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/mac_os_x.html b/data/doc/getting_started/opencpn_installation/mac_os_x.html deleted file mode 100644 index 2e83020a1d..0000000000 --- a/data/doc/getting_started/opencpn_installation/mac_os_x.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:mac_os_x - - - - - - - - - - - - - - - - - - - - - -
- - - -

Mac OS X

-
- -

-Note: You must install OpenCPN into your Applications folder where it belongs. The installers of the plugins of course expect it to be there. -

- -
- -

OpenCPN is distributed as a Mac ".dmg" file

-
-
    -
  1. Download the .dmg file.
    -
  2. -
  3. Open the dmg file by double-clicking on it - this will mount the dmg as a virtual device and create a mount on your desktop.
    -
  4. -
  5. Drag the OpenCPN.app icon to the Applications icon in the installer window. This may require the administrator password.
    -
  6. -
  7. Unmount the dmg by right-clicking on the desktop icon and selecting “Eject”
    -
  8. -
-
    -
  • You can have a look at this tutorial How to Install and Remove Apps for general instructions on installing Mac OS X applications.
    -
  • -
  • If you have a message that installations are only accepted for programs from qualified developers, navigate to Applications in Finder, Control-click OpenCPN.app, select Open from the context menu and confirm that you want to start it in the displayed dialog.
    -
  • -
  • To save a previously installed version rename the app in the Applications directory before installing the new version.
    -
  • -
  • If OpenCPN.app is replaced, the installed plugins will not be there anymore and have to be re-installed on the new OpenCPN.app. The userdata of the plugins will still be there.
    -
  • -
- -
- -

Plugin Installation

-
-
    -
  1. Download the installation package (*.pkg)
    -
  2. -
  3. Make sure that the OpenCPN application is not renamed. The plugin will only install on OpenCPN.app
    -
  4. -
  5. Double-click the downloaded file to start the installation. In case your security settings are tight, which is the default on modern macOS versions, Control-Click on the file, select Open from the context menu and confirm your intention to open the installer.
    -
  6. -
  7. Follow the instructions provided by the installer
    -
  8. -
  9. In case your security settings are tight and the OS refuses to start the installer, control-click it, select Open from the context menu and confirm your intention to install the plugin in the subsequent dialog.
    -
  10. -
- -

-Use of your iPad with RealVNC and OpenCPN -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/orange_pi.html b/data/doc/getting_started/opencpn_installation/orange_pi.html deleted file mode 100644 index 7d991b051d..0000000000 --- a/data/doc/getting_started/opencpn_installation/orange_pi.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:orange_pi - - - - - - - - - - - - - - - - - - - - - -
- - - -

Orange Pi

-
- -
- -

What’s Orange Pi PC ?

-
- -

-It’s an open-source single-board computer. It can run Android 4.4, Ubuntu, Debian, as well as the banana pi Image. It uses the AllWinner H3 SoC, and has 1GB DDR3 SDRAM. It also has a Mali-400 gGPU that can run acellerated OpenGLES.
- -
- -One of the Linux distrobutions available is armbian, a linux for ARM development boards.
- -These instructions are for the armbian Debian Jessie release (5.05). And OpenCPN 4.2.0 in Apr 2016.
- -Updated to include armbian Debian Jessie release (5.14). And OpenCPN 4.4.0 in Jun 2016.
- -
- -To install from a debian package please see:
- -https://github.com/svkatielee/OpenCPN-repo
- -
- -To compile your own version please see the developer manual:
- -Developer Manual -

- -

- - -KB7KMO Projects: OpenCPN on Orange Pi an Allwinner H3 Arm SBC -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/raspberrypi_rpi2.html b/data/doc/getting_started/opencpn_installation/raspberrypi_rpi2.html deleted file mode 100644 index 93d7d8e531..0000000000 --- a/data/doc/getting_started/opencpn_installation/raspberrypi_rpi2.html +++ /dev/null @@ -1,161 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:raspberrypi_rpi2 - - - - - - - - - - - - - - - - - - - - - -
- - - -

Raspberry Pi 2/3

-
- -
- -

Installing Raspbian

-
- -

-OpenCPN works on Raspberry Pi 2 and 3 (recommended) models. You can install OpenCPN adding an Ubuntu PPA (Personal Packages Archives) to your system's Software Sources. We will see how to do this but first of all you need to have a running system. -

- -

-Raspbian is the official Operating System for Raspberry Pi. You have two options to install Raspbian on an SD card: with NOOBS (New Out Of Box Software) or installing an SD image directly. We recommend NOOBS. -

- -

-Follow this easy guide for both options: https://www.raspberrypi.org/learning/software-guide/quickstart/ -

- - -
- -

Adding OpenCPN Ubuntu PPA to Raspbian Software Sources

-
- -

-Once you have Raspbian running on Raspberry Pi, go to Menu → Accessories → Terminal, and type: -

-
sudo nano /etc/apt/sources.list
- -

-A text editor will open. Move the cursor to the end and add this line: -

-
deb http://ppa.launchpad.net/opencpn/opencpn/ubuntu/ xenial main
- -

-Or, if your Raspbian is older than Scratch: -

-
deb http://ppa.launchpad.net/opencpn/opencpn/ubuntu/ trusty main
- -

-Save the file pressing Ctrl+X, say Yes and press enter. Now type: -

-
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C865EB40
- -

-and press enter. Now be sure you have Internet connection and type: -

-
sudo apt-get update
- -

-The Software sources will be updated and finally you will have to type: -

-
sudo apt-get install opencpn
- -

-and you are done! -

- -

-To install OpenCPN and all the available plugins for Linux, type: -

-
sudo apt-get install opencpn*
- -

-If you get an error doing this, you will have to install the plugins one by one typing: -

-
sudo apt-get install opencpn-plugin-watchdog
-sudo apt-get install opencpn-plugin-statusbar
-…
- -

-If a new version of OpenCPN is released, just type: -

-
sudo apt-get update
-sudo apt-get install opencpn
- -
- -

Advanced

-
- -
- -

Installing OpenCPN betas

-
- -

-Coming soon -

- -
- -

OpenGL acceleration

-
- -

-Coming soon -

- -
- -

Compiling OpenCPN on Raspberry Pi

- - - -
- - diff --git a/data/doc/getting_started/opencpn_installation/release_history.html b/data/doc/getting_started/opencpn_installation/release_history.html deleted file mode 100644 index 6b7285dbe5..0000000000 --- a/data/doc/getting_started/opencpn_installation/release_history.html +++ /dev/null @@ -1,512 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:release_history - - - - - - - - - - - - - - - - - - - - - -
- - - -

Release History

-
- -

-1.2.0 2007-04-20 -

-
    -
  1. Opencpn was built with the following objectives in mind.
    -
  2. -
  3. Intended use as primary navigation interface for vessels with full-time helm-visible navigational suites.
    -
  4. -
  5. Other tools may be better for offline route planning, tide and current prediction, online logging, etc.
    -
  6. -
  7. Quick startup and shutdown.
    -
  8. -
  9. Those and only those toolbar buttons really needed for daily operation.
    -
  10. -
  11. Portability, thus wxWidgets core components. Currently tested and in production use on W98, XP, and Linux.
    -
  12. -
  13. Conventional ( i.e. popular and modern ) chart format support. In the real world, this means BSB format raster
    -
  14. -
  15. charts, and S57ENC format vector charts.
    -
  16. -
- -

-1.2.2 2008-01-02 -

-
    -
  1. Improved AIS symbology and diagnostics, including RateOfTurn indication.
    -
  2. -
  3. Improved toolbar icon symbology, supporting day/dusk/dark color schemes.
    -
  4. -
  5. Rationalized home directory selection for Windows, allowing program installation in arbitrary directory/folder.
    -
  6. -
  7. Improved accuaracy of Great Circle distance/bearing calculations.
    -
  8. -
  9. Optional Depth Units displayable on chart as embossed character image.
    -
  10. -
  11. Ownship position indicator on thumbnail charts accurately follow true GPS position.
    -
  12. -
- -

-1.2.4 2008-04-20 -

-
    -
  1. Configure/build modifications for Unicode systems, especially Ubuntu.
    -
  2. -
  3. Added Route and Mark property sheets.
    -
  4. -
  5. Improved S57 ENC symbology.
    -
  6. -
- -

-1.2.6 2008-08-31 -This is a maintenance and feature update release, -

-
    -
  1. containing some S57 ENC symbology improvements,
    -
  2. -
  3. greater compliance with IHO S52 standards,
    -
  4. -
  5. and various enhancements and bug fixes.
    -
  6. -
  7. Especially interesting are the DUSK and NIGHT display modes, for which user feedback is highly desired…
    -
  8. -
- -

-1.2.8 2008-12-25 -Mac OS X Support, including installable application bundle (OpenCPN.dmg), -

-
    -
  1. GNU/gcc compatible system build files, and XCode project files.
    -
  2. -
  3. Garmin USB GPS device support for Windows platforms.
    -
  4. -
  5. Miscellaneous bug fixes and user optimizations.
    -
  6. -
- -

-1.3.0 2009-05-09 -

-
    -
  1. CM93 worldwide vector chart support, with automatic chart scaling.
    -
  2. -
  3. Improved AIS target tracking with configurable CPA/collision warning options.
    -
  4. -
  5. GPX compatible waypoint and route exporting tools.
    -
  6. -
  7. Configurable range rings centered on ownship position.
    -
  8. -
  9. And, as usual, miscellaneous bug fixes and user optimizations.
    -
  10. -
- -

-1.3.2 2009-07-11 -

-
    -
  1. Improved AIS target depiction and collision detection alerts.
    -
  2. -
  3. Hot keys and scroll mouse support.
    -
  4. -
  5. Help File.
    -
  6. -
  7. Various display speed and quality optimizations, especially for CM93 charts.
    -
  8. -
- -

-1.3.4 2009-10-01 -

-
    -
  1. Ship's position tracking function, with GPX export and import.
    -
  2. -
  3. Enhanced icons and screen graphics, for improved visibility.
    -
  4. -
  5. Import and export of Routes using GPX interface protocol.
    -
  6. -
  7. Implement CM93 vector chart detail control slider.
    -
  8. -
  9. Assorted usability and reliability improvements.
    -
  10. -
- -

-1.3.6 2010-01-07 -

-
    -
  1. Add basic GRIB file decoding and chart overlay display.
    -
  2. -
  3. Improve and expand NMEA message type support.
    -
  4. -
  5. Improved documentation.
    -
  6. -
  7. Add modular international language support.
    -
  8. -
  9. Assorted usability and reliability improvements.
    -
  10. -
- -

-2.1.0 2010-06-26 -

-
    -
  1. BSBv3 raster and S57 ENC chart support.
    -
  2. -
  3. CM93 vector chart support.
    -
  4. -
  5. IHO S52 compliant display of S57 vector charts.
    -
  6. -
  7. Single-chart and Quilted display modes.
    -
  8. -
  9. North-up and Course-up display modes.
    -
  10. -
  11. Moving-map display mode.
    -
  12. -
  13. Route navigation with ship tracking functions.
    -
  14. -
  15. Waypoint navigation.
    -
  16. -
  17. NMEA 0183 GPS interface at selectable baud rate.
    -
  18. -
  19. gpsd library support.
    -
  20. -
  21. Autopilot output support.
    -
  22. -
  23. AIS input with full target tracking and collision alerting.
    -
  24. -
  25. Anchor watch/alarm functions.
    -
  26. -
  27. GRIB file input and display for weather forecasting.
    -
  28. -
  29. GPX Waypoint and Route input and output file support.
    -
  30. -
  31. Tide and Current prediction and display by location.
    -
  32. -
  33. Multi-language support.
    -
  34. -
  35. linux and Windows compatible.
    -
  36. -
- -

-2.3.0 2010-12-18 -

-
    -
  1. Integrated PlugIn architecture, allowing third-party development and deployment of auxiliary features.
    -
  2. -
  3. Two useful PlugIns available immediately
    -
  4. -
  5. Graphical overlay of GRIB (weather)file data
    -
  6. -
  7. Dashboard for configurable on-screen display of ship's NMEA data.
    -
  8. -
  9. Enhanced Route, Track, and Waypoint management functions by selectable dialog.
    -
  10. -
  11. Many new languages added to basic package, including Portuguese, Estonian, Greek, Turkish, Finnish, Norwegian, etc.
    -
  12. -
  13. Support Garmin Host mode Route and Waypoint interchange and upload to remote GPS receivers.
    -
  14. -
  15. Advanced internationalized Windows Program Installer.
    -
  16. -
  17. Full support for North-up and Course-Up display of all chart types.
    -
  18. -
  19. Expanded AIS target message decoding to include European Inland AIS specifications.
    -
  20. -
  21. AIS Target List Dialog, allowing easy selection and monitoring of all active AIS targets.
    -
  22. -
  23. Many, many improvements in the basic User Interface, while maintaining the ease-of-use that.
    -
  24. -
- -

-2.3.1 2010-12-31 -

-
    -
  1. Correct logic regarding ownship AIS messages (AIVDO)
    -
  2. -
  3. Correct fault closing AIStarget list with target query dialog open (FS#310)
    -
  4. -
  5. Correct occasional geolocation problem with routes on BSB chart switch.
    -
  6. -
  7. Improve Toolbar refresh logic.
    -
  8. -
  9. Increase maximum chart stack size from 20 to 30. (FS#316)
    -
  10. -
  11. Correct GoTo waypoint and subsequent route delete logic. (FS#244)
    -
  12. -
  13. Various language file updates.
    -
  14. -
  15. Correct Depth unit display for quilted charts, with non-english language setting.
    -
  16. -
  17. Correct Win7 Garmin USB Device interface reset in User Mode.
    -
  18. -
  19. Correct Windows vc redistributable installation command in NSIS script.
    -
  20. -
- -

-2.5.0 2011-07-26 -

-
    -
  1. Per-Cell offset adjustment for cm93 charts
    -
  2. -
  3. Transverse Mercator chart quilting.
    -
  4. -
  5. Selectable full screen quilting option.
    -
  6. -
  7. Configurable lat/lon gid lines.
    -
  8. -
  9. Variable screen dimmer function.
    -
  10. -
  11. Improved Tide/Current information window.
    -
  12. -
  13. Configurable “Layers” function, enabling selectable display of fixed objects.
    -
  14. -
  15. Improved and extended AIS functions, including Euro Inland support & Base Stations and ATONs
    -
  16. -
  17. Selectable FullScreen display mode.
    -
  18. -
  19. Integrated Route Planner function, with Tide table support.
    -
  20. -
  21. Enhanced GUI functions, with floating transparent Toolbar.
    -
  22. -
  23. Several new language options.
    -
  24. -
  25. Improved internal memory management.
    -
  26. -
  27. Improved Autopilot output support.
    -
  28. -
  29. New Multi-leg Measurement tool.
    -
  30. -
  31. Improved Vector chart symbology.
    -
  32. -
  33. Improved integrated Tide/Current data accuracy.
    -
  34. -
  35. Improved Route definition interface, including selectable Route colors.
    -
  36. -
  37. Full conformance for all platforms, especially including Macintosh OS X.
    -
  38. -
  39. Greatly improved staility on all platforms, as a result of extended Beta testing.
    -
  40. -
  41. Many, many improvements in the basic User Interface, while maintaining the ease-of-use that OpenCPN is widely known for.
    -
  42. -
- -

-3.0.0 2012-06-05 -

-
    -
  1. New and Enhanced Features for OpenCPN Version 3.0
    -
  2. -
  3. OpenGL support, for enhanced graphics performance and functionality.
    -
  4. -
  5. Improved ENC object Query interface
    -
  6. -
  7. Portable execution option, allowing easy migration to new systems.
    -
  8. -
  9. Upgrade to wxWidgets 2.8.12.
    -
  10. -
  11. Support ENC Overlay cells.
    -
  12. -
  13. Upgrade gpsd support to Version 2.96
    -
  14. -
  15. Implement enhanced PlugIn system, enabling a wide variety of PlugIn types.
    -
  16. -
  17. Implement DSC and GPS_Gate Buddy tracking.
    -
  18. -
  19. Implement user defined Chart Groups.
    -
  20. -
  21. Implement AIS SART transponder display and tracking.
    -
  22. -
  23. Improved ENC object rendering and display.
    -
  24. -
  25. Implement user definable Tide/Current datasets.
    -
  26. -
  27. Full conformance for all platforms, especially including Macintosh OS X.
    -
  28. -
  29. Greatly improved stability on all platforms, as a result of extended Beta testing.
    -
  30. -
  31. Many, many improvements in the basic User Interface, while maintaining the ease-of-use that OpenCPN is widely known for.
    -
  32. -
- -

-3.0.2 2012-07-07 -This Service Release corrects several small bugs found in the recent 3.0.0 field release. -It incorporates no new features. -

- -

-3.2.0 2013-02-27 -

-
    -
  1. Complete update of user Options dialogs and context menus, incorporating modern graphics and uniform styles.
    -
  2. -
  3. Significantly enhanced navigation instrument input and output options, including extensive network connection capabilities supporting TCP, UDP, and GPSD data sources.
    -
  4. -
  5. New User Interface theme support, with OpenCPN traditional as well as two new low profile themes.
    -
  6. -
  7. Enhanced clipboard support, including interfaces to external KML data sources.
    -
  8. -
  9. Enhanced Tide and Current dataset support, including modern fully binary datasets.
    -
  10. -
  11. Various improvements in the display and tracking of AIS data targets.
    -
  12. -
  13. Automatic Great Circle route generation options.
    -
  14. -
  15. Significant enhancement of the Dashboard PlugIn, including new user interface options and a variety of stylish, new instruments.
    -
  16. -
  17. Improved sound system support for linux hosts.
    -
  18. -
  19. Major update to embedded Users Manual.
    -
  20. -
  21. Measurably improved performance and reliability over all supported platforms.
    -
  22. -
- -

-3.2.2 2013-05-08 -This Service Release corrects several small bugs found in the recent 3.2.0 field release. -It incorporates a command line switch to turn off OpenGL completely. -

- -

-4.0.0 2015-01-08 -

-
    -
  1. A major release.
    -
  2. -
  3. Increased performance in all modes, particularly when using OpenGL graphics acceleration.
    -
  4. -
  5. Additional network interface methods, including TCP/IP client/server and UDP broadcast.
    -
  6. -
  7. Support for multiple data source instances,
    -
  8. -
  9. including Filtering and prioritization of messages
    -
  10. -
  11. Output of NMEA data streams for real-time integration into ship systems
    -
  12. -
  13. Improved support for Mac OS X systems, including 64 bit native support.
    -
  14. -
  15. Integrated Tablet/Touch screen support.
    -
  16. -
  17. AIS Personal Locater Beacon (PLB) configuration and tracking.
    -
  18. -
  19. Enhanced AIS target tracking modes.
    -
  20. -
  21. GRIB PlugIn feature additions.
    -
  22. -
  23. Graphical GRIB email request generation.
    -
  24. -
  25. Moving particle wind overlay.
    -
  26. -
  27. Enhanced GRIB data type support.
    -
  28. -
  29. Dashboard PlugIn feature additions.
    -
  30. -
  31. More selectable instruments.
    -
  32. -
  33. Several new and updated Plug-ins, including
    -
  34. -
  35. Digital Radar overlay for popular radar scanners
    -
  36. -
  37. World Magnetic Model variation compensator
    -
  38. -
  39. Climatology analysis
    -
  40. -
  41. Dynamic route planning
    -
  42. -
  43. Integrated logbook
    -
  44. -
  45. Realtime datastream capture, record and playback
    -
  46. -
  47. Google Earth integration
    -
  48. -
  49. Weatherfax overlay
    -
  50. -
  51. Vector chart object and feature search tool
    -
  52. -
  53. S63 Encrypted vector chart support
    -
  54. -
  55. Major update to embedded Users Manual.
    -
  56. -
  57. Measurably improved performance and reliability over all supported platforms.
    -
  58. -
  59. And much more.
    -
  60. -
- -

-4.2.0 2016-02-03 -

-
    -
  1. Increased performance in all modes, particularly when using OpenGL graphics acceleration.
    -
  2. -
  3. Integrated Chart Downloader PlugIn, allowing systematic tracking and donwload of latest online charts from several popular sources.
    -
  4. -
  5. Integrated World Magnetic Model (WMM) PlugIn, providing accuratley calculated magnetic variation worldwide.
    -
  6. -
  7. Major update to embedded Users Manual.
    -
  8. -
  9. Measurably improved performance and reliability over all supported platforms.
    -
  10. -
- -

-4.4.0 2016-06-13 -

-
    -
  1. Support for GRIB V2 format files.
    -
  2. -
  3. Measurably improved performance and reliability over all supported platforms.
    -
  4. -
- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/ubuntu_ppa.html b/data/doc/getting_started/opencpn_installation/ubuntu_ppa.html deleted file mode 100644 index 77b87200b3..0000000000 --- a/data/doc/getting_started/opencpn_installation/ubuntu_ppa.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:ubuntu_ppa - - - - - - - - - - - - - - - - - - - - - -
- - - -

Ubuntu PPA

-
- -

- -

- -
- -

How to add the OpenCPN PPA into an Ubuntu system

-
- -

-You have two options to add the PPA to your system, either using the commandline Terminal or the GUI provided by the system, chose one that suits you better, not both.
- -
- -If you are using a non-standard variant of Ubuntu or a newer/older/whatever version than the one used while creating this guide, the GUI may be slightly different, try to use common sense before you start to be furious that the guide below does not work - it does. If it still does not work for you, ask in the support forum, providing exact steps you performed and exact error output you get. -

- -

-There are two PPA repositories, one for stable versions only and one that includes beta versions. If you want the beta versions replace the “ppa:opencpn/opencpn” string in the following instructions with “ppa:bdbcat/opencpn”. -

- -
- -

From the command line

-
- -

-
- -Open a Terminal and enter the following commands: -

-
sudo apt-get install software-properties-common
-sudo add-apt-repository ppa:opencpn/opencpn
-sudo apt-get update
-sudo apt-get install opencpn
- -

-===
- -Using the graphical configuration tools ===
- -Start the Ubuntu Software Center
- -ppa_1.jpg
- -
- -From the Edit menu, select Software Sources…
- -ppa_2.jpg
- -
- -On the Other tab, click on Add… button
- -
- -
- -In the dialog shown, fill in ppa:opencpn/opencpn (for stable versions) or ppa:bdbcat/opencpn (for beta versions) and click on the Add Source button
- -
- -
- -Wait until Ubuntu Downloads the necessary information and the progress indicator disappears
- -ppa_5.jpg
- -
- -From now on you are able to install OpenCPN as any other software. You will also get new stable versions automatically while updating your system.
- -ppa_6.jpg -

- -
- - -
- - diff --git a/data/doc/getting_started/opencpn_installation/windows.html b/data/doc/getting_started/opencpn_installation/windows.html deleted file mode 100644 index 0e0b0155ad..0000000000 --- a/data/doc/getting_started/opencpn_installation/windows.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:opencpn_installation:windows - - - - - - - - - - - - - - - - - - - - - -
- - - -

Windows

-
- -

-. . . -

- -

-Windows XP SP3/Vista/7/8/10 (except W8 RT) * Download the installation package for Windows from Download OpenCPN. -

-
    -
  • Use the stable release for navigation en route, or if you just started using OpenCPN.
    -
  • -
  • Exit all other programs, including your anti virus program - known to create problems in some cases. Unplug your network cable, to be on the safe side.
    -
  • -
  • Run the downloaded installer. Re-start your anti-virus. Re-connect the network
    -
  • -
  • If upgrading from a previous version of OpenCPN, there is no need to un-install the old version. Simply install the new version and it will upgrade OpenCPN, saving all your existing configuration and preferences.
    -
  • -
  • If this is a new installation, click on the Toolbox icon and configure your GPS source, chart directories, and other settings. It is highly recommended that you use the Chart Downloader Tab to setup directories and download charts.
    -
  • -
  • If your installation goes well, but OpenCPN does not start as expected, try to download and install these runtime components.
    -
  • -
  • Not Supported Windows versions:
    -Win 8 RT is not supported.
    -Win CE is not supported.
    -Win XP SP 2 or 1 are not supported. The last OpenCPN version that included support was 2.6.1624.
    -Win 2000 is not supported. The last OpenCPN version that included support was 2.5.0.
    -Win 98/ME are not supported. The last OpenCPN version that included support was 2.1.0.
    -
  • -
  • -
  • -
- - -
- - -
- - diff --git a/data/doc/getting_started/setting_option.html b/data/doc/getting_started/setting_option.html deleted file mode 100644 index 47795f5f64..0000000000 --- a/data/doc/getting_started/setting_option.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:setting_option - - - - - - - - - - - - - - - - - - - - - -
- - - -

Setting Options

-
- -

-Options contains user configurable settings.
- -The full Options Setting page is here: -Options Setting - -
- -OpenCPN uses some basic settings or limitations. -

-
    -
  • Courses are by default true, not magnetic. Change this in Options → Display → Units.
    -
  • -
  • All distances and routes are calculated using Mercator Sailing. Great Circle Sailing is an option in route creating.
    -
  • -
  • For Windows: only one instance of OpenCPN is allowed. Use the portable option if more instances are needed.
    -
  • -
  • Do not edit the opencpn.ini (opencpn.conf) file when OpenCPN is running.
    -
  • -
- -
- - -
- - diff --git a/data/doc/getting_started/touch_screen_tablets.html b/data/doc/getting_started/touch_screen_tablets.html deleted file mode 100644 index 70a28ddfb2..0000000000 --- a/data/doc/getting_started/touch_screen_tablets.html +++ /dev/null @@ -1,217 +0,0 @@ - - - - - opencpn:opencpn_user_manual:getting_started:touch_screen_tablets - - - - - - - - - - - - - - - - - - - - - -
- - - -

Touch Screen Tablets

-
- -

-
- -It is no wonder that iPads and Android tablets have become so popular. They offer superior ergonomics vs. laptops in many settings, including areas with limited space and power such as boat cabins and cockpits. Tablets usually offer superior battery life, lower power consumption, and are easier to waterproof via inexpensive pouches.
- -
- -With the recent release of OpenCPN for Android on the Google Play Store, a huge selection of phones and tablets are now able to run OpenCPN very easily.
- -
- -OpenCPN can also run very nicely on Windows 8 tablets, many of which are available at very low cost. Here are some suggestions for running on Windows tablets:
- -
- -Running OpenCPN on a Windows 8 tablet
- -
- -Although Windows 8 tablets are not as common as iPads or Android, they have the advantage of running on the exact same Windows platform as PCs and laptops. This means you can install OpenCPN onto a tablet using the same installer that is used for Windows laptops and desktops. Just dowload the installer and appropriate charts, run the installer, and select the chart location just like you would on any PC.
- -
- -Because of differences in Windows 8 vs. prior Windows versions, and configuration differences in the tablet hardware, your user experience with OpenCPN on a Windows tablet may be enhanced by considering these optional tips and tricks:
- -
- -1. Install the Classic Shell free software. This facilitates using the tablet with traditional Windows desktop programs, and will make the Win8 environment more familiar for those who are coming from XP, Vista, or Win7. You can still bring up the Start Screen to use the newer “Metro” tablet apps, but Classic Shell restores the familiar Start menu that Windows users are accustomed to having.
- -
- - -
- -2. Check Device Manager-Sensors to verify whether your tablet has a GNSS Geolocation sensor. If so, your tablet has GPS capabilities already built in. (Some tablets have been discovered to have GPS even though the specifications may not mention it.)
- -
- - -
- -However, the Windows 8 tablets initially are configured in a way that only Metro apps can see the built-in GPS. In order to overcome this limitation, try installing petrsimon's excellent GeolocationTCP utility. Set this utility to launch at bootup so it's always there by putting a shortcut in the Startup folder created by Classic Shell.
- -
- - -
- -Then you need to configure OpenCPN to receive the NMEA data over the appropriate TCP port.
- -
- - -
- -3. GPS If you do not have an internal GPS and want one to interface with your tablet, I recommend a Bluetooth GPS transmitter instead of a wired dongle or puck. There are Android and iPhone apps that will transmit from your smartphone, or you can purchase a freestanding Bluetooth GPS made by GlobalSat or others. Transmitting GPS to the tablet via Bluetooth also facilitates putting the tablet into a waterproof pouch. Some have reported that hanging a USB connector off the side of the tablet may weaken the microUSB plug over time.
- -
- -4. The excellent form factor of the tablet opens up some great possibilities for use in the cockpit, if you select a tablet with a sufficiently bright screen. A suggested tablet model and more comprehensive list of tips can be found on this message thread.
- -
- -OpenCPN runs remarkably well on a tablet with practically no modifications. Microsoft has emulated many mouse functions in their OS. The right-click context menus are emulated by tap-hold. Zooming and unzooming in OpenCPN is accomplished by pinching gesture, or using the magnifying glass icons in the toolbar.
- -
- -Mouse hover (aka “rollover”) is not generally supported on tablets, and accidentally tapping the chart can lead to unexpected re-centering of the chart. To address this and other tablet needs, OpenCPN adds some some custom features available in the Options-User Interface menu: -

- - -

-Activating “Enable Touchscreen Interface” alters the effect of tapping/clicking on the chart in the following ways:
- -
- --Suppresses re-centering of the chart by tapping (you need to tap-drag to pan the chart)
- --Tapping waypoint selects it for subsequent dragging
- --Tapping Routes and AIS targets shows popup info
- --Tapping tide/current icons shows appropriate dialog
- -
- -Here are some additional behaviors with “Enable Touchscreen Interface” activated:
- -
- --Optimize several common dialogs for screen rotation, i.e. landscape or portrait
- --Route Create workflow: “Done” by clicking toolbar “Route” icon, or normal context menu.
- --Toolbar navigation items (e.g. Zoom/Scale) are available during route creation.
- --Chart drag (a.k.a. swipe) is available during route creation.
- --Routepoint/Waypoint edit by drag is supported.
- --Increase pixel select radius, to allow for finger tip selection of routes/waypoints
- -
- -A second option, “Enable Tablet Scaled Graphics Interface” can improve the display, especially on tablets with high pixel density. At present, Windows tablets are generally lower pixel density than Android and iPad, but this may change with future hardware. This option does the following:
- -
- --Increase toolbar icon size
- --Increase context menu text item size
- --Increase selectable item sizes for several common dialogs
- -
- -Tablet Scaled Graphics may enlarge the toolbar icons too much for some tastes, especially on small tablets with limited screen space. As an alternative, Microsoft provides a Magnifier utility that temporarily zooms the view and allows for panning across the enlarged screen. It can be found in Start-All Programs-Windows Ease of Access (if you have Classis Shell installed), or by searching the Start Page in the Modern interface. I recommend pinning a shortcut to the taskbar for quick one-tap access. While zooming the OpenCPN menu can enlarge many chart features, Magnifier can enlarge additional elements like the very small depth soundings and the green-over-black status text displayed by the Active Route:
- -
- - -* Read more about the XTE in Connections Add a Serial Connection, “APB bearing precision”
- -
- -
- -
- -Following are Dave's comments on “Enable Tablet Scaled Graphics Interface”:
- -- It is important that the screen width dimension be properly set for this option to work.
- -- Manual override of screen width can be done at -Options→Display→Advanced Options Settings-Display-Advanced.
- -- Dave found, on his W8.1 tablet, that the automatically calculated size value was wrong, leading to extra large toolbar icons. Easy to correct with a physical measurement.
- -
- -In the “Tablet Scaled Graphics Interface”, the toolbar icon target minimum size is 9mm square.
- -This is the generally accepted minimum button size for several mobile platforms.
- -

- -

-Other Tablets and Operating System details.
- -

- -

-OpenCPN for Windows also runs successfully on: -

-
    -
  • Microsoft Surface Pro 3 with Windows 8 and Globalstar Bu-343 puck gps.
    -
  • -
  • Microsoft Surface Pro 3 with Windows 10 and Globalstar Bu-343 S4 puck gps.
    -
  • -
  • Opencpn should run successfully on most Windows 10 Computers.
    -
  • -
- -
- - -
- - diff --git a/data/doc/help_en_US.html b/data/doc/help_en_US.html deleted file mode 100644 index 7d6439c443..0000000000 --- a/data/doc/help_en_US.html +++ /dev/null @@ -1,297 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toc_offline_user_manual - - - - - - - - - - - - - - - - - - - - - -
- -

OpenCPN User Manual

-
- -

-OpenCPN Complete Online User Manual, Internet access required. -

- -

-Local Offline OpenCPN User Manual -

- - -
- - -
- - diff --git a/data/doc/license_and_authors.html b/data/doc/license_and_authors.html deleted file mode 100644 index dacae445dd..0000000000 --- a/data/doc/license_and_authors.html +++ /dev/null @@ -1,228 +0,0 @@ - - - - - opencpn:opencpn_user_manual:license_and_authors - - - - - - - - - - - - - - - - - - - - - -
- - - -

License and Authors

-
-
- -

-The bulk of OpenCPN is licensed under the - - GNU General Public License - (GPL) -version 2 or, at your option, any later version. However, the project also reuses code with other -licenses, see the file LICENSING. -

-
- -

-David S Register - Lead Developer -

- -

-Pavel Kalian - Sean D'Epagnier - J.P. Joubert
- -Thomas Höckne - Frederick Gleason - Will Camp
- -Hubert Kleis - Renate Rossner - Didier Gautheron
- -Caesar Schinas - Jesper Weissglas - Gunther Pilz
- -Flavius Bindea - Tim Francis - Alan Bleasby
- -Piotr Carlson - Jean-Eudes Onfray - Anders Lund
- -Anders Lund - Gordon Mau - Alan Bleasby
- -Gordon Mau - Kathleen Boswell - Mark A Sikes
- -Thomas Haller - Richard Smith - David Herring
- -Philip Lange - Ron Kuris - Julian Smart
- -Robert Roebling - Sylvain Duclos - Manish P. Pagey
- -David Flater - Frank Warmerdam - Mike Higgins
- -Samuel R. Blackburn - Atul Narkhede - Jan C. Depner
- -Stuart Cunningham - John F. Waers - Carsten Tschach
- -Ed Williams - Philippe Bekaert - Robert Lipe -

-
- -

-David S Register OpenCPN Lead Developer -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Pavel Kalian S52 Rasterization Improvements, Plugins
Sean D'Epagnier OpenGL Architecture, Plugins
J.P. Joubert GRIB PlugIn enhancements
Thomas Höckne Documentation and Wiki support
Frederick Gleason Documentation & Wiki support, Plugins
Will Kamp Website & Toolbar Icon design
Didier Gautheron App debgging and optimization
Caesar Schinas User Interface and OS X improvements
Jesper Weissglas Vector Chart Rendering
Jean-Eudes Onfray Dashboard and Dialog enhancements
Kathleen Boswell Website, Website Design & Icon design
Flavius Bindea CM93 Offset and AIS enhancements
Gunther Pilz Windows Installer enhancements
Alan Bleasby Garmin jeeps module
Piotr Carlson General usability enhancements
Anders Lund RouteManagerDialog
Gordon Mau OpenCPN Documentation
Tim Francis OpenCPN Documentation
Mark A Sikes OpenCPN CoDeveloper
Thomas Haller GPX Import/Export Implementation
Richard Smith OpenCPN CoDeveloper, MacOSX
David Herring OpenCPN CoDeveloper, MacOSX
Philip Lange OpenCPN Documentation
Ron Kuris wxWidgets Support
Julian Smart, wxWidget Author
Robert Roebling wxWidgets Author
Sylvain Duclos S52 Presentation Library code
Manish P. Pagey Serial Port Library
David Flater XTIDE tide and current code
Frank Warmerdam GDAL Class Library
Mike Higgins BSB Chart Format Detail
Samuel R. Blackburn NMEA0183 Class Library
Atul Narkhede Polygon Graphics utilities
Jan C. Depner WVS Chart Library
Stuart Cunningham BSB Chart Georeferencing Algorithms
John F. Waers UTM Conversion Algorithms
Carsten Tschach UTM Conversion Algorithms
Ed Williams Great Circle Formulary
Philippe Bekaert CIE→RGB Color Conversion Matrix
Robert Lipe Garmin USB GPS Interface
- -
- - -
- - diff --git a/data/doc/menubar.html b/data/doc/menubar.html deleted file mode 100644 index d377bc3e4c..0000000000 --- a/data/doc/menubar.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - opencpn:opencpn_user_manual:menubar - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - -

-The Menu Bar is a good aid to find features and shortcuts, and works best if you already is a bit familiar with OpenCPN. This page contains links that explains the different features.
- -
- -The Menu Bar, when visible, is situated just under the Title Bar and above the default position of the Tool Bar. See Below. It contains access to features, as well as help with available shortcuts, also called hot keys.
- - -

- -

-The Menu Bar can be activated in two ways.
- -It can be on all the time by ticking Options→User Interface → Show Menu Bar.
- -If this choice is not on, the Menu Bar can be shown temporarily by using the hot-key “Alt”.
- -As soon as the screen is used, for example by panning or double clicking for an Object Query, the Menu Bar disappears.
- -
- -As seen above the Menubar consists of five entries. -

- -
- - -
- -

-Shortcut Keys When a menubar item is visible, the characters shown on the right of the items are “hints” to remind user of the shortcut key to use when the menu is closed. While the menu is open, this key may be inactive. The key to use is the first character of the item itself. This may be platform dependent.
- -Alt + underlined letter, opens the concerned sub-menu. Alt+N will open “Navigate”. The exact behavior is platform dependent. For example Alt+A will open the Ais menu on Windows. Linux requires Alt and then Alt+A. -

- -
- - -
- - diff --git a/data/doc/menubar/ais.html b/data/doc/menubar/ais.html deleted file mode 100644 index 461452db40..0000000000 --- a/data/doc/menubar/ais.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - opencpn:opencpn_user_manual:menubar:ais - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/doc/menubar/help.html b/data/doc/menubar/help.html deleted file mode 100644 index 33877058cf..0000000000 --- a/data/doc/menubar/help.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - opencpn:opencpn_user_manual:menubar:help - - - - - - - - - - - - - - - - - - - - - -
- - - -

Help

-
- -

-
- -

- - -

-About Opencpn
- -Help
- -

- -
- - -
- - diff --git a/data/doc/menubar/navigate.html b/data/doc/menubar/navigate.html deleted file mode 100644 index 680e1980ea..0000000000 --- a/data/doc/menubar/navigate.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - opencpn:opencpn_user_manual:menubar:navigate - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/doc/menubar/tools.html b/data/doc/menubar/tools.html deleted file mode 100644 index a1792aead6..0000000000 --- a/data/doc/menubar/tools.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - opencpn:opencpn_user_manual:menubar:tools - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/doc/menubar/view.html b/data/doc/menubar/view.html deleted file mode 100644 index 12936cea04..0000000000 --- a/data/doc/menubar/view.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - opencpn:opencpn_user_manual:menubar:view - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/doc/opencpn/dev/linux_0.tok.047706_w.60.jpg b/data/doc/opencpn/dev/linux_0.tok.047706_w.60.jpg deleted file mode 100644 index ca2876ff4a..0000000000 Binary files a/data/doc/opencpn/dev/linux_0.tok.047706_w.60.jpg and /dev/null differ diff --git a/data/doc/opencpn/dev/vista_0.tok.65ac3e_w.60.jpg b/data/doc/opencpn/dev/vista_0.tok.65ac3e_w.60.jpg deleted file mode 100644 index 49d479f678..0000000000 Binary files a/data/doc/opencpn/dev/vista_0.tok.65ac3e_w.60.jpg and /dev/null differ diff --git a/data/doc/opencpn/files/chartsymbols/catzoc.h.336_tok.9c96e4_w.716.jpg b/data/doc/opencpn/files/chartsymbols/catzoc.h.336_tok.9c96e4_w.716.jpg deleted file mode 100644 index 30724aa214..0000000000 Binary files a/data/doc/opencpn/files/chartsymbols/catzoc.h.336_tok.9c96e4_w.716.jpg and /dev/null differ diff --git a/data/doc/opencpn/files/chartsymbols/catzoc.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html b/data/doc/opencpn/files/chartsymbols/catzoc.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html deleted file mode 100644 index 7d7cba056a..0000000000 --- a/data/doc/opencpn/files/chartsymbols/catzoc.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:files:chartsymbols:catzoc.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:files:chartsymbols:catzoc.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:files:chartsymbols:catzoc.jpg

- -

- - -

- - catzoc.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/files/chartsymbols/catzoc.jpg b/data/doc/opencpn/files/chartsymbols/catzoc.jpg deleted file mode 100644 index 30724aa214..0000000000 Binary files a/data/doc/opencpn/files/chartsymbols/catzoc.jpg and /dev/null differ diff --git a/data/doc/opencpn/files/chartsymbols/catzoc.tok.d482bd_w.600.jpg b/data/doc/opencpn/files/chartsymbols/catzoc.tok.d482bd_w.600.jpg deleted file mode 100644 index d23154ab25..0000000000 Binary files a/data/doc/opencpn/files/chartsymbols/catzoc.tok.d482bd_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/files/icons/ownship.xpm b/data/doc/opencpn/files/icons/ownship.xpm deleted file mode 100644 index 70973e38a9..0000000000 --- a/data/doc/opencpn/files/icons/ownship.xpm +++ /dev/null @@ -1,285 +0,0 @@ -/* XPM */ -static char *shippity[] = { -/* columns rows colors chars-per-pixel */ -"25 48 231 2", -" c #1E6C00", -". c #276C00", -"X c #2D6F00", -"o c #2A7500", -"O c #3E7000", -"+ c #725500", -"@ c #417600", -"# c #477900", -"$ c #497D00", -"% c #777800", -"& c #805600", -"* c #8A5B00", -"= c #AD5700", -"- c #876800", -"; c #906B00", -": c #9C6A00", -"> c #8A7200", -", c #937700", -"< c #9B7300", -"1 c #947C00", -"2 c #A26500", -"3 c #AF6600", -"4 c #A36E00", -"5 c #B26E00", -"6 c #BC6D00", -"7 c #A27400", -"8 c #AC7400", -"9 c #A67F00", -"0 c #AE7C00", -"q c #B37200", -"w c #BB7300", -"e c #B57D00", -"r c #BE7B00", -"t c #D56100", -"y c #C37700", -"u c #CA7700", -"i c #C47B00", -"p c #CC7F00", -"a c #D27E00", -"s c #ED7700", -"d c #1C8500", -"f c #198C00", -"g c #099700", -"h c #099F00", -"j c #00940A", -"k c #009C0A", -"l c #139200", -"z c #2B8200", -"x c #268800", -"c c #299100", -"v c #00A20A", -"b c #478000", -"n c #4A8600", -"m c #4C9300", -"M c #5D9B00", -"N c #648E00", -"B c #699400", -"V c #5BA300", -"C c #78B000", -"Z c #2FDE00", -"A c #01FF1F", -"S c #54D100", -"D c #7DD800", -"F c #8E8200", -"G c #968500", -"H c #948E00", -"J c #849700", -"K c #859900", -"L c #909300", -"P c #9B9600", -"I c #9A9B00", -"U c #A38200", -"Y c #AB8300", -"T c #A58B00", -"R c #AD8900", -"E c #B28300", -"W c #BD8400", -"Q c #B48A00", -"! c #BB8C00", -"~ c #AB9200", -"^ c #A79900", -"/ c #AD9E00", -"( c #B39000", -") c #BB9100", -"_ c #91A600", -"` c #B7A300", -"' c #BDA100", -"] c #BEAE00", -"[ c #C58400", -"{ c #CC8600", -"} c #C38B00", -"| c #CB8D00", -" . c #D58400", -".. c #DA8300", -"X. c #D68B00", -"o. c #DC8C00", -"O. c #C39200", -"+. c #CC9200", -"@. c #C39900", -"#. c #CC9B00", -"$. c #D39400", -"%. c #DC9300", -"&. c #D49C00", -"*. c #DC9C00", -"=. c #E98500", -"-. c #E18C00", -";. c #EB8F00", -":. c #E39400", -">. c #E29C00", -",. c #EB9C00", -"<. c #F39500", -"1. c #FB9700", -"2. c #F09900", -"3. c #FF9C00", -"4. c #C1A500", -"5. c #CAA200", -"6. c #CDAA00", -"7. c #D6A300", -"8. c #DBA500", -"9. c #D7AD00", -"0. c #CEB100", -"q. c #D7B100", -"w. c #DBB500", -"e. c #E4A300", -"r. c #EBA200", -"t. c #E4AA00", -"y. c #ECAD00", -"u. c #F2A300", -"i. c #FBA302", -"p. c #F2AE00", -"a. c #FFA109", -"s. c #FFAD0D", -"d. c #E6B300", -"f. c #E9B300", -"g. c #E5BA00", -"h. c #EEBD00", -"j. c #F0B000", -"k. c #FDB303", -"l. c #F4BB00", -"z. c #FFB30C", -"x. c #FFB90E", -"c. c #FFAA12", -"v. c #FFA71B", -"b. c #FFB212", -"n. c #FFB91D", -"m. c #FF8824", -"M. c #FFBE2D", -"N. c #FFB835", -"B. c #FFBA3A", -"V. c #A5C300", -"C. c #82FF1D", -"Z. c #ACFE00", -"A. c #B0FF09", -"S. c #D6C400", -"D. c #DDC200", -"F. c #D2CE00", -"G. c #EBC200", -"H. c #EFCA00", -"J. c #F0C000", -"K. c #FEC403", -"L. c #F7C900", -"P. c #FECC01", -"I. c #FFC30C", -"U. c #FFCA09", -"Y. c #FFD303", -"T. c #FFD803", -"R. c #FFC013", -"E. c #FFC51C", -"W. c #FFCE1A", -"Q. c #FFD316", -"!. c #FFD31B", -"~. c #C9E700", -"^. c #CCF900", -"/. c #FFE607", -"(. c #FFED0D", -"). c #E1F000", -"_. c #FFFA00", -"`. c #FFE614", -"'. c #FFEE15", -"]. c #FFE61C", -"[. c #F0FF15", -"{. c #FFFA13", -"}. c #FFC423", -"|. c #FFCB23", -" X c #FFC42D", -".X c #FFCB2A", -"XX c #FFD124", -"oX c #FFD32A", -"OX c #FFDB2E", -"+X c #FFC437", -"@X c #FFCA33", -"#X c #FFC53C", -"$X c #FFCA3C", -"%X c #FFD832", -"&X c #FFD93D", -"*X c #DEFF2C", -"=X c #DDFF3A", -"-X c #FFE624", -";X c #FFE52B", -":X c #FFF225", -">X c #FFE23D", -",X c #FFB745", -".e e e > J lXlXlXlXlXlXlXlX", -"lXlXlXlXlXlXlXY.Q K.d.&.W W [ e e S lXlXlXlXlXlXlX", -"lXlXlXlXlXlXlX, P.l.7.8.+.W [ [ [ X lXlXlXlXlXlXlX", -"lXlXlXlXlXlXM.} n.K.8.9.@.0 } *.>.4 Q.lXlXlXlXlXlX", -"lXlXlXlXlXlX: k.n.I.8.5.Q e +.*.*.e U lXlXlXlXlXlX", -"lXlXlXlXlXlXT W.W.L.6.' T U ) +.#.X.3 lXlXlXlXlXlX", -"lXlXlXlXlX{.H.XXK.G.w.0.~ U Q } #.X.6 lXlXlXlXlXlX", -"lXlXlXlXlX^ `.(.T.g.f.&.E ! @.E ) :.=.@ lXlXlXlXlX", -"lXlXlXlXlX/ ].'.T.L.l.t.! E ! ! 6.:.=.O lXlXlXlXlX", -"lXlXlXlXlX] ;X-XK.k.:.o.p | $.$.$.r.<.F lXlXlXlXlX", -"lXlXlXlXwXS.;X-XK.x.:.-.{ } +.&.&.r.<.F Z.lXlXlXlX", -"lXlXlXlX^.).;X@Xx.i. .o.i : 8 } $.>.,.Q D.lXlXlXlX", -"lXlXlXlXV.[.;X.Xx.a. .r 4 7 [ | >.>.,.) ` lXlXlXlX", -"lXlXlXlXx *X:X Xz.%.@.V m K T 7 W e.e.*.( lXlXlXlX", -"lXlXlXlX =X:X Xb.{ 8XyXaXtXrX7.| e.*.*.R lXlXlXlX", -"lXlXlXlXd eX-XXX;.t kXsXsXfXjX$.e e.e.%.5 lXlXlXlX", -"lXlXlXlXf eX;X|.<.m.dXsXsXuXjX3X8 e.t.X.5 lXlXlXlX", -"lXlXlXlXg qX&X}.3.s gXhXpXhXiXo.[ e.y.{ q lXlXlXlX", -"lXlXlXlXh qX6X}.a.= 1XkXhXhXeXp { e.p.{ w lXlXlXlX", -"lXlXlXlXv eX5XM.c.3.2 q 2.9 ) [ +.e.j.{ r lXlXlXlX", -"lXlXlXlXk eX5X Xc.1.i X.* Y - .u.e.y.X.r lXlXlXlX", -"lXlXlXlXl 0X$X+Xb.z.:.| 0 ; ) e.*.e.y.%.e lXlXlXlX", -"lXlXlXlXf 0X@X#Xz.,.,.%.< Y Y *.e.e.e.%.8 lXlXlXlX", -"lXlXlXlXn 5X4X}.E.l.y.&.Q U Q *.*.e.e.*.8 lXlXlXlX", -"lXlXlXlXb 8X4X}.R.l.y.&.Q U Q *.*.e.t.*.8 lXlXlXlX", -"lXlXlXlX# 9X3XXXK.l.d.&.Q Y R O.$.*.t.$.: lXlXlXlX", -"lXlXlXlX$ 7X#XoXK.l.d.&.Q Y R O.$.*.t.| : lXlXlXlX", -"lXlXlXlXM @XN..XK.h.f.*.! Y R O.+.*.e.[ q lXlXlXlX", -"lXlXlXlXD R.N.|.P.h.f.*.! Y R O.+.*.8.[ :.lXlXlXlX", -"lXlXlXlXC.p.B.E.P.h.f.>.} E Q | | &.&.[ v.lXlXlXlX", -"lXlXlXlX2Xe..} E Q | | &.&.{ ,XlXlXlXlX", -"lXlXlXlXlX4.!.OXK.J.f.#.Q E ! O.+.u.i.P lXlXlXlXlX", -"lXlXlXlXlX1 %XOXU.L.l.7.! E ! O.+.*.u.H lXlXlXlXlX", -"lXlXlXlXlXN :X/.Y.g.t.@.E 0 W } | r.,.% lXlXlXlXlX", -"lXlXlXlXlXB _.`.Q.h.t.#.E 0 ! O.+.| X.L lXlXlXlXlX", -"lXlXlXlXlXH.l.M.i.i.1...w w i p p [ U C lXlXlXlXlX", -"lXlXlXlXlX>X@.z.s.2.;. .y w u a a r U A.lXlXlXlXlX", -"lXlXlXlXlXlXZ c d z z o . . o o o U G.lXlXlXlXlXlX", -"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX", -"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX", -"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX" -}; diff --git a/data/doc/opencpn/files/nmea/sart-alarms.txt.doc b/data/doc/opencpn/files/nmea/sart-alarms.txt.doc deleted file mode 100644 index 5d36e2a960..0000000000 --- a/data/doc/opencpn/files/nmea/sart-alarms.txt.doc +++ /dev/null @@ -1,5715 +0,0 @@ -$GPGGA,083901.000,4926.7633,N,01100.4540,E,1,09,1.1,343.7,M,47.8,M,,0000*53 -$GPGLL,4926.7633,N,01100.4540,E,083901.000,A,A*57 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.8,1.1,1.4*3D -$GPGSV,3,1,12,27,88,226,34,22,62,136,39,19,56,299,33,18,46,067,45*74 -$GPGSV,3,2,12,16,36,197,35,04,25,257,32,21,25,072,35,11,12,270,*73 -$GPGSV,3,3,12,15,12,040,43,30,07,318,33,07,06,288,25,14,01,136,34*73 -$GPRMC,083901.000,A,4926.7633,N,01100.4540,E,0.04,91.65,281114,,,A*50 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000O:wDNP000jHdNLBh3f4?wt1l00,0*2C -$GPGGA,083904.000,4926.7632,N,01100.4540,E,1,10,1.0,343.4,M,47.8,M,,0000*5D -$GPGLL,4926.7632,N,01100.4540,E,083904.000,A,A*53 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPRMC,083904.000,A,4926.7632,N,01100.4540,E,0.07,82.06,281114,,,A*50 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000O:wDNP000jHdRLBh4f4?wt1l00,0*37 -$GPGGA,083908.000,4926.7633,N,01100.4540,E,1,10,1.0,343.3,M,47.8,M,,0000*57 -$GPGLL,4926.7633,N,01100.4540,E,083908.000,A,A*5E -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPRMC,083908.000,A,4926.7633,N,01100.4540,E,0.10,69.11,281114,,,A*58 -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP000pf?VP000O:wDNP000jHdTLBh5>4?wt1l00,0*68 -$GPGGA,083912.000,4926.7633,N,01100.4539,E,1,10,1.0,343.3,M,47.8,M,,0000*52 -$GPGLL,4926.7633,N,01100.4539,E,083912.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPRMC,083912.000,A,4926.7633,N,01100.4539,E,0.06,52.35,281114,,,A*54 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000O:wDNP000jHdVLBh6>4?wt1l00,0*69 -$GPGGA,083916.000,4926.7632,N,01100.4537,E,1,09,1.1,343.1,M,47.8,M,,0000*52 -$GPGLL,4926.7632,N,01100.4537,E,083916.000,A,A*50 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.8,1.1,1.4*3D -$GPGSV,3,1,12,27,87,212,38,22,62,135,40,19,57,299,34,18,46,066,46*79 -$GPGSV,3,2,12,16,35,197,36,04,26,257,33,21,25,073,38,11,12,270,*7D -$GPGSV,3,3,12,15,12,039,46,30,07,318,34,07,06,288,,14,01,135,34*7B -$GPRMC,083916.000,A,4926.7632,N,01100.4537,E,0.05,93.10,281114,,,A*56 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000;U=g`0984pf?VP00@pf?VP000pf?VP00@4?wtAU2L,0*3F -$GPRMC,083941.000,A,4926.7620,N,01100.4518,E,0.06,86.44,281114,,,A*5C -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000O:wDNP000jHerLBh>v4?wt1h2N,0*74 -$GPGGA,084004.000,4926.7633,N,01100.4495,E,1,10,1.0,347.7,M,47.8,M,,0000*5C -$GPGLL,4926.7633,N,01100.4495,E,084004.000,A,A*55 -$GPGSA,A,3,21,18,27,19,15,30,16,07,22,11,,,1.6,1.0,1.3*36 -$GPRMC,084004.000,A,4926.7633,N,01100.4495,E,0.08,322.93,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000O:wDNP000jHerLBh?N4?wt1h4l,0*69 -$GPGGA,084008.000,4926.7635,N,01100.4492,E,1,09,1.1,348.5,M,47.8,M,,0000*55 -$GPGLL,4926.7635,N,01100.4492,E,084008.000,A,A*58 -$GPGSA,A,3,21,18,27,19,15,30,16,07,22,,,,1.7,1.1,1.3*36 -$GPRMC,084008.000,A,4926.7635,N,01100.4492,E,0.08,8.36,281114,,,A*65 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP00@TowUTkP06,0*1E -$GPVTG,263.78,T,,M,0.10,N,0.2,K,A*06 -!AIVDM,1,1,,B,1>O:wDNP000jHevLBh?f4?wt1h7:,0*10 -$GPGGA,084012.000,4926.7634,N,01100.4489,E,1,11,1.0,348.8,M,47.8,M,,0000*50 -$GPGLL,4926.7634,N,01100.4489,E,084012.000,A,A*58 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084012.000,A,4926.7634,N,01100.4489,E,0.02,154.83,281114,,,A*69 -!AIVDO,1,1,,,B>pf?VP000pf?VP00@pf?VP000pf?VP000H,0*01 -!AIVDM,3,3,2,A,Hj22S27`Hj2BS288Hj2h,0*4B -$GPGSV,3,2,12,16,35,197,35,04,26,257,23,21,24,073,32,11,13,270,20*77 -$GPGSV,3,3,12,15,11,039,40,30,07,318,32,07,06,288,27,14,02,135,35*7F -!AIVDM,3,1,3,B,8;U=g`25Nh0jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*74 -!AIVDM,3,2,3,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*02 -!AIVDM,3,3,3,B,H23jS468HB3BS46`HR30,0*0F -$GPRMC,084016.000,A,4926.7633,N,01100.4486,E,0.06,199.91,281114,,,A*63 -!AIVDO,1,1,,,B>pf?VP000HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4F -!AIVDM,3,3,4,A,HR22S588Hj22S5CpHB1h,0*4A -!AIVDM,3,1,5,B,8;U=g`25Nh1BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*20 -!AIVDM,3,2,5,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5F -!AIVDM,3,3,5,B,:iJ2TD4a;AIjTD4q;QIh,0*39 -!AIVDM,3,1,6,A,8;U=g`25Nh1RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*5A -!AIVDM,3,2,6,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*65 -!AIVDM,3,3,6,A,;1J2TKoI;QIjTKoq;iJ@,0*4B -$GPGGA,084017.000,4926.7632,N,01100.4486,E,1,11,1.0,348.5,M,47.8,M,,0000*51 -!AIVDM,3,1,7,A,8;U=g`25Nh22TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*51 -!AIVDM,3,2,7,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*60 -!AIVDM,3,3,7,A,:iJ2Tcsq;1J2Tct9;AIh,0*5C -$GPGLL,4926.7632,N,01100.4486,E,084017.000,A,A*54 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -!AIVDM,3,1,8,B,8;U=g`25Nh2BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*4B -!AIVDM,3,2,8,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*3A -!AIVDM,3,3,8,B,:iJ2U3ta;AIjU3tq;QIh,0*34 -$GPRMC,084017.000,A,4926.7632,N,01100.4486,E,0.12,95.99,281114,,,A*53 -!AIVDO,1,1,,,B>pf?VP00@pf?VP000H,0*04 -!AIVDM,3,3,7,A,Hj22S27`Hj2BS288Hj2h,0*4E -$GPVTG,135.46,T,,M,0.06,N,0.1,K,A*0F -!AIVDM,3,1,8,B,8;U=g`25Nh4jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*7B -!AIVDM,3,2,8,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*09 -!AIVDM,3,3,8,B,H23jS468HB3BS46`HR30,0*04 -!AIVDM,3,1,9,A,8;U=g`25Nh52S478Hj2jS47HI22RS47pIB3BS48HIR32S48pIj32S49`Ij2R,0*61 -!AIVDM,3,2,9,A,S4=HIB2RS4=pI22RS4>HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*42 -!AIVDM,3,3,9,A,HR22S588Hj22S5CpHB1h,0*47 -!AIVDM,3,1,0,B,8;U=g`25Nh5BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*21 -!AIVDM,3,2,0,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5A -!AIVDM,3,3,0,B,:iJ2TD4a;AIjTD4q;QIh,0*3C -!AIVDM,3,1,1,A,8;U=g`25Nh5RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*59 -!AIVDM,3,2,1,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*62 -!AIVDM,3,3,1,A,;1J2TKoI;QIjTKoq;iJ@,0*4C -!AIVDM,3,1,2,B,8;U=g`25Nh5jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*4D -!AIVDM,3,2,2,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*4D -!AIVDM,3,3,2,B,;iJBTS59;QJBTS5q;1JP,0*77 -!AIVDM,3,1,3,A,8;U=g`25Nh62TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*51 -!AIVDM,3,2,3,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*64 -!AIVDM,3,3,3,A,:iJ2Tcsq;1J2Tct9;AIh,0*58 -$GPGGA,084019.000,4926.7631,N,01100.4486,E,1,11,1.0,348.3,M,47.8,M,,0000*5A -$GPGLL,4926.7631,N,01100.4486,E,084019.000,A,A*59 -!AIVDM,3,1,4,B,8;U=g`25Nh6BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*43 -!AIVDM,3,2,4,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*36 -!AIVDM,3,3,4,B,:iJ2U3ta;AIjU3tq;QIh,0*38 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084019.000,A,4926.7631,N,01100.4486,E,0.09,132.80,281114,,,A*60 -!AIVDM,3,1,5,A,8;U=g`25Nh6RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*76 -!AIVDM,3,2,5,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*53 -!AIVDM,3,3,5,A,;AIja1Sq;1J2a1T9:QJ0,0*66 -$GPVTG,132.80,T,,M,0.09,N,0.2,K,A*0E -!AIVDO,1,1,,,B>pf?VP000pf?VP00@HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4F -!AIVDM,3,3,4,A,HR22S588Hj22S5CpHB1h,0*4A -!AIVDM,3,1,5,B,8;U=g`25Nh9BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*28 -!AIVDM,3,2,5,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5F -!AIVDM,3,3,5,B,:iJ2TD4a;AIjTD4q;QIh,0*39 -!AIVDM,3,1,6,A,8;U=g`25Nh9RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*52 -!AIVDM,3,2,6,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*65 -!AIVDM,3,3,6,A,;1J2TKoI;QIjTKoq;iJ@,0*4B -!AIVDM,3,1,7,B,8;U=g`25Nh9jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*44 -!AIVDM,3,2,7,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*48 -!AIVDM,3,3,7,B,;iJBTS59;QJBTS5q;1JP,0*72 -!AIVDM,3,1,8,A,8;U=g`25Nh:2TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*56 -!AIVDM,3,2,8,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*6F -!AIVDM,3,3,8,A,:iJ2Tcsq;1J2Tct9;AIh,0*53 -$GPGGA,084021.000,4926.7629,N,01100.4486,E,1,11,1.0,347.7,M,47.8,M,,0000*53 -$GPGLL,4926.7629,N,01100.4486,E,084021.000,A,A*5B -!AIVDM,3,1,9,B,8;U=g`25Nh:BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*42 -!AIVDM,3,2,9,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*3B -!AIVDM,3,3,9,B,:iJ2U3ta;AIjU3tq;QIh,0*35 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -!AIVDM,3,1,0,A,8;U=g`25Nh:RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*7F -!AIVDM,3,2,0,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*56 -!AIVDM,3,3,0,A,;AIja1Sq;1J2a1T9:QJ0,0*63 -$GPGSV,3,1,12,27,87,200,36,22,62,134,38,19,57,299,27,18,46,066,39*70 -$GPGSV,3,2,12,16,35,197,34,04,26,257,24,21,24,073,26,11,13,270,21*75 -!AIVDM,3,1,1,B,8;U=g`25Nh:ja1TI:AJRa1U9:1JBa1Ua9QJRa1VI9QJBa3sq9iJRa3v9:1JR,0*37 -!AIVDM,3,2,1,B,a3va:AJRa3vq:QJBa40I:iJ2a419;AJBa41a;QJBa429;iJBa9PI;QJBa9Q9,0*5D -!AIVDM,3,3,1,B,;AJRa9Sa:iJBa9T9:AJ@,0*03 -$GPGSV,3,3,12,15,11,039,40,30,07,318,33,07,06,288,27,14,02,135,35*7E -!AIVDM,3,1,2,A,8;U=g`25Nh;2a9Ta:1JRa9Ua9iJBa9VI9QJBa;t99iJRa;ta:1JRa;tq:QJB,0*00 -!AIVDM,3,2,2,A,a;u9:iJ2a;uI;AIja;ua;QIja;v9;iJBaAN9;QJBaANq;AJRaARI:iJBaARq,0*74 -!AIVDM,3,3,2,A,:AJRaASa:1JRaATI9iJ@,0*11 -$GPRMC,084021.000,A,4926.7629,N,01100.4486,E,0.18,136.57,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP00@pf?VP00Ppf?VP00@pf?VP00Ppf?VP00Ppf?VP00@pf?VP00@pf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00@pf?VP00@pf?VP00@pf?VP00@4?wtAU2P,0*22 -$GPGGA,084036.000,4926.7607,N,01100.4503,E,1,11,1.0,341.0,M,47.8,M,,0000*54 -$GPGLL,4926.7607,N,01100.4503,E,084036.000,A,A*5D -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPGSV,3,1,12,27,87,200,30,22,62,134,32,19,57,299,33,18,46,066,37*77 -$GPGSV,3,2,12,16,35,197,33,04,26,257,20,21,24,073,31,11,13,270,16*74 -$GPGSV,3,3,12,15,11,039,41,30,07,318,33,07,06,288,27,14,02,135,34*7E -$GPRMC,084036.000,A,4926.7607,N,01100.4503,E,0.14,163.14,281114,,,A*61 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@;U=g`0984pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00Ppf?VP00Ppf?VP00Ppf?VP00PO:wDNP000jHf4LBh=v4?wt1d00,0*42 -$GPGGA,084104.000,4926.7601,N,01100.4521,E,1,11,1.0,336.5,M,47.8,M,,0000*57 -$GPGLL,4926.7601,N,01100.4521,E,084104.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084104.000,A,4926.7601,N,01100.4521,E,0.26,358.96,281114,,,A*66 -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00hpf?VP00hpf?VP00hO:wDNP000jHf4LBh=N4?wt1d00,0*7A -$GPGGA,084108.000,4926.7611,N,01100.4515,E,1,11,1.0,338.8,M,47.8,M,,0000*5E -$GPGLL,4926.7611,N,01100.4515,E,084108.000,A,A*51 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084108.000,A,4926.7611,N,01100.4515,E,0.30,13.60,281114,,,A*5E -!AIVDO,1,1,,,B>pf?VP00hpf?VP00Ppf?VP00hpf?VP00h>O:wD@lt:04=@UHD000000,2*23 -$GPGGA,084112.000,4926.7623,N,01100.4507,E,1,10,1.0,341.4,M,47.8,M,,0000*54 -$GPGLL,4926.7623,N,01100.4507,E,084112.000,A,A*58 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPRMC,084112.000,A,4926.7623,N,01100.4507,E,0.29,6.89,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00Ppf?VP00Ppf?VP00PO:wDNP000jHf4LBh;f4?wt1d00,0*54 -$GPGGA,084116.000,4926.7636,N,01100.4498,E,1,11,1.0,344.1,M,47.8,M,,0000*52 -$GPGLL,4926.7636,N,01100.4498,E,084116.000,A,A*5F -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPGSV,3,1,12,27,87,194,31,22,62,134,37,19,58,299,32,18,45,066,31*76 -$GPGSV,3,2,12,16,35,197,28,04,26,257,26,21,24,073,37,11,13,270,24*7F -$GPGSV,3,3,12,15,11,039,40,30,07,317,30,07,06,287,24,14,02,135,30*7B -$GPRMC,084116.000,A,4926.7636,N,01100.4498,E,0.29,356.07,281114,,,A*6B -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP0004?wtAU2T,0*06 -$GPGGA,084136.000,4926.7706,N,01100.4471,E,1,11,1.0,356.6,M,47.8,M,,0000*51 -$GPGLL,4926.7706,N,01100.4471,E,084136.000,A,A*58 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPGSV,3,1,12,27,87,194,35,22,62,134,30,19,58,299,34,18,45,066,37*75 -$GPGSV,3,2,12,16,35,197,30,04,26,257,30,21,24,073,40,11,13,270,21*74 -$GPGSV,3,3,12,15,11,039,26,30,07,317,31,07,06,287,26,14,02,135,31*79 -$GPRMC,084136.000,A,4926.7706,N,01100.4471,E,0.10,38.85,281114,,,A*57 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@;U=g`0984pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000O:wDNP000jHf@LBh4N4?wt1`4l,0*5B -$GPGGA,084208.000,4926.7759,N,01100.4447,E,1,11,1.0,369.0,M,47.8,M,,0000*5A -$GPGLL,4926.7759,N,01100.4447,E,084208.000,A,A*59 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084208.000,A,4926.7759,N,01100.4447,E,0.13,20.36,281114,,,A*54 -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP000pf?VP000O:wDNP000jHf:LBh3N4?wt1`7:,0*73 -$GPGGA,084212.000,4926.7761,N,01100.4448,E,1,11,1.0,368.7,M,47.8,M,,0000*53 -$GPGLL,4926.7761,N,01100.4448,E,084212.000,A,A*56 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084212.000,A,4926.7761,N,01100.4448,E,0.10,137.94,281114,,,A*67 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000Wwg4kP06,0*67 -$GPVTG,23.38,T,,M,0.06,N,0.1,K,A*30 -$GPGGA,084231.000,4926.7766,N,01100.4452,E,1,11,1.0,365.2,M,47.8,M,,0000*56 -$GPGLL,4926.7766,N,01100.4452,E,084231.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPGSV,3,1,12,27,87,182,37,22,63,133,36,19,58,299,35,18,45,065,43*71 -$GPGSV,3,2,12,16,34,197,30,04,27,258,34,21,24,073,39,11,14,271,27*71 -$GPGSV,3,3,12,15,11,038,42,30,07,317,30,07,05,287,25,14,02,135,26*7D -$GPRMC,084231.000,A,4926.7766,N,01100.4452,E,0.07,8.31,281114,,,A*6E -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000W4dKCD;wjTkP06,0*6B -$GPVTG,339.47,T,,M,0.08,N,0.1,K,A*0E -$GPGGA,084238.000,4926.7763,N,01100.4443,E,1,11,1.0,364.3,M,47.8,M,,0000*5A -$GPGLL,4926.7763,N,01100.4443,E,084238.000,A,A*57 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084238.000,A,4926.7763,N,01100.4443,E,0.04,43.93,281114,,,A*56 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP0004?wvAU2d,0*35 -$GPGGA,084302.000,4926.7705,N,01100.4389,E,1,10,1.0,354.0,M,47.8,M,,0000*52 -$GPGLL,4926.7705,N,01100.4389,E,084302.000,A,A*5E -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,,,1.6,1.0,1.3*32 -$GPRMC,084302.000,A,4926.7705,N,01100.4389,E,0.11,137.73,281114,,,A*67 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@;U=g`0984O:wDNP010jHeHLBh5>4?wt1U2d,0*1B -$GPGGA,084304.000,4926.7698,N,01100.4386,E,1,11,1.0,352.3,M,47.8,M,,0000*5A -$GPGLL,4926.7698,N,01100.4386,E,084304.000,A,A*52 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084304.000,A,4926.7698,N,01100.4386,E,0.08,165.92,281114,,,A*6B -!AIVDO,1,1,,,B>pf?VP000pf?VP00@pf?VP00@pf?VP00PO:wDNP010jHeHLBh6N4?wt1U2d,0*68 -$GPGGA,084308.000,4926.7683,N,01100.4381,E,1,10,1.0,348.0,M,47.8,M,,0000*52 -$GPGLL,4926.7683,N,01100.4381,E,084308.000,A,A*53 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPRMC,084308.000,A,4926.7683,N,01100.4381,E,0.21,153.15,281114,,,A*6B -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00PLBge>4?wtAU2d,0*19 -$GPGGA,084310.000,4926.7676,N,01100.4380,E,1,10,1.0,345.7,M,47.8,M,,0000*5A -$GPGLL,4926.7676,N,01100.4380,E,084310.000,A,A*51 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPRMC,084310.000,A,4926.7676,N,01100.4380,E,0.21,155.67,281114,,,A*6A -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00PO:wDNP010jHeDLBh6N4?wt1U2d,0*64 -$GPGGA,084312.000,4926.7668,N,01100.4378,E,1,10,1.0,343.3,M,47.8,M,,0000*52 -$GPGLL,4926.7668,N,01100.4378,E,084312.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPRMC,084312.000,A,4926.7668,N,01100.4378,E,0.21,155.85,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00Ppf?VP00Ppf?VP00PO:wDNP010jHeFLBh7N4?wt1U2d,0*67 -$GPGGA,084316.000,4926.7654,N,01100.4376,E,1,10,1.0,339.0,M,47.8,M,,0000*59 -$GPGLL,4926.7654,N,01100.4376,E,084316.000,A,A*5E -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.7,1.0,1.3*34 -$GPGSV,3,1,12,27,86,175,37,22,63,132,38,19,59,299,34,18,45,065,45*71 -$GPGSV,3,2,12,16,33,197,28,04,27,258,35,21,23,073,26,11,14,271,14*77 -$GPGSV,3,3,12,15,11,038,40,30,07,316,32,07,05,286,16,14,03,134,25*7E -$GPRMC,084316.000,A,4926.7654,N,01100.4376,E,0.23,164.43,281114,,,A*63 -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00Ppf?VP00hpf?VP00hpf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00Ppf?VP00Ppf?VP00@pf?VP00@pf?VP00Ppf?VP000pf?VP00@pf?VP000pf?VP000kwm4kP06,0*2A -$GPVTG,23.64,T,,M,0.04,N,0.1,K,A*3B -!AIVDM,3,1,8,B,8;U=g`25Nh0B00080002Rrp`HinBRrq8HinRRrq`Hio2Rrr8HioBRrrpHip2,0*09 -!AIVDM,3,2,8,B,RrsHHQpRRrspHQq2RrtHHQqRRrt`HQr2Rru8HArRRruHHAsBRru`HAt2Rrup,0*30 -!AIVDM,3,3,8,B,HAtjRrv8H1uBRrvHH1uh,0*50 -!AIVDM,3,1,9,B,8;U=g`25Nh0jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*7E -!AIVDM,3,2,9,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*08 -!AIVDM,3,3,9,B,H23jS468HB3BS46`HR30,0*05 -!AIVDM,3,1,0,A,8;U=g`25Nh12S478Hj2jS47HI22RS47pIB3BS48HIR32S48pIj32S49`Ij2R,0*6C -!AIVDM,3,2,0,A,S4=HIB2RS4=pI22RS4>HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4B -!AIVDM,3,3,0,A,HR22S588Hj22S5CpHB1h,0*4E -!AIVDM,3,1,1,B,8;U=g`25Nh1BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*24 -!AIVDM,3,2,1,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5B -!AIVDM,3,3,1,B,:iJ2TD4a;AIjTD4q;QIh,0*3D -$GPGGA,084343.000,4926.7577,N,01100.4376,E,1,11,1.0,318.7,M,47.8,M,,0000*5E -!AIVDM,3,1,2,A,8;U=g`25Nh1RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*5E -!AIVDM,3,2,2,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*61 -!AIVDM,3,3,2,A,;1J2TKoI;QIjTKoq;iJ@,0*4F -$GPGLL,4926.7577,N,01100.4376,E,084343.000,A,A*5C -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -!AIVDM,3,1,3,B,8;U=g`25Nh1jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*48 -!AIVDM,3,2,3,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*4C -!AIVDM,3,3,3,B,;iJBTS59;QJBTS5q;1JP,0*76 -$GPRMC,084343.000,A,4926.7577,N,01100.4376,E,0.08,354.41,281114,,,A*6B -!AIVDO,1,1,,,B>pf?VP000pf?VP000HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4F -!AIVDM,3,3,4,A,HR22S588Hj22S5CpHB1h,0*4A -!AIVDM,3,1,5,A,8;U=g`25Nh5RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*5D -!AIVDM,3,2,5,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*66 -!AIVDM,3,3,5,A,;1J2TKoI;QIjTKoq;iJ@,0*48 -$GPGGA,084345.000,4926.7575,N,01100.4375,E,1,11,1.0,318.2,M,47.8,M,,0000*5C -$GPGLL,4926.7575,N,01100.4375,E,084345.000,A,A*5B -!AIVDM,3,1,6,B,8;U=g`25Nh5jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*49 -!AIVDM,3,2,6,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*49 -!AIVDM,3,3,6,B,;iJBTS59;QJBTS5q;1JP,0*73 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084345.000,A,4926.7575,N,01100.4375,E,0.14,12.23,281114,,,A*54 -!AIVDO,1,1,,,B>pf?VP00@pf?VP000H,0*04 -!AIVDM,3,3,7,A,Hj22S27`Hj2BS288Hj2h,0*4E -$GPVTG,33.94,T,,M,0.09,N,0.2,K,A*3B -!AIVDM,3,1,8,B,8;U=g`25Nh8jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*77 -!AIVDM,3,2,8,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*09 -!AIVDM,3,3,8,B,H23jS468HB3BS46`HR30,0*04 -!AIVDM,3,1,9,A,8;U=g`25Nh92S478Hj2jS47HI22RS47pIB3BS48HIR32S48pIj32S49`Ij2R,0*6D -!AIVDM,3,2,9,A,S4=HIB2RS4=pI22RS4>HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*42 -!AIVDM,3,3,9,A,HR22S588Hj22S5CpHB1h,0*47 -!AIVDM,3,1,0,B,8;U=g`25Nh9BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*2D -!AIVDM,3,2,0,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5A -!AIVDM,3,3,0,B,:iJ2TD4a;AIjTD4q;QIh,0*3C -!AIVDM,3,1,1,A,8;U=g`25Nh9RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*55 -!AIVDM,3,2,1,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*62 -!AIVDM,3,3,1,A,;1J2TKoI;QIjTKoq;iJ@,0*4C -$GPGGA,084347.000,4926.7573,N,01100.4375,E,1,11,1.0,317.8,M,47.8,M,,0000*5D -$GPGLL,4926.7573,N,01100.4375,E,084347.000,A,A*5F -!AIVDM,3,1,2,B,8;U=g`25Nh9jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*41 -!AIVDM,3,2,2,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*4D -!AIVDM,3,3,2,B,;iJBTS59;QJBTS5q;1JP,0*77 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -!AIVDM,3,1,3,A,8;U=g`25Nh:2TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5D -!AIVDM,3,2,3,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*64 -!AIVDM,3,3,3,A,:iJ2Tcsq;1J2Tct9;AIh,0*58 -$GPRMC,084347.000,A,4926.7573,N,01100.4375,E,0.10,34.98,281114,,,A*50 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@H,0*01 -!AIVDM,3,3,2,A,Hj22S27`Hj2BS288Hj2h,0*4B -!AIVDM,3,1,3,A,8;U=g`25Nh=2S478Hj2jS47HI22RS47pIB3BS48HIR32S48pIj32S49`Ij2R,0*63 -!AIVDM,3,2,3,A,S4=HIB2RS4=pI22RS4>HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*48 -!AIVDM,3,3,3,A,HR22S588Hj22S5CpHB1h,0*4D -!AIVDM,3,1,4,B,8;U=g`25Nh=BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*2D -!AIVDM,3,2,4,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5E -!AIVDM,3,3,4,B,:iJ2TD4a;AIjTD4q;QIh,0*38 -!AIVDM,3,1,5,A,8;U=g`25Nh=RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*55 -!AIVDM,3,2,5,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*66 -!AIVDM,3,3,5,A,;1J2TKoI;QIjTKoq;iJ@,0*48 -$GPGGA,084349.000,4926.7572,N,01100.4374,E,1,11,1.0,317.7,M,47.8,M,,0000*5C -!AIVDM,3,1,6,B,8;U=g`25Nh=jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*41 -!AIVDM,3,2,6,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*49 -!AIVDM,3,3,6,B,;iJBTS59;QJBTS5q;1JP,0*73 -$GPGLL,4926.7572,N,01100.4374,E,084349.000,A,A*51 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -!AIVDM,3,1,7,A,8;U=g`25Nh>2TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5D -!AIVDM,3,2,7,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*60 -!AIVDM,3,3,7,A,:iJ2Tcsq;1J2Tct9;AIh,0*5C -$GPRMC,084349.000,A,4926.7572,N,01100.4374,E,0.15,24.44,281114,,,A*5B -!AIVDO,1,1,,,B>pf?VP00@BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*47 -!AIVDM,3,2,8,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*3A -!AIVDM,3,3,8,B,:iJ2U3ta;AIjU3tq;QIh,0*34 -!AIVDM,3,1,9,A,8;U=g`25Nh>RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*72 -!AIVDM,3,2,9,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*5F -!AIVDM,3,3,9,A,;AIja1Sq;1J2a1T9:QJ0,0*6A -!AIVDM,3,1,0,A,8;U=g`25Nh?2a9Ta:1JRa9Ua9iJBa9VI9QJBa;t99iJRa;ta:1JRa;tq:QJB,0*06 -!AIVDM,3,2,0,A,a;u9:iJ2a;uI;AIja;ua;QIja;v9;iJBaAN9;QJBaANq;AJRaARI:iJBaARq,0*76 -!AIVDM,3,3,0,A,:AJRaASa:1JRaATI9iJ@,0*13 -!AIVDM,3,1,1,B,8;U=g`25Nh?BaAU99QJBaCqa9iJRaCr9:1JRaCrI:QJ2aCra;1J2aCrq;AIj,0*3B -!AIVDM,3,2,1,B,aCs9;QIjaCsa;iJBaaN9<1JBaaQq;QJ2aaRa;AIjaaRq:iJ2aaS9:QJBaaSI,0*6F -!AIVDM,3,3,1,B,:1JRaaU99iJBaaV99QJ@,0*3E -!AIVDM,3,1,2,A,8;U=g`25Nh?Raahq91JBab;I9AJBacsq9QJRactI9iJjactq:AJBacu9:iJ2,0*00 -!AIVDM,3,2,2,A,acuI;1J2acua;QIjacv9;iJBaiQI<1JRaiS9;iJ2aiSa;QIjaiSq;AIjaiT9,0*39 -!AIVDM,3,3,2,A,;1J2aiTI:QJ2aiTa:AJP,0*3C -$GPGGA,084350.000,4926.7572,N,01100.4374,E,1,11,1.0,317.7,M,47.8,M,,0000*54 -!AIVDM,3,1,3,B,8;U=g`25Nh?jaiWI:1JBaiWq9iJBai`q9QJBb2aq9AJ2b2ba91IRb2dI9AJ2,0*6B -!AIVDM,3,2,3,B,c3sI9QJRc3sq9iJRc3ta:AJBc3tq:iJ2c3u9;1J2c3uI;QIjc3uq;iJ2c:79,0*3D -!AIVDM,3,3,3,B,;iJRc:7a;iK2c:89;AK@,0*51 -$GPGLL,4926.7572,N,01100.4374,E,084350.000,A,A*59 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -!AIVDM,3,1,4,A,8;U=g`25Nh@2c:8I;1KRc:8a:iKjc:99:AKjc::9:1LBc:HI:AKjc:Hq:iKR,0*12 -!AIVDM,3,2,4,A,c:I9;1KRc:II;AKBc:Ia;QK2c:J9;iJRcL=a;iJRcQca<1JBcQf9;iJBcQfa,0*0F -!AIVDM,3,3,4,A,;QJ2cP099AHOwwwwwwwh,0*5A -$GPRMC,084350.000,A,4926.7572,N,01100.4374,E,0.11,21.28,281114,,,A*58 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@KwQ4kP06,0*6B -$GPVTG,23.06,T,,M,0.10,N,0.2,K,A*39 -$GPGGA,084403.000,4926.7575,N,01100.4371,E,1,11,1.0,320.4,M,47.8,M,,0000*50 -$GPGLL,4926.7575,N,01100.4371,E,084403.000,A,A*5A -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084403.000,A,4926.7575,N,01100.4371,E,0.12,9.17,281114,,,A*6E -!AIVDO,1,1,,,B>pf?VP00@;U=g`0984O:wDNP010jHeJLBh=N4?wt1PQJ,0*29 -$GPGGA,084404.000,4926.7576,N,01100.4371,E,1,11,1.0,320.9,M,47.8,M,,0000*59 -$GPGLL,4926.7576,N,01100.4371,E,084404.000,A,A*5E -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084404.000,A,4926.7576,N,01100.4371,E,0.09,18.54,281114,,,A*57 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP00@pf?VP00@O:wDNP010jHeFLBhpf?VP00Ppf?VP00P4?wtAU2h,0*33 -$GPGGA,084410.000,4926.7585,N,01100.4369,E,1,11,1.0,324.8,M,47.8,M,,0000*5C -$GPGLL,4926.7585,N,01100.4369,E,084410.000,A,A*5E -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084410.000,A,4926.7585,N,01100.4369,E,0.19,6.76,281114,,,A*69 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@O:wDNP010jHe@LBh;v4?wt1PQJ,0*1D -$GPGGA,084412.000,4926.7589,N,01100.4369,E,1,11,1.0,326.4,M,47.8,M,,0000*5C -$GPGLL,4926.7589,N,01100.4369,E,084412.000,A,A*50 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.3*32 -$GPRMC,084412.000,A,4926.7589,N,01100.4369,E,0.18,4.51,281114,,,A*61 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000GwkTkP06,0*40 -$GPVTG,22.98,T,,M,0.08,N,0.1,K,A*35 -$GPGGA,084440.000,4926.7635,N,01100.4369,E,1,11,1.0,342.9,M,47.8,M,,0000*50 -$GPGLL,4926.7635,N,01100.4369,E,084440.000,A,A*53 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.2*33 -$GPRMC,084440.000,A,4926.7635,N,01100.4369,E,0.10,24.52,281114,,,A*5B -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000Kwr4kP06,0*54 -$GPVTG,23.07,T,,M,0.08,N,0.2,K,A*31 -$GPGGA,084453.000,4926.7651,N,01100.4381,E,1,11,1.0,347.9,M,47.8,M,,0000*53 -$GPGLL,4926.7651,N,01100.4381,E,084453.000,A,A*55 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.2*33 -$GPRMC,084453.000,A,4926.7651,N,01100.4381,E,0.09,18.20,281114,,,A*5F -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP000O:wDNP010jHe@LBh8v4?wt1t00,0*21 -$GPGGA,084501.000,4926.7661,N,01100.4390,E,1,11,1.0,350.8,M,47.8,M,,0000*51 -$GPGLL,4926.7661,N,01100.4390,E,084501.000,A,A*50 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.2*33 -$GPGSV,3,1,12,27,86,175,39,22,63,132,38,19,59,299,37,18,45,065,42*7B -$GPGSV,3,2,12,16,33,197,19,04,27,258,29,21,23,073,43,11,14,271,25*79 -$GPGSV,3,3,12,15,11,038,46,30,07,316,30,07,05,286,29,14,03,134,28*7B -$GPRMC,084501.000,A,4926.7661,N,01100.4390,E,0.05,17.73,281114,,,A*5F -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP00@pf?VP00@O:wDNP010jHepf?VP00@pf?VP00@pf?VP00@pf?VP00@>O:wD@lt:04=@UHD000000,2*23 -$GPGGA,084509.000,4926.7669,N,01100.4400,E,1,10,1.4,353.4,M,47.8,M,,0000*55 -$GPGLL,4926.7669,N,01100.4400,E,084509.000,A,A*5E -$GPGSA,A,3,21,18,27,19,15,30,04,07,22,11,,,2.0,1.4,1.4*33 -$GPRMC,084509.000,A,4926.7669,N,01100.4400,E,0.12,15.44,281114,,,A*51 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP00@pf?VP00@O:wDNP010jHeBLBh5f4?wt1t00,0*3E -$GPGGA,084513.000,4926.7673,N,01100.4405,E,1,10,1.4,354.5,M,47.8,M,,0000*56 -$GPGLL,4926.7673,N,01100.4405,E,084513.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,04,07,22,11,,,2.0,1.4,1.4*33 -$GPRMC,084513.000,A,4926.7673,N,01100.4405,E,0.11,9.75,281114,,,A*68 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00Ppf?VP00@pf?VP00@pf?VP000?wd4kP06,0*0B -$GPVTG,22.70,T,,M,0.05,N,0.1,K,A*3E -$GPGGA,084525.000,4926.7679,N,01100.4414,E,1,10,1.0,356.6,M,47.8,M,,0000*5C -$GPGLL,4926.7679,N,01100.4414,E,084525.000,A,A*54 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,,,1.6,1.0,1.3*32 -$GPRMC,084525.000,A,4926.7679,N,01100.4414,E,0.07,9.17,281114,,,A*64 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP00@SwlTkP06,0*26 -$GPVTG,228.00,T,,M,0.10,N,0.2,K,A*06 -$GPGGA,084542.000,4926.7675,N,01100.4416,E,1,10,1.0,356.5,M,47.8,M,,0000*50 -$GPGLL,4926.7675,N,01100.4416,E,084542.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,,,1.6,1.0,1.3*32 -$GPRMC,084542.000,A,4926.7675,N,01100.4416,E,0.07,259.20,281114,,,A*68 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP000cwrTkP06,0*36 -$GPVTG,125.89,T,,M,0.06,N,0.1,K,A*0D -$GPGGA,084554.000,4926.7656,N,01100.4411,E,1,10,1.0,352.7,M,47.8,M,,0000*57 -$GPGLL,4926.7656,N,01100.4411,E,084554.000,A,A*5A -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,,,1.6,1.0,1.3*32 -$GPRMC,084554.000,A,4926.7656,N,01100.4411,E,0.08,120.10,281114,,,A*68 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000;U=g`0984pf?VP000pf?VP000pf?VP000pf?VP000pf?VP0004?wtAU2p,0*02 -$GPRMC,084616.000,A,4926.7617,N,01100.4401,E,0.05,87.57,281114,,,A*5B -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000H,0*04 -!AIVDM,3,3,7,A,Hj22S27`Hj2BS288Hj2h,0*4E -!AIVDM,3,1,8,B,8;U=g`25Nh0jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*7F -!AIVDM,3,2,8,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*09 -!AIVDM,3,3,8,B,H23jS468HB3BS46`HR30,0*04 -!AIVDM,3,1,9,A,8;U=g`25Nh12S478Hj2jS47HI22RS47pIB3BS48HIR32S48pIj32S49`Ij2R,0*65 -!AIVDM,3,2,9,A,S4=HIB2RS4=pI22RS4>HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*42 -!AIVDM,3,3,9,A,HR22S588Hj22S5CpHB1h,0*47 -!AIVDM,3,1,0,B,8;U=g`25Nh1BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*25 -!AIVDM,3,2,0,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5A -!AIVDM,3,3,0,B,:iJ2TD4a;AIjTD4q;QIh,0*3C -!AIVDM,3,1,1,A,8;U=g`25Nh1RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*5D -!AIVDM,3,2,1,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*62 -!AIVDM,3,3,1,A,;1J2TKoI;QIjTKoq;iJ@,0*4C -!AIVDM,3,1,2,B,8;U=g`25Nh1jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*49 -!AIVDM,3,2,2,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*4D -!AIVDM,3,3,2,B,;iJBTS59;QJBTS5q;1JP,0*77 -!AIVDM,3,1,3,A,8;U=g`25Nh22TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*55 -!AIVDM,3,2,3,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*64 -!AIVDM,3,3,3,A,:iJ2Tcsq;1J2Tct9;AIh,0*58 -$GPGGA,084650.000,4926.7595,N,01100.4387,E,1,11,1.0,338.4,M,47.8,M,,0000*5A -$GPGLL,4926.7595,N,01100.4387,E,084650.000,A,A*59 -!AIVDM,3,1,4,B,8;U=g`25Nh2BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*47 -!AIVDM,3,2,4,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*36 -!AIVDM,3,3,4,B,:iJ2U3ta;AIjU3tq;QIh,0*38 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,11,,1.6,1.0,1.2*33 -$GPRMC,084650.000,A,4926.7595,N,01100.4387,E,0.05,29.50,281114,,,A*5A -!AIVDO,1,1,,,B>pf?VP000H,0*00 -!AIVDM,3,3,3,A,Hj22S27`Hj2BS288Hj2h,0*4A -$GPGSV,3,2,12,16,32,196,27,04,29,259,33,21,22,074,41,11,15,272,18*78 -!AIVDM,3,1,4,B,8;U=g`25Nh4jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*77 -!AIVDM,3,2,4,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*05 -!AIVDM,3,3,4,B,H23jS468HB3BS46`HR30,0*08 -$GPGSV,3,3,12,15,11,037,41,30,07,315,29,07,05,285,14,14,04,134,27*7D -$GPRMC,084651.000,A,4926.7595,N,01100.4386,E,0.07,24.77,281114,,,A*50 -!AIVDO,1,1,,,B>pf?VP000HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4E -!AIVDM,3,3,5,A,HR22S588Hj22S5CpHB1h,0*4B -$GPVTG,24.77,T,,M,0.07,N,0.1,K,A*3D -!AIVDM,3,1,6,B,8;U=g`25Nh5BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*27 -!AIVDM,3,2,6,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5C -!AIVDM,3,3,6,B,:iJ2TD4a;AIjTD4q;QIh,0*3A -!AIVDM,3,1,7,A,8;U=g`25Nh5RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*5F -!AIVDM,3,2,7,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*64 -!AIVDM,3,3,7,A,;1J2TKoI;QIjTKoq;iJ@,0*4A -!AIVDM,3,1,8,B,8;U=g`25Nh5jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*47 -!AIVDM,3,2,8,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*47 -!AIVDM,3,3,8,B,;iJBTS59;QJBTS5q;1JP,0*7D -!AIVDM,3,1,9,A,8;U=g`25Nh62TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5B -!AIVDM,3,2,9,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*6E -!AIVDM,3,3,9,A,:iJ2Tcsq;1J2Tct9;AIh,0*52 -$GPGGA,084652.000,4926.7595,N,01100.4386,E,1,10,1.0,338.1,M,47.8,M,,0000*5D -$GPGLL,4926.7595,N,01100.4386,E,084652.000,A,A*5A -!AIVDM,3,1,0,B,8;U=g`25Nh6BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*47 -!AIVDM,3,2,0,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*32 -!AIVDM,3,3,0,B,:iJ2U3ta;AIjU3tq;QIh,0*3C -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.6,1.0,1.3*35 -!AIVDM,3,1,1,A,8;U=g`25Nh6RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*72 -!AIVDM,3,2,1,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*57 -!AIVDM,3,3,1,A,;AIja1Sq;1J2a1T9:QJ0,0*62 -$GPRMC,084652.000,A,4926.7595,N,01100.4386,E,0.08,34.63,281114,,,A*58 -!AIVDO,1,1,,,B>pf?VP000H,0*0A -!AIVDM,3,3,9,A,Hj22S27`Hj2BS288Hj2h,0*40 -$GPRMC,084653.000,A,4926.7595,N,01100.4386,E,0.09,46.14,281114,,,A*5D -!AIVDO,1,1,,,B>pf?VP000HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4A -!AIVDM,3,3,1,A,HR22S588Hj22S5CpHB1h,0*4F -!AIVDM,3,1,2,B,8;U=g`25Nh9BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*2F -!AIVDM,3,2,2,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*58 -!AIVDM,3,3,2,B,:iJ2TD4a;AIjTD4q;QIh,0*3E -!AIVDM,3,1,3,A,8;U=g`25Nh9RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*57 -!AIVDM,3,2,3,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*60 -!AIVDM,3,3,3,A,;1J2TKoI;QIjTKoq;iJ@,0*4E -!AIVDM,3,1,4,B,8;U=g`25Nh9jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*47 -!AIVDM,3,2,4,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*4B -!AIVDM,3,3,4,B,;iJBTS59;QJBTS5q;1JP,0*71 -!AIVDM,3,1,5,A,8;U=g`25Nh:2TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5B -!AIVDM,3,2,5,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*62 -!AIVDM,3,3,5,A,:iJ2Tcsq;1J2Tct9;AIh,0*5E -$GPGGA,084654.000,4926.7594,N,01100.4386,E,1,10,1.0,337.9,M,47.8,M,,0000*5D -!AIVDM,3,1,6,B,8;U=g`25Nh:BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*4D -!AIVDM,3,2,6,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*34 -!AIVDM,3,3,6,B,:iJ2U3ta;AIjU3tq;QIh,0*3A -$GPGLL,4926.7594,N,01100.4386,E,084654.000,A,A*5D -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.6,1.0,1.3*35 -!AIVDM,3,1,7,A,8;U=g`25Nh:RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*78 -!AIVDM,3,2,7,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*51 -!AIVDM,3,3,7,A,;AIja1Sq;1J2a1T9:QJ0,0*64 -$GPRMC,084654.000,A,4926.7594,N,01100.4386,E,0.08,38.68,281114,,,A*58 -!AIVDO,1,1,,,B>pf?VP000H,0*07 -!AIVDM,3,3,4,A,Hj22S27`Hj2BS288Hj2h,0*4D -$GPRMC,084655.000,A,4926.7594,N,01100.4386,E,0.13,40.07,281114,,,A*55 -!AIVDO,1,1,,,B>pf?VP00@HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4D -!AIVDM,3,3,6,A,HR22S588Hj22S5CpHB1h,0*48 -!AIVDM,3,1,7,B,8;U=g`25Nh=BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*2E -!AIVDM,3,2,7,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5D -!AIVDM,3,3,7,B,:iJ2TD4a;AIjTD4q;QIh,0*3B -!AIVDM,3,1,8,A,8;U=g`25Nh=RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*58 -!AIVDM,3,2,8,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*6B -!AIVDM,3,3,8,A,;1J2TKoI;QIjTKoq;iJ@,0*45 -!AIVDM,3,1,9,B,8;U=g`25Nh=jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*4E -!AIVDM,3,2,9,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*46 -!AIVDM,3,3,9,B,;iJBTS59;QJBTS5q;1JP,0*7C -!AIVDM,3,1,0,A,8;U=g`25Nh>2TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5A -!AIVDM,3,2,0,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*67 -!AIVDM,3,3,0,A,:iJ2Tcsq;1J2Tct9;AIh,0*5B -$GPGGA,084656.000,4926.7594,N,01100.4385,E,1,10,1.0,337.7,M,47.8,M,,0000*52 -!AIVDM,3,1,1,B,8;U=g`25Nh>BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*4E -!AIVDM,3,2,1,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*33 -!AIVDM,3,3,1,B,:iJ2U3ta;AIjU3tq;QIh,0*3D -$GPGLL,4926.7594,N,01100.4385,E,084656.000,A,A*5C -!AIVDM,3,1,2,A,8;U=g`25Nh>RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*79 -!AIVDM,3,2,2,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*54 -!AIVDM,3,3,2,A,;AIja1Sq;1J2a1T9:QJ0,0*61 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.6,1.0,1.3*35 -$GPGSV,3,1,12,27,85,164,37,22,64,129,38,19,60,299,36,18,44,063,41*74 -!AIVDM,3,1,3,B,8;U=g`25Nh>ja1TI:AJRa1U9:1JBa1Ua9QJRa1VI9QJBa3sq9iJRa3v9:1JR,0*31 -!AIVDM,3,2,3,B,a3va:AJRa3vq:QJBa40I:iJ2a419;AJBa41a;QJBa429;iJBa9PI;QJBa9Q9,0*5F -!AIVDM,3,3,3,B,;AJRa9Sa:iJBa9T9:AJ@,0*01 -$GPGSV,3,2,12,16,32,196,22,04,29,259,33,21,22,074,41,11,15,272,18*7D -$GPGSV,3,3,12,15,11,037,41,30,07,315,29,07,05,285,15,14,04,134,28*73 -!AIVDM,3,1,4,A,8;U=g`25Nh?2a9Ta:1JRa9Ua9iJBa9VI9QJBa;t99iJRa;ta:1JRa;tq:QJB,0*02 -!AIVDM,3,2,4,A,a;u9:iJ2a;uI;AIja;ua;QIja;v9;iJBaAN9;QJBaANq;AJRaARI:iJBaARq,0*72 -!AIVDM,3,3,4,A,:AJRaASa:1JRaATI9iJ@,0*17 -$GPRMC,084656.000,A,4926.7594,N,01100.4385,E,0.12,39.29,281114,,,A*56 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@;U=g`0984pf?VP00@pf?VP00@pf?VP00@pf?VP00@4?wtAU2t,0*7E -$GPGGA,084715.000,4926.7591,N,01100.4388,E,1,10,1.0,335.6,M,47.8,M,,0000*5F -$GPGLL,4926.7591,N,01100.4388,E,084715.000,A,A*52 -$GPGSA,A,3,21,18,27,19,15,30,16,04,07,22,,,1.6,1.0,1.2*33 -$GPRMC,084715.000,A,4926.7591,N,01100.4388,E,0.10,353.64,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00Ppf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP000H,0*02 -!AIVDM,3,3,1,A,Hj22S27`Hj2BS288Hj2h,0*48 -!AIVDM,3,1,2,A,8;U=g`25Nh12S478Hj2jS47HI22RS47pIB3BS48HIR32S48pIj32S49`Ij2R,0*6E -!AIVDM,3,2,2,A,S4=HIB2RS4=pI22RS4>HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*49 -!AIVDM,3,3,2,A,HR22S588Hj22S5CpHB1h,0*4C -!AIVDM,3,1,3,B,8;U=g`25Nh1BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*26 -!AIVDM,3,2,3,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*59 -!AIVDM,3,3,3,B,:iJ2TD4a;AIjTD4q;QIh,0*3F -!AIVDM,3,1,4,A,8;U=g`25Nh1RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*58 -!AIVDM,3,2,4,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*67 -!AIVDM,3,3,4,A,;1J2TKoI;QIjTKoq;iJ@,0*49 -!AIVDM,3,1,5,B,8;U=g`25Nh1jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*4E -!AIVDM,3,2,5,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*4A -!AIVDM,3,3,5,B,;iJBTS59;QJBTS5q;1JP,0*70 -$GPGGA,084750.000,4926.7596,N,01100.4410,E,1,09,1.0,336.2,M,47.8,M,,0000*50 -$GPGLL,4926.7596,N,01100.4410,E,084750.000,A,A*52 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.7,1.0,1.3*34 -$GPRMC,084750.000,A,4926.7596,N,01100.4410,E,0.04,330.75,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP000gwq4kP06,0*3F -$GPVTG,330.75,T,,M,0.04,N,0.1,K,A*0A -!AIVDM,3,1,6,B,8;U=g`25Nh2ja1TI:AJRa1U9:1JBa1Ua9QJRa1VI9QJBa3sq9iJRa3v9:1JR,0*38 -!AIVDM,3,2,6,B,a3va:AJRa3vq:QJBa40I:iJ2a419;AJBa41a;QJBa429;iJBa9PI;QJBa9Q9,0*5A -!AIVDM,3,3,6,B,;AJRa9Sa:iJBa9T9:AJ@,0*04 -!AIVDM,3,1,7,A,8;U=g`25Nh32a9Ta:1JRa9Ua9iJBa9VI9QJBa;t99iJRa;ta:1JRa;tq:QJB,0*0D -!AIVDM,3,2,7,A,a;u9:iJ2a;uI;AIja;ua;QIja;v9;iJBaAN9;QJBaANq;AJRaARI:iJBaARq,0*71 -!AIVDM,3,3,7,A,:AJRaASa:1JRaATI9iJ@,0*14 -!AIVDM,3,1,8,B,8;U=g`25Nh3BaAU99QJBaCqa9iJRaCr9:1JRaCrI:QJ2aCra;1J2aCrq;AIj,0*3E -!AIVDM,3,2,8,B,aCs9;QIjaCsa;iJBaaN9<1JBaaQq;QJ2aaRa;AIjaaRq:iJ2aaS9:QJBaaSI,0*66 -!AIVDM,3,3,8,B,:1JRaaU99iJBaaV99QJ@,0*37 -!AIVDM,3,1,9,A,8;U=g`25Nh3Raahq91JBab;I9AJBacsq9QJRactI9iJjactq:AJBacu9:iJ2,0*07 -!AIVDM,3,2,9,A,acuI;1J2acua;QIjacv9;iJBaiQI<1JRaiS9;iJ2aiSa;QIjaiSq;AIjaiT9,0*32 -!AIVDM,3,3,9,A,;1J2aiTI:QJ2aiTa:AJP,0*37 -!AIVDM,3,1,0,B,8;U=g`25Nh3jaiWI:1JBaiWq9iJBai`q9QJBb2aq9AJ2b2ba91IRb2dI9AJ2,0*64 -!AIVDM,3,2,0,B,c3sI9QJRc3sq9iJRc3ta:AJBc3tq:iJ2c3u9;1J2c3uI;QIjc3uq;iJ2c:79,0*3E -!AIVDM,3,3,0,B,;iJRc:7a;iK2c:89;AK@,0*52 -$GPGGA,084751.000,4926.7597,N,01100.4410,E,1,09,1.0,336.2,M,47.8,M,,0000*50 -!AIVDM,3,1,1,A,8;U=g`25Nh42c:8I;1KRc:8a:iKjc:99:AKjc::9:1LBc:HI:AKjc:Hq:iKR,0*63 -!AIVDM,3,2,1,A,c:I9;1KRc:II;AKBc:Ia;QK2c:J9;iJRcL=a;iJRcQca<1JBcQf9;iJBcQfa,0*0A -!AIVDM,3,3,1,A,;QJ2cQh9;AIjcQhI:iJ0,0*05 -$GPGLL,4926.7597,N,01100.4410,E,084751.000,A,A*52 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.7,1.0,1.3*34 -!AIVDM,3,1,2,B,8;U=g`25Nh4B4A4H4A4BRrp`HinBRrq8HinRRrq`Hio2Rrr8HioBRrrpHip2,0*07 -!AIVDM,3,2,2,B,RrsHHQpRRrspHQq2RrtHHQqRRrt`HQr2Rru8HArRRruHHAsBRru`HAt2Rrup,0*3A -!AIVDM,3,3,2,B,HAtjRrv8H1uBRrvHH1uh,0*5A -$GPGSV,3,1,12,27,85,164,37,22,64,129,35,19,60,299,36,18,44,063,36*79 -!AIVDM,3,1,3,A,8;U=g`25Nh4RRrv`H1vBRrvpH1w2Rs08H1wRRs0HH202Rs0`H20jRs18HB12,0*79 -!AIVDM,3,2,3,A,Rs1HHB1RRs1`HR1jRs1pHR22Rs2HI22RRs2pIB2RRs=HI22RRs=pHj2BRs>H,0*00 -!AIVDM,3,3,3,A,Hj22S27`Hj2BS288Hj2h,0*4A -$GPGSV,3,2,12,16,32,196,30,04,29,259,30,21,22,074,41,11,15,272,17*72 -$GPGSV,3,3,12,15,11,037,43,30,07,315,27,07,05,285,30,14,04,134,23*73 -!AIVDM,3,1,4,B,8;U=g`25Nh4jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*77 -!AIVDM,3,2,4,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*05 -!AIVDM,3,3,4,B,H23jS468HB3BS46`HR30,0*08 -$GPRMC,084751.000,A,4926.7597,N,01100.4410,E,0.06,316.13,281114,,,A*6A -!AIVDO,1,1,,,B>pf?VP000HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4E -!AIVDM,3,3,5,A,HR22S588Hj22S5CpHB1h,0*4B -!AIVDM,3,1,6,B,8;U=g`25Nh5BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*27 -!AIVDM,3,2,6,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5C -!AIVDM,3,3,6,B,:iJ2TD4a;AIjTD4q;QIh,0*3A -!AIVDM,3,1,7,A,8;U=g`25Nh5RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*5F -!AIVDM,3,2,7,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*64 -!AIVDM,3,3,7,A,;1J2TKoI;QIjTKoq;iJ@,0*4A -!AIVDM,3,1,8,B,8;U=g`25Nh5jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*47 -!AIVDM,3,2,8,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*47 -!AIVDM,3,3,8,B,;iJBTS59;QJBTS5q;1JP,0*7D -!AIVDM,3,1,9,A,8;U=g`25Nh62TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5B -!AIVDM,3,2,9,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*6E -!AIVDM,3,3,9,A,:iJ2Tcsq;1J2Tct9;AIh,0*52 -$GPGGA,084752.000,4926.7597,N,01100.4410,E,1,09,1.0,336.2,M,47.8,M,,0000*53 -$GPGLL,4926.7597,N,01100.4410,E,084752.000,A,A*51 -!AIVDM,3,1,0,B,8;U=g`25Nh6BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*47 -!AIVDM,3,2,0,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*32 -!AIVDM,3,3,0,B,:iJ2U3ta;AIjU3tq;QIh,0*3C -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.7,1.0,1.3*34 -$GPRMC,084752.000,A,4926.7597,N,01100.4410,E,0.04,244.95,281114,,,A*63 -!AIVDO,1,1,,,B>pf?VP000pf?VP000H,0*0A -!AIVDM,3,3,9,A,Hj22S27`Hj2BS288Hj2h,0*40 -$GPVTG,308.49,T,,M,0.04,N,0.1,K,A*0E -!AIVDM,3,1,0,B,8;U=g`25Nh8jS28HHR32S28pHB3BS2:`H23RS2:pH242S2;8Gj4BS2;HGj4j,0*7F -!AIVDM,3,2,0,B,S2;`GR52S2;pGB5BS2<`G25RS438GB5RS44pGR52S458Gj4jS45`H242S45p,0*01 -!AIVDM,3,3,0,B,H23jS468HB3BS46`HR30,0*0C -!AIVDM,3,1,1,A,8;U=g`25Nh92S478Hj2jS47HI22RS47pIB3BS48HIR32S48pIj32S49`Ij2R,0*65 -!AIVDM,3,2,1,A,S4=HIB2RS4=pI22RS4>HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4A -!AIVDM,3,3,1,A,HR22S588Hj22S5CpHB1h,0*4F -$PWDC,RES,TX-TRIALS,11*58 -!AIVDM,3,1,2,B,8;U=g`25Nh9BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*2F -!AIVDM,3,2,2,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*58 -!AIVDM,3,3,2,B,:iJ2TD4a;AIjTD4q;QIh,0*3E -!AIVDM,3,1,3,A,8;U=g`25Nh9RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*57 -!AIVDM,3,2,3,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*60 -!AIVDM,3,3,3,A,;1J2TKoI;QIjTKoq;iJ@,0*4E -!AIVDM,3,1,4,B,8;U=g`25Nh9jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*47 -!AIVDM,3,2,4,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*4B -!AIVDM,3,3,4,B,;iJBTS59;QJBTS5q;1JP,0*71 -!AIVDM,3,1,5,A,8;U=g`25Nh:2TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5B -!AIVDM,3,2,5,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*62 -!AIVDM,3,3,5,A,:iJ2Tcsq;1J2Tct9;AIh,0*5E -$GPGGA,084754.000,4926.7599,N,01100.4411,E,1,09,1.0,336.2,M,47.8,M,,0000*5A -$GPGLL,4926.7599,N,01100.4411,E,084754.000,A,A*58 -!AIVDM,3,1,6,B,8;U=g`25Nh:BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*4D -!AIVDM,3,2,6,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*34 -!AIVDM,3,3,6,B,:iJ2U3ta;AIjU3tq;QIh,0*3A -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.7,1.0,1.3*34 -!AIVDM,3,1,7,A,8;U=g`25Nh:RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*78 -!AIVDM,3,2,7,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*51 -!AIVDM,3,3,7,A,;AIja1Sq;1J2a1T9:QJ0,0*64 -$GPRMC,084754.000,A,4926.7599,N,01100.4411,E,0.10,337.98,281114,,,A*67 -!AIVDO,1,1,,,B>pf?VP00@H,0*07 -!AIVDM,3,3,4,A,Hj22S27`Hj2BS288Hj2h,0*4D -$GPRMC,084755.000,A,4926.7600,N,01100.4411,E,0.06,192.64,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP000HHj2BS4eHHj22S4qpIB1jS4s`I222S4upHj2RS50p,0*4D -!AIVDM,3,3,6,A,HR22S588Hj22S5CpHB1h,0*48 -!AIVDM,3,1,7,B,8;U=g`25Nh=BS5DpHj22TAMa;QJ2TANI;AJ2TANa:iJ2TANq:QJBTAPI:1JR,0*2E -!AIVDM,3,2,7,B,TAQ99iJBTAQq9QJBTBVa9QJRTBha9AJBTD3I9iJRTD3q:AJRTD49:QJBTD4I,0*5D -!AIVDM,3,3,7,B,:iJ2TD4a;AIjTD4q;QIh,0*3B -!AIVDM,3,1,8,A,8;U=g`25Nh=RTD5I;iJBTINq;QIjTIP9;AIjTIPI;1J2TIPa:QJ2TIPq:AJR,0*58 -!AIVDM,3,2,8,A,TIQI:1JRTIQq9iJjTISa9QJBTKlq9iJjTKna:1JRTKnq:AJBTKnq:iJ2TKo9,0*6B -!AIVDM,3,3,8,A,;1J2TKoI;QIjTKoq;iJ@,0*45 -!AIVDM,3,1,9,B,8;U=g`25Nh=jTQS9<1JBTREa;iJRTRLq;iK2TRMI;AK2TRMa;1KBTRMq:iKR,0*4E -!AIVDM,3,2,9,B,TRNI:QKjTRP9:1L2TRPq9iLBTRn9:1L2TRo9;1KRTRoa;AK2TRpI;iJjTS4a,0*46 -!AIVDM,3,3,9,B,;iJBTS59;QJBTS5q;1JP,0*7C -!AIVDM,3,1,0,A,8;U=g`25Nh>2TS:a;QJBTS;9;iJBTaNq;QJBTaPa;AJRTaR9:iJBTaRa:QJB,0*5A -!AIVDM,3,2,0,A,TaS9:AJRTaSa:1JBTaT99iJBTaU99QJBTcrI9iJRTcs9:1JRTcsI:AJBTcsa,0*67 -!AIVDM,3,3,0,A,:iJ2Tcsq;1J2Tct9;AIh,0*5B -$GPGGA,084756.000,4926.7601,N,01100.4412,E,1,09,1.0,336.4,M,47.8,M,,0000*5F -!AIVDM,3,1,1,B,8;U=g`25Nh>BTcta;iJ2TrDI;iJRU1U9;QJ2U1Uq;1J2U1V9:iJ2U1VI:AJB,0*4E -!AIVDM,3,2,1,B,U1Va:1JRU1W9:1JBU1Wa9QJRU1`I9AJBU3s99iJRU3sq:AJRU3t9:QJBU3tI,0*33 -!AIVDM,3,3,1,B,:iJ2U3ta;AIjU3tq;QIh,0*3D -$GPGLL,4926.7601,N,01100.4412,E,084756.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.7,1.0,1.3*34 -!AIVDM,3,1,2,A,8;U=g`25Nh>RU3ua;QJBU9Ja;iJBU9M9<1J2U9Na;QIjU9Nq;AIjU9P9:iJ2,0*79 -!AIVDM,3,2,2,A,U9PI:QJBU9Pa:AJRU9Qa9iJBU9RI9QJBa1Nq;iJRa1Pq<1JRa1Rq;iJ2a1Sa,0*54 -!AIVDM,3,3,2,A,;AIja1Sq;1J2a1T9:QJ0,0*61 -$GPGSV,3,1,12,27,85,164,36,22,64,129,35,19,60,299,36,18,44,063,36*78 -!AIVDM,3,1,3,B,8;U=g`25Nh>ja1TI:AJRa1U9:1JBa1Ua9QJRa1VI9QJBa3sq9iJRa3v9:1JR,0*31 -!AIVDM,3,2,3,B,a3va:AJRa3vq:QJBa40I:iJ2a419;AJBa41a;QJBa429;iJBa9PI;QJBa9Q9,0*5F -!AIVDM,3,3,3,B,;AJRa9Sa:iJBa9T9:AJ@,0*01 -$GPGSV,3,2,12,16,32,196,25,04,29,259,30,21,22,074,41,11,15,272,16*77 -$GPGSV,3,3,12,15,11,037,43,30,07,315,28,07,05,285,30,14,04,134,23*7C -!AIVDM,3,1,4,A,8;U=g`25Nh?2a9Ta:1JRa9Ua9iJBa9VI9QJBa;t99iJRa;ta:1JRa;tq:QJB,0*02 -!AIVDM,3,2,4,A,a;u9:iJ2a;uI;AIja;ua;QIja;v9;iJBaAN9;QJBaANq;AJRaARI:iJBaARq,0*72 -!AIVDM,3,3,4,A,:AJRaASa:1JRaATI9iJ@,0*17 -$GPRMC,084756.000,A,4926.7601,N,01100.4412,E,0.10,331.69,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@;U=g`0984pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@W4dC4UGwWTkP06,0*34 -$GPVTG,59.73,T,,M,0.14,N,0.3,K,A*33 -$GPGGA,084816.000,4926.7635,N,01100.4447,E,1,10,1.0,342.2,M,47.8,M,,0000*5E -$GPGLL,4926.7635,N,01100.4447,E,084816.000,A,A*57 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.6,1.0,1.3*35 -$GPGSV,3,1,12,27,84,159,38,22,64,127,36,19,61,299,34,18,43,063,39*7F -$GPGSV,3,2,12,16,31,196,26,04,29,259,30,21,22,074,37,11,16,272,23*73 -$GPGSV,3,3,12,15,11,036,43,30,07,315,30,14,04,133,21,07,04,285,29*78 -!AIVDM,1,1,,B,1;U=g`?P010jHePLBgv>4?wtAU30,0*37 -$GPRMC,084816.000,A,4926.7635,N,01100.4447,E,0.11,84.50,281114,,,A*56 -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP00@4?wtAU30,0*37 -$GPGGA,084819.000,4926.7641,N,01100.4454,E,1,10,1.0,343.3,M,47.8,M,,0000*50 -$GPGLL,4926.7641,N,01100.4454,E,084819.000,A,A*59 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.6,1.0,1.3*35 -$GPRMC,084819.000,A,4926.7641,N,01100.4454,E,0.15,35.61,281114,,,A*54 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP00@pf?VP00Ppf?VP00@pf?VP00@pf?VP00@pf?VP00@wwe4kP06,0*2D -$GPVTG,23.98,T,,M,0.13,N,0.2,K,A*3D -$GPGGA,084827.000,4926.7659,N,01100.4469,E,1,10,1.0,346.8,M,47.8,M,,0000*54 -$GPGLL,4926.7659,N,01100.4469,E,084827.000,A,A*53 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,11,,,1.6,1.0,1.3*35 -$GPRMC,084827.000,A,4926.7659,N,01100.4469,E,0.10,40.23,281114,,,A*5F -!AIVDO,1,1,,,B>pf?VP00@pf?VP00Ppf?VP00hpf?VP010pf?VP010pf?VP00hpf?VP00hpf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00Ppf?VP00PgwkTkP06,0*5F -$GPVTG,23.51,T,,M,0.20,N,0.4,K,A*3E -$GPGGA,084840.000,4926.7690,N,01100.4488,E,1,09,1.0,355.0,M,47.8,M,,0000*5D -$GPGLL,4926.7690,N,01100.4488,E,084840.000,A,A*58 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.7,1.0,1.3*34 -$GPRMC,084840.000,A,4926.7690,N,01100.4488,E,0.20,20.26,281114,,,A*54 -!AIVDO,1,1,,,B>pf?VP00Ppf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@;U=g`0984pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@LBh?f4?wtAU34,0*42 -$GPVTG,357.31,T,,M,0.10,N,0.2,K,A*0D -$GPGGA,084917.000,4926.7730,N,01100.4501,E,1,09,1.0,364.9,M,47.8,M,,0000*5E -$GPGLL,4926.7730,N,01100.4501,E,084917.000,A,A*50 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,,,,1.7,1.0,1.3*34 -$GPRMC,084917.000,A,4926.7730,N,01100.4501,E,0.09,8.05,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP000pf?VP000LBh?N4?wtAU34,0*6B -$GPGGA,084919.000,4926.7732,N,01100.4501,E,1,10,1.0,365.6,M,47.8,M,,0000*54 -$GPGLL,4926.7732,N,01100.4501,E,084919.000,A,A*5C -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,,,1.6,1.0,1.3*35 -$GPRMC,084919.000,A,4926.7732,N,01100.4501,E,0.10,42.52,281114,,,A*54 -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000Wwd4kP06,0*3D -$GPVTG,330.57,T,,M,0.08,N,0.2,K,A*05 -$GPGGA,084925.000,4926.7737,N,01100.4500,E,1,10,1.0,367.5,M,47.8,M,,0000*5E -$GPGLL,4926.7737,N,01100.4500,E,084925.000,A,A*57 -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,,,1.6,1.0,1.3*35 -$GPRMC,084925.000,A,4926.7737,N,01100.4500,E,0.08,318.87,281114,,,A*62 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@3wP4kP06,0*04 -$GPVTG,124.88,T,,M,0.13,N,0.2,K,A*0A -$GPGGA,085001.000,4926.7734,N,01100.4498,E,1,11,0.8,371.6,M,47.8,M,,0000*5F -$GPGLL,4926.7734,N,01100.4498,E,085001.000,A,A*5A -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,14,,1.3,0.8,1.0*3F -$GPGSV,3,1,12,27,84,158,39,22,64,126,38,19,61,299,35,18,43,062,42*7C -$GPGSV,3,2,12,16,31,196,28,04,30,259,34,21,21,075,36,11,16,272,21*70 -$GPGSV,3,3,12,15,10,036,40,30,07,314,31,14,05,133,23,07,04,284,33*73 -$GPRMC,085001.000,A,4926.7734,N,01100.4498,E,0.03,25.02,281114,,,A*54 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP00@pf?VP000pf?VP00@owRTkP06,0*49 -$GPVTG,330.94,T,,M,0.14,N,0.3,K,A*06 -$GPGGA,085006.000,4926.7729,N,01100.4496,E,1,10,0.8,371.5,M,47.8,M,,0000*58 -$GPGLL,4926.7729,N,01100.4496,E,085006.000,A,A*5F -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,14,,,1.3,0.8,1.0*3F -$GPGSV,3,1,12,27,84,158,39,22,64,126,38,19,61,299,35,18,43,062,44*7A -$GPGSV,3,2,12,16,31,196,29,04,30,259,34,21,21,075,36,11,16,272,20*70 -$GPGSV,3,3,12,15,10,036,39,30,07,314,30,14,05,133,24,07,04,284,33*7B -$GPRMC,085006.000,A,4926.7729,N,01100.4496,E,0.07,314.68,281114,,,A*68 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000cwTTkP06,0*2A -$GPVTG,23.47,T,,M,0.03,N,0.1,K,A*3D -$GPGGA,085010.000,4926.7726,N,01100.4495,E,1,10,0.8,371.0,M,47.8,M,,0000*56 -$GPGLL,4926.7726,N,01100.4495,E,085010.000,A,A*54 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,14,,,1.3,0.8,1.0*3F -$GPRMC,085010.000,A,4926.7726,N,01100.4495,E,0.04,355.52,281114,,,A*6C -!AIVDO,1,1,,,B>pf?VP000;U=g`0984pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP0004?wtAU38,0*75 -$GPGGA,085019.000,4926.7720,N,01100.4490,E,1,11,0.8,369.5,M,47.8,M,,0000*51 -$GPGLL,4926.7720,N,01100.4490,E,085019.000,A,A*5E -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,14,,1.3,0.8,1.0*3F -$GPRMC,085019.000,A,4926.7720,N,01100.4490,E,0.10,53.87,281114,,,A*5E -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP000pf?VP000Kwc4kP06,0*0E -$GPVTG,23.09,T,,M,0.07,N,0.1,K,A*33 -$GPGGA,085023.000,4926.7718,N,01100.4487,E,1,11,0.8,368.7,M,47.8,M,,0000*56 -$GPGLL,4926.7718,N,01100.4487,E,085023.000,A,A*5A -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,14,,1.3,0.8,1.0*3F -$GPRMC,085023.000,A,4926.7718,N,01100.4487,E,0.08,23.61,281114,,,A*5C -!AIVDO,1,1,,,B>pf?VP000kwcTkP06,0*2D -$GPVTG,23.61,T,,M,0.08,N,0.2,K,A*31 -$GPGGA,085024.000,4926.7718,N,01100.4487,E,1,11,0.8,368.5,M,47.8,M,,0000*53 -$GPGLL,4926.7718,N,01100.4487,E,085024.000,A,A*5D -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,14,,1.3,0.8,1.0*3F -$GPRMC,085024.000,A,4926.7718,N,01100.4487,E,0.08,15.33,281114,,,A*59 -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000KweTkP06,0*62 -$GPVTG,23.07,T,,M,0.08,N,0.1,K,A*32 -$GPGGA,085028.000,4926.7716,N,01100.4483,E,1,11,0.8,367.7,M,47.8,M,,0000*58 -$GPGLL,4926.7716,N,01100.4483,E,085028.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,14,,1.3,0.8,1.0*3F -$GPRMC,085028.000,A,4926.7716,N,01100.4483,E,0.08,15.13,281114,,,A*5D -!AIVDO,1,1,,,B>pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP00@gwkTkP06,0*76 -$GPVTG,330.76,T,,M,0.10,N,0.2,K,A*0F -$GPGGA,085040.000,4926.7711,N,01100.4472,E,1,11,0.8,365.5,M,47.8,M,,0000*5F -$GPGLL,4926.7711,N,01100.4472,E,085040.000,A,A*5C -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,14,,1.3,0.8,1.0*3F -$GPRMC,085040.000,A,4926.7711,N,01100.4472,E,0.09,36.52,281114,,,A*5F -!AIVDO,1,1,,,B>pf?VP000pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000pf?VP000gwQ4kP06,0*4A -$GPVTG,23.59,T,,M,0.08,N,0.2,K,A*3A -$GPGGA,085103.000,4926.7709,N,01100.4451,E,1,10,0.8,363.2,M,47.8,M,,0000*51 -$GPGLL,4926.7709,N,01100.4451,E,085103.000,A,A*52 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,14,,,1.3,0.8,1.0*3F -$GPRMC,085103.000,A,4926.7709,N,01100.4451,E,0.10,23.28,281114,,,A*50 -!AIVDO,1,1,,,B>pf?VP00@SwQTkP06,0*6E -$GPVTG,23.28,T,,M,0.10,N,0.2,K,A*35 -$GPGGA,085104.000,4926.7709,N,01100.4451,E,1,10,0.8,363.1,M,47.8,M,,0000*55 -$GPGLL,4926.7709,N,01100.4451,E,085104.000,A,A*55 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,14,,,1.3,0.8,1.0*3F -$GPRMC,085104.000,A,4926.7709,N,01100.4451,E,0.10,27.73,281114,,,A*5D -!AIVDO,1,1,,,B>pf?VP00@pf?VP000GwRTkP06,0*09 -$GPVTG,22.93,T,,M,0.09,N,0.2,K,A*3C -$GPGGA,085106.000,4926.7709,N,01100.4451,E,1,10,0.8,363.0,M,47.8,M,,0000*56 -$GPGLL,4926.7709,N,01100.4451,E,085106.000,A,A*57 -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,14,,,1.3,0.8,1.0*3F -$GPGSV,3,1,12,27,84,158,39,22,64,126,38,19,61,299,35,18,43,062,35*7C -$GPGSV,3,2,12,16,31,196,26,04,30,259,34,21,21,075,33,11,16,272,*78 -$GPGSV,3,3,12,15,10,036,46,30,07,314,30,14,05,133,35,07,04,284,31*71 -$GPRMC,085106.000,A,4926.7709,N,01100.4451,E,0.10,23.11,281114,,,A*5F -!AIVDO,1,1,,,B>pf?VP00@OwS4kP06,0*10 -$GPVTG,23.11,T,,M,0.10,N,0.2,K,A*3F -$GPGGA,085107.000,4926.7709,N,01100.4452,E,1,11,0.8,363.0,M,47.8,M,,0000*55 -$GPGLL,4926.7709,N,01100.4452,E,085107.000,A,A*55 -$GPGSA,A,3,21,18,27,19,15,30,16,04,11,22,14,,1.3,0.8,1.0*3F -$GPRMC,085107.000,A,4926.7709,N,01100.4452,E,0.13,42.74,281114,,,A*5A -!AIVDO,1,1,,,B>pf?VP00@pf?VP00@pf?VP00@pf?VP00@;U=g`0984pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP00@pf?VP000pf?VP000pf?VP000pf?VP00@pf?VP00Ppf?VP00@pf?VP00@3wd4kP06,0*61 -$GPVTG,22.40,T,,M,0.19,N,0.4,K,A*35 -$GPGGA,085125.000,4926.7712,N,01100.4465,E,1,10,0.8,364.1,M,47.8,M,,0000*5C -$GPGLL,4926.7712,N,01100.4465,E,085125.000,A,A*5B -$GPGSA,A,3,21,18,27,19,15,30,16,04,22,14,,,1.3,0.8,1.0*3F -$GPRMC,085125.000,A,4926.7712,N,01100.4465,E,0.10,19.60,281114,,,A*5C -!AIVDO,1,1,,,B>pf?VP00@pf?VP000pf?VP00@pf?VP000pf?VP000 - - - - opencpn:files:os:linux.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:files:os:linux.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:files:os:linux.jpg

- -

- - -

- - linux.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/files/os/linux.jpg b/data/doc/opencpn/files/os/linux.jpg deleted file mode 100644 index b2c16f83f9..0000000000 Binary files a/data/doc/opencpn/files/os/linux.jpg and /dev/null differ diff --git a/data/doc/opencpn/files/os/linux.tok.f43e35_w.20.jpg b/data/doc/opencpn/files/os/linux.tok.f43e35_w.20.jpg deleted file mode 100644 index cb79ccbf03..0000000000 Binary files a/data/doc/opencpn/files/os/linux.tok.f43e35_w.20.jpg and /dev/null differ diff --git a/data/doc/opencpn/logo.h.100_tok.2f256c_w.100.jpg b/data/doc/opencpn/logo.h.100_tok.2f256c_w.100.jpg deleted file mode 100644 index d23ee22897..0000000000 Binary files a/data/doc/opencpn/logo.h.100_tok.2f256c_w.100.jpg and /dev/null differ diff --git a/data/doc/opencpn/logo.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Aopencpn_installation_3Awindows.png.detail.html b/data/doc/opencpn/logo.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Aopencpn_installation_3Awindows.png.detail.html deleted file mode 100644 index 46ceab2cdf..0000000000 --- a/data/doc/opencpn/logo.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Aopencpn_installation_3Awindows.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:logo.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:logo.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:logo.jpg

- -

- - -

- - logo.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/logo.jpg b/data/doc/opencpn/logo.jpg deleted file mode 100644 index d23ee22897..0000000000 Binary files a/data/doc/opencpn/logo.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/0.h.128_tok.9efc90_w.321.jpg b/data/doc/opencpn/manual/0.h.128_tok.9efc90_w.321.jpg deleted file mode 100644 index 9001e0101b..0000000000 Binary files a/data/doc/opencpn/manual/0.h.128_tok.9efc90_w.321.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/10_1mile.h.380_tok.0b13ae_w.227.jpg b/data/doc/opencpn/manual/10_1mile.h.380_tok.0b13ae_w.227.jpg deleted file mode 100644 index 6b1fdd09f0..0000000000 Binary files a/data/doc/opencpn/manual/10_1mile.h.380_tok.0b13ae_w.227.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/15-chart-status-selection.h.632_tok.4aa60f_w.800.jpg b/data/doc/opencpn/manual/15-chart-status-selection.h.632_tok.4aa60f_w.800.jpg deleted file mode 100644 index 442adff125..0000000000 Binary files a/data/doc/opencpn/manual/15-chart-status-selection.h.632_tok.4aa60f_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/16-show-local-files.h.480_tok.fe4fab_w.800.jpg b/data/doc/opencpn/manual/16-show-local-files.h.480_tok.fe4fab_w.800.jpg deleted file mode 100644 index 38805d47b8..0000000000 Binary files a/data/doc/opencpn/manual/16-show-local-files.h.480_tok.fe4fab_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/17preferences.h.356_tok.0e6ce4_w.464.jpg b/data/doc/opencpn/manual/17preferences.h.356_tok.0e6ce4_w.464.jpg deleted file mode 100644 index 9e3b0e6aeb..0000000000 Binary files a/data/doc/opencpn/manual/17preferences.h.356_tok.0e6ce4_w.464.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/1_2.h.380_tok.072a7e_w.255.jpg b/data/doc/opencpn/manual/1_2.h.380_tok.072a7e_w.255.jpg deleted file mode 100644 index 884a721fa8..0000000000 Binary files a/data/doc/opencpn/manual/1_2.h.380_tok.072a7e_w.255.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/1charts.h.155_tok.1a2978_w.714.jpeg b/data/doc/opencpn/manual/1charts.h.155_tok.1a2978_w.714.jpeg deleted file mode 100644 index 810648c861..0000000000 Binary files a/data/doc/opencpn/manual/1charts.h.155_tok.1a2978_w.714.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/1gps_status.h.38_tok.0284e3_w.79.jpg b/data/doc/opencpn/manual/1gps_status.h.38_tok.0284e3_w.79.jpg deleted file mode 100644 index c86fb07918..0000000000 Binary files a/data/doc/opencpn/manual/1gps_status.h.38_tok.0284e3_w.79.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/1gps_status.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/1gps_status.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 88ae70e128..0000000000 --- a/data/doc/opencpn/manual/1gps_status.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:1gps_status.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:1gps_status.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:1gps_status.jpg

- -

- - -

- - 1gps_status.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/1gps_status.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html b/data/doc/opencpn/manual/1gps_status.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html deleted file mode 100644 index c173ce06b3..0000000000 --- a/data/doc/opencpn/manual/1gps_status.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:1gps_status.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:1gps_status.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:1gps_status.jpg

- -

- - -

- - 1gps_status.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/1gps_status.jpg b/data/doc/opencpn/manual/1gps_status.jpg deleted file mode 100644 index c86fb07918..0000000000 Binary files a/data/doc/opencpn/manual/1gps_status.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/1pleaseupdate.h.667_tok.95954f_w.719.jpeg b/data/doc/opencpn/manual/1pleaseupdate.h.667_tok.95954f_w.719.jpeg deleted file mode 100644 index dc934a5336..0000000000 Binary files a/data/doc/opencpn/manual/1pleaseupdate.h.667_tok.95954f_w.719.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/2.h.551_tok.d2b65c_w.750.jpg b/data/doc/opencpn/manual/2.h.551_tok.d2b65c_w.750.jpg deleted file mode 100644 index 88833a35bc..0000000000 Binary files a/data/doc/opencpn/manual/2.h.551_tok.d2b65c_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/3.h.82_tok.9d91cf_w.285.jpg b/data/doc/opencpn/manual/3.h.82_tok.9d91cf_w.285.jpg deleted file mode 100644 index f3759199db..0000000000 Binary files a/data/doc/opencpn/manual/3.h.82_tok.9d91cf_w.285.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33_s57_info.h.143_tok.757c1d_w.449.jpg b/data/doc/opencpn/manual/33_s57_info.h.143_tok.757c1d_w.449.jpg deleted file mode 100644 index 7be547756e..0000000000 Binary files a/data/doc/opencpn/manual/33_s57_info.h.143_tok.757c1d_w.449.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33accuracy_10k.h.258_tok.7f4a1a_w.350.jpg b/data/doc/opencpn/manual/33accuracy_10k.h.258_tok.7f4a1a_w.350.jpg deleted file mode 100644 index c2c761b5bc..0000000000 Binary files a/data/doc/opencpn/manual/33accuracy_10k.h.258_tok.7f4a1a_w.350.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33accuracy_12m.h.366_tok.081728_w.400.jpg b/data/doc/opencpn/manual/33accuracy_12m.h.366_tok.081728_w.400.jpg deleted file mode 100644 index 68d5d8e1c4..0000000000 Binary files a/data/doc/opencpn/manual/33accuracy_12m.h.366_tok.081728_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33accuracy_info.h.306_tok.48b7e7_w.550.jpg b/data/doc/opencpn/manual/33accuracy_info.h.306_tok.48b7e7_w.550.jpg deleted file mode 100644 index 61bf7b0369..0000000000 Binary files a/data/doc/opencpn/manual/33accuracy_info.h.306_tok.48b7e7_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33accuracy_info2.h.89_tok.6cda05_w.550.jpg b/data/doc/opencpn/manual/33accuracy_info2.h.89_tok.6cda05_w.550.jpg deleted file mode 100644 index 7f1aa9de57..0000000000 Binary files a/data/doc/opencpn/manual/33accuracy_info2.h.89_tok.6cda05_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33ais-showname.h.256_tok.d2b216_w.373.jpg b/data/doc/opencpn/manual/33ais-showname.h.256_tok.d2b216_w.373.jpg deleted file mode 100644 index a0c659f478..0000000000 Binary files a/data/doc/opencpn/manual/33ais-showname.h.256_tok.d2b216_w.373.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33aislist2.tok.69a575_w.700.jpg b/data/doc/opencpn/manual/33aislist2.tok.69a575_w.700.jpg deleted file mode 100644 index 6cb5629005..0000000000 Binary files a/data/doc/opencpn/manual/33aislist2.tok.69a575_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33aton2.h.379_tok.ea9f09_w.419.jpg b/data/doc/opencpn/manual/33aton2.h.379_tok.ea9f09_w.419.jpg deleted file mode 100644 index 137210c305..0000000000 Binary files a/data/doc/opencpn/manual/33aton2.h.379_tok.ea9f09_w.419.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33atononpos.h.357_tok.c5dc1a_w.327.jpg b/data/doc/opencpn/manual/33atononpos.h.357_tok.c5dc1a_w.327.jpg deleted file mode 100644 index d797be909e..0000000000 Binary files a/data/doc/opencpn/manual/33atononpos.h.357_tok.c5dc1a_w.327.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33blacklist.h.136_tok.26648a_w.403.jpg b/data/doc/opencpn/manual/33blacklist.h.136_tok.26648a_w.403.jpg deleted file mode 100644 index cc3619e12a..0000000000 Binary files a/data/doc/opencpn/manual/33blacklist.h.136_tok.26648a_w.403.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33gfs16.h.179_tok.52d3d8_w.501.jpg b/data/doc/opencpn/manual/33gfs16.h.179_tok.52d3d8_w.501.jpg deleted file mode 100644 index 753dca479c..0000000000 Binary files a/data/doc/opencpn/manual/33gfs16.h.179_tok.52d3d8_w.501.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33hidetrack.h.135_tok.434132_w.179.jpg b/data/doc/opencpn/manual/33hidetrack.h.135_tok.434132_w.179.jpg deleted file mode 100644 index a54f1d6a96..0000000000 Binary files a/data/doc/opencpn/manual/33hidetrack.h.135_tok.434132_w.179.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33jmantoolbar.h.40_tok.12e64b_w.737.jpg b/data/doc/opencpn/manual/33jmantoolbar.h.40_tok.12e64b_w.737.jpg deleted file mode 100644 index 31dcfe5e84..0000000000 Binary files a/data/doc/opencpn/manual/33jmantoolbar.h.40_tok.12e64b_w.737.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33speed12.h.250_tok.e4edd8_w.231.jpg b/data/doc/opencpn/manual/33speed12.h.250_tok.e4edd8_w.231.jpg deleted file mode 100644 index ca6a7f66ee..0000000000 Binary files a/data/doc/opencpn/manual/33speed12.h.250_tok.e4edd8_w.231.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33speed50.h.250_tok.3758bc_w.231.jpg b/data/doc/opencpn/manual/33speed50.h.250_tok.3758bc_w.231.jpg deleted file mode 100644 index 29768b328a..0000000000 Binary files a/data/doc/opencpn/manual/33speed50.h.250_tok.3758bc_w.231.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33tradtoolbar.tok.7a1915_w.747.jpg b/data/doc/opencpn/manual/33tradtoolbar.tok.7a1915_w.747.jpg deleted file mode 100644 index 740c044ea6..0000000000 Binary files a/data/doc/opencpn/manual/33tradtoolbar.tok.7a1915_w.747.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33vaton2.h.345_tok.8e6b13_w.410.jpg b/data/doc/opencpn/manual/33vaton2.h.345_tok.8e6b13_w.410.jpg deleted file mode 100644 index dc8f82e34a..0000000000 Binary files a/data/doc/opencpn/manual/33vaton2.h.345_tok.8e6b13_w.410.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33vec.h.418_tok.8228d0_w.638.jpg b/data/doc/opencpn/manual/33vec.h.418_tok.8228d0_w.638.jpg deleted file mode 100644 index 6eebe1bd09..0000000000 Binary files a/data/doc/opencpn/manual/33vec.h.418_tok.8228d0_w.638.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33vofpos.h.44_tok.b418af_w.46.jpg b/data/doc/opencpn/manual/33vofpos.h.44_tok.b418af_w.46.jpg deleted file mode 100644 index 2a78960225..0000000000 Binary files a/data/doc/opencpn/manual/33vofpos.h.44_tok.b418af_w.46.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33wxtable.h.302_tok.382db4_w.243.jpg b/data/doc/opencpn/manual/33wxtable.h.302_tok.382db4_w.243.jpg deleted file mode 100644 index 5b4f920a1d..0000000000 Binary files a/data/doc/opencpn/manual/33wxtable.h.302_tok.382db4_w.243.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33yellowownship.h.42_tok.ac9803_w.44.jpg b/data/doc/opencpn/manual/33yellowownship.h.42_tok.ac9803_w.44.jpg deleted file mode 100644 index ffab7e8e97..0000000000 Binary files a/data/doc/opencpn/manual/33yellowownship.h.42_tok.ac9803_w.44.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/33yellowownship.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/33yellowownship.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index af21898c6d..0000000000 --- a/data/doc/opencpn/manual/33yellowownship.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:33yellowownship.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:33yellowownship.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:33yellowownship.jpg

- -

- - -

- - 33yellowownship.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/33yellowownship.jpg b/data/doc/opencpn/manual/33yellowownship.jpg deleted file mode 100644 index ffab7e8e97..0000000000 Binary files a/data/doc/opencpn/manual/33yellowownship.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/3jmanflattoolbar.h.40_tok.089d52_w.737.jpg b/data/doc/opencpn/manual/3jmanflattoolbar.h.40_tok.089d52_w.737.jpg deleted file mode 100644 index 747bc7b2d0..0000000000 Binary files a/data/doc/opencpn/manual/3jmanflattoolbar.h.40_tok.089d52_w.737.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4.h.189_tok.92807c_w.186.jpg b/data/doc/opencpn/manual/4.h.189_tok.92807c_w.186.jpg deleted file mode 100644 index 74d48118c7..0000000000 Binary files a/data/doc/opencpn/manual/4.h.189_tok.92807c_w.186.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/420optionconnections.tok.049a77_w.600.jpg b/data/doc/opencpn/manual/420optionconnections.tok.049a77_w.600.jpg deleted file mode 100644 index 736aa0c9c9..0000000000 Binary files a/data/doc/opencpn/manual/420optionconnections.tok.049a77_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/421optionconnections.tok.847e64_w.600.jpg b/data/doc/opencpn/manual/421optionconnections.tok.847e64_w.600.jpg deleted file mode 100644 index fa690ae675..0000000000 Binary files a/data/doc/opencpn/manual/421optionconnections.tok.847e64_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/42addserialconnection.tok.005afa_w.600.jpg b/data/doc/opencpn/manual/42addserialconnection.tok.005afa_w.600.jpg deleted file mode 100644 index 43b20aa5c6..0000000000 Binary files a/data/doc/opencpn/manual/42addserialconnection.tok.005afa_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4chartgroups2.tok.345ac3_w.500.jpg b/data/doc/opencpn/manual/4chartgroups2.tok.345ac3_w.500.jpg deleted file mode 100644 index 0c2a075dfd..0000000000 Binary files a/data/doc/opencpn/manual/4chartgroups2.tok.345ac3_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4fps.h.135_tok.607e24_w.673.jpg b/data/doc/opencpn/manual/4fps.h.135_tok.607e24_w.673.jpg deleted file mode 100644 index 2b8d70d778..0000000000 Binary files a/data/doc/opencpn/manual/4fps.h.135_tok.607e24_w.673.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4fps.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/4fps.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index 8f356f8701..0000000000 --- a/data/doc/opencpn/manual/4fps.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:4fps.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:4fps.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:4fps.jpg

- -

- - -

- - 4fps.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/4fps.jpg b/data/doc/opencpn/manual/4fps.jpg deleted file mode 100644 index 2b8d70d778..0000000000 Binary files a/data/doc/opencpn/manual/4fps.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4gl-expert.h.213_tok.3b6e38_w.558.jpg b/data/doc/opencpn/manual/4gl-expert.h.213_tok.3b6e38_w.558.jpg deleted file mode 100644 index 1ed5c11c61..0000000000 Binary files a/data/doc/opencpn/manual/4gl-expert.h.213_tok.3b6e38_w.558.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4gl-expert.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/4gl-expert.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index 25b9d204d7..0000000000 --- a/data/doc/opencpn/manual/4gl-expert.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:4gl-expert.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:4gl-expert.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:4gl-expert.jpg

- -

- - -

- - 4gl-expert.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/4gl-expert.jpg b/data/doc/opencpn/manual/4gl-expert.jpg deleted file mode 100644 index 1ed5c11c61..0000000000 Binary files a/data/doc/opencpn/manual/4gl-expert.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4mmsi-prop.tok.93714b_w.500.jpg b/data/doc/opencpn/manual/4mmsi-prop.tok.93714b_w.500.jpg deleted file mode 100644 index feb6f201f6..0000000000 Binary files a/data/doc/opencpn/manual/4mmsi-prop.tok.93714b_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4mob1.tok.950497_w.650.jpg b/data/doc/opencpn/manual/4mob1.tok.950497_w.650.jpg deleted file mode 100644 index b59f6b8f85..0000000000 Binary files a/data/doc/opencpn/manual/4mob1.tok.950497_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4mob3.tok.e70c27_w.650.jpg b/data/doc/opencpn/manual/4mob3.tok.e70c27_w.650.jpg deleted file mode 100644 index b349a6435f..0000000000 Binary files a/data/doc/opencpn/manual/4mob3.tok.e70c27_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4mob4.tok.cd9a09_w.650.jpg b/data/doc/opencpn/manual/4mob4.tok.cd9a09_w.650.jpg deleted file mode 100644 index 8a3fcce4ae..0000000000 Binary files a/data/doc/opencpn/manual/4mob4.tok.cd9a09_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4mob6.h.663_tok.162742_w.605.jpg b/data/doc/opencpn/manual/4mob6.h.663_tok.162742_w.605.jpg deleted file mode 100644 index 2f5f77e197..0000000000 Binary files a/data/doc/opencpn/manual/4mob6.h.663_tok.162742_w.605.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4objq.tok.45013f_w.500.jpg b/data/doc/opencpn/manual/4objq.tok.45013f_w.500.jpg deleted file mode 100644 index f8c0ed7269..0000000000 Binary files a/data/doc/opencpn/manual/4objq.tok.45013f_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4optcharttide.tok.bac4b8_w.500.jpg b/data/doc/opencpn/manual/4optcharttide.tok.bac4b8_w.500.jpg deleted file mode 100644 index 77c8b5c513..0000000000 Binary files a/data/doc/opencpn/manual/4optcharttide.tok.bac4b8_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4plugins.h.640_tok.075191_w.440.jpg b/data/doc/opencpn/manual/4plugins.h.640_tok.075191_w.440.jpg deleted file mode 100644 index 99f148d52e..0000000000 Binary files a/data/doc/opencpn/manual/4plugins.h.640_tok.075191_w.440.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4realscalebitmap.h.226_tok.e3fb63_w.503.jpg b/data/doc/opencpn/manual/4realscalebitmap.h.226_tok.e3fb63_w.503.jpg deleted file mode 100644 index 2f330cc86d..0000000000 Binary files a/data/doc/opencpn/manual/4realscalebitmap.h.226_tok.e3fb63_w.503.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4realscalebitmap.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/4realscalebitmap.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 912301c128..0000000000 --- a/data/doc/opencpn/manual/4realscalebitmap.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:4realscalebitmap.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:4realscalebitmap.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:4realscalebitmap.jpg

- -

- - -

- - 4realscalebitmap.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/4realscalebitmap.jpg b/data/doc/opencpn/manual/4realscalebitmap.jpg deleted file mode 100644 index 2f330cc86d..0000000000 Binary files a/data/doc/opencpn/manual/4realscalebitmap.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4rightclicklayertrack.h.77_tok.129e6c_w.141.jpg b/data/doc/opencpn/manual/4rightclicklayertrack.h.77_tok.129e6c_w.141.jpg deleted file mode 100644 index 7b1b2de9f2..0000000000 Binary files a/data/doc/opencpn/manual/4rightclicklayertrack.h.77_tok.129e6c_w.141.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4rightclicktrack.h.135_tok.09985a_w.148.jpg b/data/doc/opencpn/manual/4rightclicktrack.h.135_tok.09985a_w.148.jpg deleted file mode 100644 index 5fc9e9173b..0000000000 Binary files a/data/doc/opencpn/manual/4rightclicktrack.h.135_tok.09985a_w.148.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4rightclroute.h.356_tok.b1f839_w.345.jpg b/data/doc/opencpn/manual/4rightclroute.h.356_tok.b1f839_w.345.jpg deleted file mode 100644 index d3c8496e9a..0000000000 Binary files a/data/doc/opencpn/manual/4rightclroute.h.356_tok.b1f839_w.345.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4rng.h.53_tok.ca7543_w.97.jpg b/data/doc/opencpn/manual/4rng.h.53_tok.ca7543_w.97.jpg deleted file mode 100644 index df426be6cd..0000000000 Binary files a/data/doc/opencpn/manual/4rng.h.53_tok.ca7543_w.97.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4rng.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Aroute_to_autopilot.png.detail.html b/data/doc/opencpn/manual/4rng.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Aroute_to_autopilot.png.detail.html deleted file mode 100644 index 77be4fa794..0000000000 --- a/data/doc/opencpn/manual/4rng.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Aroute_to_autopilot.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:4rng.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:4rng.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:4rng.jpg

- -

- - -

- - 4rng.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/4rng.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/4rng.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index e5daca45b5..0000000000 --- a/data/doc/opencpn/manual/4rng.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:4rng.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:4rng.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:4rng.jpg

- -

- - -

- - 4rng.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/4rng.jpg b/data/doc/opencpn/manual/4rng.jpg deleted file mode 100644 index df426be6cd..0000000000 Binary files a/data/doc/opencpn/manual/4rng.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4sendtogps.h.280_tok.166ebd_w.442.jpg b/data/doc/opencpn/manual/4sendtogps.h.280_tok.166ebd_w.442.jpg deleted file mode 100644 index 1183ec0eb0..0000000000 Binary files a/data/doc/opencpn/manual/4sendtogps.h.280_tok.166ebd_w.442.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4showradarrings.h.103_tok.fb6ea4_w.504.jpg b/data/doc/opencpn/manual/4showradarrings.h.103_tok.fb6ea4_w.504.jpg deleted file mode 100644 index b38fefa8f5..0000000000 Binary files a/data/doc/opencpn/manual/4showradarrings.h.103_tok.fb6ea4_w.504.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4showradarrings.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/4showradarrings.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 64d673035c..0000000000 --- a/data/doc/opencpn/manual/4showradarrings.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:4showradarrings.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:4showradarrings.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:4showradarrings.jpg

- -

- - -

- - 4showradarrings.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/4showradarrings.jpg b/data/doc/opencpn/manual/4showradarrings.jpg deleted file mode 100644 index b38fefa8f5..0000000000 Binary files a/data/doc/opencpn/manual/4showradarrings.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4start-charts.h.568_tok.b00348_w.483.jpg b/data/doc/opencpn/manual/4start-charts.h.568_tok.b00348_w.483.jpg deleted file mode 100644 index d2cf284457..0000000000 Binary files a/data/doc/opencpn/manual/4start-charts.h.568_tok.b00348_w.483.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4start-charts1.h.575_tok.bc0ad4_w.478.jpg b/data/doc/opencpn/manual/4start-charts1.h.575_tok.bc0ad4_w.478.jpg deleted file mode 100644 index 2a4639c26e..0000000000 Binary files a/data/doc/opencpn/manual/4start-charts1.h.575_tok.bc0ad4_w.478.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4start-charts2.tok.21e5bc_w.500.jpg b/data/doc/opencpn/manual/4start-charts2.tok.21e5bc_w.500.jpg deleted file mode 100644 index 19c3eb0800..0000000000 Binary files a/data/doc/opencpn/manual/4start-charts2.tok.21e5bc_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4start-charts3.tok.aa75bb_w.500.jpg b/data/doc/opencpn/manual/4start-charts3.tok.aa75bb_w.500.jpg deleted file mode 100644 index bfc02abac9..0000000000 Binary files a/data/doc/opencpn/manual/4start-charts3.tok.aa75bb_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4start-charts4.h.451_tok.ab099c_w.377.jpg b/data/doc/opencpn/manual/4start-charts4.h.451_tok.ab099c_w.377.jpg deleted file mode 100644 index b8b56dfa28..0000000000 Binary files a/data/doc/opencpn/manual/4start-charts4.h.451_tok.ab099c_w.377.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4target-query1.h.546_tok.7dc867_w.335.jpg b/data/doc/opencpn/manual/4target-query1.h.546_tok.7dc867_w.335.jpg deleted file mode 100644 index 22aa040ff1..0000000000 Binary files a/data/doc/opencpn/manual/4target-query1.h.546_tok.7dc867_w.335.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4target-query2.tok.a97dde_w.500.jpg b/data/doc/opencpn/manual/4target-query2.tok.a97dde_w.500.jpg deleted file mode 100644 index 6dc4fc7ff3..0000000000 Binary files a/data/doc/opencpn/manual/4target-query2.tok.a97dde_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4target-real-size.tok.fa4f99_w.500.jpg b/data/doc/opencpn/manual/4target-real-size.tok.fa4f99_w.500.jpg deleted file mode 100644 index 371adf7a61..0000000000 Binary files a/data/doc/opencpn/manual/4target-real-size.tok.fa4f99_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4trackproperties.tok.d3a2f6_w.600.jpg b/data/doc/opencpn/manual/4trackproperties.tok.d3a2f6_w.600.jpg deleted file mode 100644 index 45bd572af2..0000000000 Binary files a/data/doc/opencpn/manual/4trackproperties.tok.d3a2f6_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/4trackstab.h.366_tok.a09fc7_w.556.jpg b/data/doc/opencpn/manual/4trackstab.h.366_tok.a09fc7_w.556.jpg deleted file mode 100644 index 325bffdf49..0000000000 Binary files a/data/doc/opencpn/manual/4trackstab.h.366_tok.a09fc7_w.556.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/5.h.301_tok.e4095d_w.241.jpg b/data/doc/opencpn/manual/5.h.301_tok.e4095d_w.241.jpg deleted file mode 100644 index cdf6dc45d5..0000000000 Binary files a/data/doc/opencpn/manual/5.h.301_tok.e4095d_w.241.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/500mb.h.216_tok.aa37b5_w.700.jpg b/data/doc/opencpn/manual/500mb.h.216_tok.aa37b5_w.700.jpg deleted file mode 100644 index b11b36533a..0000000000 Binary files a/data/doc/opencpn/manual/500mb.h.216_tok.aa37b5_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.h.481_tok.c890e3_w.701.jpeg b/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.h.481_tok.c890e3_w.701.jpeg deleted file mode 100644 index 414966bb37..0000000000 Binary files a/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.h.481_tok.c890e3_w.701.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.id.opencpn_3Aopencpn_user_manual_3Acharts_3Achart_downloader_tab.jpg.detail.html b/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.id.opencpn_3Aopencpn_user_manual_3Acharts_3Achart_downloader_tab.jpg.detail.html deleted file mode 100644 index c2fa820ce1..0000000000 --- a/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.id.opencpn_3Aopencpn_user_manual_3Acharts_3Achart_downloader_tab.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:5ad702b840787080111986d68eeef27d.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:5ad702b840787080111986d68eeef27d.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:5ad702b840787080111986d68eeef27d.jpg

- -

- - -

- - 5ad702b840787080111986d68eeef27d.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.jpeg b/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.jpeg deleted file mode 100644 index 414966bb37..0000000000 Binary files a/data/doc/opencpn/manual/5ad702b840787080111986d68eeef27d.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/5gl-non-expert.h.139_tok.48a8e0_w.516.jpg b/data/doc/opencpn/manual/5gl-non-expert.h.139_tok.48a8e0_w.516.jpg deleted file mode 100644 index 1dca4bb702..0000000000 Binary files a/data/doc/opencpn/manual/5gl-non-expert.h.139_tok.48a8e0_w.516.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/5gl-non-expert.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/5gl-non-expert.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index 8e97d5fba2..0000000000 --- a/data/doc/opencpn/manual/5gl-non-expert.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:5gl-non-expert.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:5gl-non-expert.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:5gl-non-expert.jpg

- -

- - -

- - 5gl-non-expert.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/5gl-non-expert.jpg b/data/doc/opencpn/manual/5gl-non-expert.jpg deleted file mode 100644 index 1dca4bb702..0000000000 Binary files a/data/doc/opencpn/manual/5gl-non-expert.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/6.h.187_tok.92f956_w.186.jpg b/data/doc/opencpn/manual/6.h.187_tok.92f956_w.186.jpg deleted file mode 100644 index 4e3353d389..0000000000 Binary files a/data/doc/opencpn/manual/6.h.187_tok.92f956_w.186.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/7.h.274_tok.62e38b_w.354.jpg b/data/doc/opencpn/manual/7.h.274_tok.62e38b_w.354.jpg deleted file mode 100644 index 99b2cb38fd..0000000000 Binary files a/data/doc/opencpn/manual/7.h.274_tok.62e38b_w.354.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/8.h.415_tok.fef938_w.503.jpg b/data/doc/opencpn/manual/8.h.415_tok.fef938_w.503.jpg deleted file mode 100644 index 16e8c946c0..0000000000 Binary files a/data/doc/opencpn/manual/8.h.415_tok.fef938_w.503.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/9.h.412_tok.4ce1e5_w.367.jpg b/data/doc/opencpn/manual/9.h.412_tok.4ce1e5_w.367.jpg deleted file mode 100644 index 10f84615f7..0000000000 Binary files a/data/doc/opencpn/manual/9.h.412_tok.4ce1e5_w.367.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aa-mob.h.260_tok.d2592b_w.300.jpg b/data/doc/opencpn/manual/aa-mob.h.260_tok.d2592b_w.300.jpg deleted file mode 100644 index fd91c9d980..0000000000 Binary files a/data/doc/opencpn/manual/aa-mob.h.260_tok.d2592b_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/activeroute-sent2gps-2.h.310_tok.19b3f9_w.559.jpeg b/data/doc/opencpn/manual/activeroute-sent2gps-2.h.310_tok.19b3f9_w.559.jpeg deleted file mode 100644 index cd1ea2b19d..0000000000 Binary files a/data/doc/opencpn/manual/activeroute-sent2gps-2.h.310_tok.19b3f9_w.559.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/activeroutewpt.h.222_tok.5495fd_w.206.jpg b/data/doc/opencpn/manual/activeroutewpt.h.222_tok.5495fd_w.206.jpg deleted file mode 100644 index e71f157b57..0000000000 Binary files a/data/doc/opencpn/manual/activeroutewpt.h.222_tok.5495fd_w.206.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/maxdisplay.jpg b/data/doc/opencpn/manual/advanced_features/maxdisplay.jpg deleted file mode 100644 index a26b736186..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/maxdisplay.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/maxscreen1.jpeg b/data/doc/opencpn/manual/advanced_features/maxscreen1.jpeg deleted file mode 100644 index 004b4dfc59..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/maxscreen1.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/maxscreen2.jpeg b/data/doc/opencpn/manual/advanced_features/maxscreen2.jpeg deleted file mode 100644 index f37080fdcf..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/maxscreen2.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/maxscreen3.jpeg b/data/doc/opencpn/manual/advanced_features/maxscreen3.jpeg deleted file mode 100644 index 3697fea49f..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/maxscreen3.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/maxscreen4.jpeg b/data/doc/opencpn/manual/advanced_features/maxscreen4.jpeg deleted file mode 100644 index e1d35165d3..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/maxscreen4.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/maxscreen5.jpeg b/data/doc/opencpn/manual/advanced_features/maxscreen5.jpeg deleted file mode 100644 index 30707e8031..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/maxscreen5.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable01.jpeg b/data/doc/opencpn/manual/advanced_features/portable01.jpeg deleted file mode 100644 index b24b2635eb..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable01.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable02.jpeg b/data/doc/opencpn/manual/advanced_features/portable02.jpeg deleted file mode 100644 index 7679cd23c9..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable02.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable03.jpeg b/data/doc/opencpn/manual/advanced_features/portable03.jpeg deleted file mode 100644 index c73c4ee557..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable03.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable04.jpeg b/data/doc/opencpn/manual/advanced_features/portable04.jpeg deleted file mode 100644 index 75a2dac3fc..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable04.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable05.jpeg b/data/doc/opencpn/manual/advanced_features/portable05.jpeg deleted file mode 100644 index fc4a5a73ef..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable05.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable06.jpeg b/data/doc/opencpn/manual/advanced_features/portable06.jpeg deleted file mode 100644 index 3b76ff401b..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable06.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable07.jpeg b/data/doc/opencpn/manual/advanced_features/portable07.jpeg deleted file mode 100644 index dbaeb1fbbb..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable07.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable08.jpeg b/data/doc/opencpn/manual/advanced_features/portable08.jpeg deleted file mode 100644 index 8f712232e9..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable08.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable09.jpeg b/data/doc/opencpn/manual/advanced_features/portable09.jpeg deleted file mode 100644 index 7cfaa8fb1f..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable09.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable10.jpeg b/data/doc/opencpn/manual/advanced_features/portable10.jpeg deleted file mode 100644 index 61f2a0361c..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable10.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable11.jpeg b/data/doc/opencpn/manual/advanced_features/portable11.jpeg deleted file mode 100644 index f61c9c2e16..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable11.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable12.jpeg b/data/doc/opencpn/manual/advanced_features/portable12.jpeg deleted file mode 100644 index 23c5d3cc8f..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable12.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable13.jpeg b/data/doc/opencpn/manual/advanced_features/portable13.jpeg deleted file mode 100644 index 8b2bcaf927..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable13.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable14.jpeg b/data/doc/opencpn/manual/advanced_features/portable14.jpeg deleted file mode 100644 index 5861cef5b3..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable14.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable15.jpeg b/data/doc/opencpn/manual/advanced_features/portable15.jpeg deleted file mode 100644 index 5bbd287d91..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable15.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable16.jpeg b/data/doc/opencpn/manual/advanced_features/portable16.jpeg deleted file mode 100644 index 4e10a5339d..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable16.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable17.jpeg b/data/doc/opencpn/manual/advanced_features/portable17.jpeg deleted file mode 100644 index 92ee78d7a5..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable17.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable18.jpeg b/data/doc/opencpn/manual/advanced_features/portable18.jpeg deleted file mode 100644 index 9b21e370b1..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable18.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable19.jpeg b/data/doc/opencpn/manual/advanced_features/portable19.jpeg deleted file mode 100644 index af67a410ff..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable19.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable20.jpeg b/data/doc/opencpn/manual/advanced_features/portable20.jpeg deleted file mode 100644 index 32c3960a56..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable20.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable21.jpeg b/data/doc/opencpn/manual/advanced_features/portable21.jpeg deleted file mode 100644 index abee908ef1..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable21.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable22.jpeg b/data/doc/opencpn/manual/advanced_features/portable22.jpeg deleted file mode 100644 index b7c08d001c..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable22.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable23.jpeg b/data/doc/opencpn/manual/advanced_features/portable23.jpeg deleted file mode 100644 index 9bcbe1aacc..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable23.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable24.jpeg b/data/doc/opencpn/manual/advanced_features/portable24.jpeg deleted file mode 100644 index 99405cfc6b..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable24.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable25.jpeg b/data/doc/opencpn/manual/advanced_features/portable25.jpeg deleted file mode 100644 index ee5a71cdf0..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable25.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable26.jpeg b/data/doc/opencpn/manual/advanced_features/portable26.jpeg deleted file mode 100644 index 91e3a05ab3..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable26.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable27.jpeg b/data/doc/opencpn/manual/advanced_features/portable27.jpeg deleted file mode 100644 index 86aea9f959..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable27.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable28.jpeg b/data/doc/opencpn/manual/advanced_features/portable28.jpeg deleted file mode 100644 index 30915fe220..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable28.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/advanced_features/portable29.jpeg b/data/doc/opencpn/manual/advanced_features/portable29.jpeg deleted file mode 100644 index 0f3ef24c18..0000000000 Binary files a/data/doc/opencpn/manual/advanced_features/portable29.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/aground.h.52_tok.86020e_w.52.jpg b/data/doc/opencpn/manual/aground.h.52_tok.86020e_w.52.jpg deleted file mode 100644 index 687f4bd0f4..0000000000 Binary files a/data/doc/opencpn/manual/aground.h.52_tok.86020e_w.52.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-alarm.tok.487378_w.700.jpg b/data/doc/opencpn/manual/ais-alarm.tok.487378_w.700.jpg deleted file mode 100644 index dfb6f0b3ad..0000000000 Binary files a/data/doc/opencpn/manual/ais-alarm.tok.487378_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.h.600_tok.23662f_w.756.jpeg b/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.h.600_tok.23662f_w.756.jpeg deleted file mode 100644 index 57a827f9b2..0000000000 Binary files a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.h.600_tok.23662f_w.756.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Aaton.jpg.detail.html b/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Aaton.jpg.detail.html deleted file mode 100644 index ccb52ef8de..0000000000 --- a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Aaton.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ais-aton-safewater-scheveningen.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ais-aton-safewater-scheveningen.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ais-aton-safewater-scheveningen.jpg

- -

- - -

- - ais-aton-safewater-scheveningen.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.jpeg b/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.jpeg deleted file mode 100644 index 57a827f9b2..0000000000 Binary files a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.tok.26a6c8_w.400.jpeg b/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.tok.26a6c8_w.400.jpeg deleted file mode 100644 index 4325e00f2e..0000000000 Binary files a/data/doc/opencpn/manual/ais-aton-safewater-scheveningen.tok.26a6c8_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-green.h.50_tok.82e49c_w.50.jpg b/data/doc/opencpn/manual/ais-green.h.50_tok.82e49c_w.50.jpg deleted file mode 100644 index e313194fae..0000000000 Binary files a/data/doc/opencpn/manual/ais-green.h.50_tok.82e49c_w.50.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-grey.h.51_tok.ee12ab_w.48.jpg b/data/doc/opencpn/manual/ais-grey.h.51_tok.ee12ab_w.48.jpg deleted file mode 100644 index 590148eed2..0000000000 Binary files a/data/doc/opencpn/manual/ais-grey.h.51_tok.ee12ab_w.48.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-lemon.h.47_tok.425182_w.47.jpg b/data/doc/opencpn/manual/ais-lemon.h.47_tok.425182_w.47.jpg deleted file mode 100644 index 7e009cc525..0000000000 Binary files a/data/doc/opencpn/manual/ais-lemon.h.47_tok.425182_w.47.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-lost.h.50_tok.dd7a8a_w.50.jpg b/data/doc/opencpn/manual/ais-lost.h.50_tok.dd7a8a_w.50.jpg deleted file mode 100644 index 974d92f843..0000000000 Binary files a/data/doc/opencpn/manual/ais-lost.h.50_tok.dd7a8a_w.50.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-lost.h.51_tok.341043_w.51.jpg b/data/doc/opencpn/manual/ais-lost.h.51_tok.341043_w.51.jpg deleted file mode 100644 index c6e9680a2b..0000000000 Binary files a/data/doc/opencpn/manual/ais-lost.h.51_tok.341043_w.51.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-mob-simple-route.h.543_tok.ac5386_w.800.jpeg b/data/doc/opencpn/manual/ais-mob-simple-route.h.543_tok.ac5386_w.800.jpeg deleted file mode 100644 index 054b47718e..0000000000 Binary files a/data/doc/opencpn/manual/ais-mob-simple-route.h.543_tok.ac5386_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-mob-simple-route.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/ais-mob-simple-route.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index c0eb9bfb86..0000000000 --- a/data/doc/opencpn/manual/ais-mob-simple-route.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ais-mob-simple-route.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ais-mob-simple-route.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ais-mob-simple-route.jpg

- -

- - -

- - ais-mob-simple-route.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ais-mob-simple-route.jpeg b/data/doc/opencpn/manual/ais-mob-simple-route.jpeg deleted file mode 100644 index 054b47718e..0000000000 Binary files a/data/doc/opencpn/manual/ais-mob-simple-route.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-mob-simple-route.tok.ece9d5_w.400.jpeg b/data/doc/opencpn/manual/ais-mob-simple-route.tok.ece9d5_w.400.jpeg deleted file mode 100644 index bb0c0779de..0000000000 Binary files a/data/doc/opencpn/manual/ais-mob-simple-route.tok.ece9d5_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-moor.h.50_tok.c31194_w.50.jpg b/data/doc/opencpn/manual/ais-moor.h.50_tok.c31194_w.50.jpg deleted file mode 100644 index 962d74dbf0..0000000000 Binary files a/data/doc/opencpn/manual/ais-moor.h.50_tok.c31194_w.50.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-moor.h.54_tok.1cfe6b_w.54.jpg b/data/doc/opencpn/manual/ais-moor.h.54_tok.1cfe6b_w.54.jpg deleted file mode 100644 index c08698724b..0000000000 Binary files a/data/doc/opencpn/manual/ais-moor.h.54_tok.1cfe6b_w.54.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-red.h.51_tok.0d810c_w.51.jpg b/data/doc/opencpn/manual/ais-red.h.51_tok.0d810c_w.51.jpg deleted file mode 100644 index 02de097cd7..0000000000 Binary files a/data/doc/opencpn/manual/ais-red.h.51_tok.0d810c_w.51.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-sart-mob-reactivation.h.524_tok.3b544b_w.800.jpeg b/data/doc/opencpn/manual/ais-sart-mob-reactivation.h.524_tok.3b544b_w.800.jpeg deleted file mode 100644 index 651df2f793..0000000000 Binary files a/data/doc/opencpn/manual/ais-sart-mob-reactivation.h.524_tok.3b544b_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-sart-mob-reactivation.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/ais-sart-mob-reactivation.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index f9b51d01cf..0000000000 --- a/data/doc/opencpn/manual/ais-sart-mob-reactivation.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ais-sart-mob-reactivation.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ais-sart-mob-reactivation.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ais-sart-mob-reactivation.jpg

- -

- - -

- - ais-sart-mob-reactivation.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ais-sart-mob-reactivation.jpeg b/data/doc/opencpn/manual/ais-sart-mob-reactivation.jpeg deleted file mode 100644 index 651df2f793..0000000000 Binary files a/data/doc/opencpn/manual/ais-sart-mob-reactivation.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-sart-mob-reactivation.tok.b79d40_w.400.jpeg b/data/doc/opencpn/manual/ais-sart-mob-reactivation.tok.b79d40_w.400.jpeg deleted file mode 100644 index d68872e213..0000000000 Binary files a/data/doc/opencpn/manual/ais-sart-mob-reactivation.tok.b79d40_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.h.450_tok.94f543_w.800.jpeg b/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.h.450_tok.94f543_w.800.jpeg deleted file mode 100644 index a6f963ce8a..0000000000 Binary files a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.h.450_tok.94f543_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index 8ae8bc8347..0000000000 --- a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ais-sart-mob-route-active-normal-ais-settings.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ais-sart-mob-route-active-normal-ais-settings.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ais-sart-mob-route-active-normal-ais-settings.jpg

- -

- - -

- - ais-sart-mob-route-active-normal-ais-settings.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.jpeg b/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.jpeg deleted file mode 100644 index a6f963ce8a..0000000000 Binary files a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.tok.87a54f_w.600.jpeg b/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.tok.87a54f_w.600.jpeg deleted file mode 100644 index 5f2fc99d9e..0000000000 Binary files a/data/doc/opencpn/manual/ais-sart-mob-route-active-normal-ais-settings.tok.87a54f_w.600.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais-yellow.h.51_tok.86972d_w.51.jpg b/data/doc/opencpn/manual/ais-yellow.h.51_tok.86972d_w.51.jpg deleted file mode 100644 index 73691e33a0..0000000000 Binary files a/data/doc/opencpn/manual/ais-yellow.h.51_tok.86972d_w.51.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais.h.32_tok.0c7db6_w.32.jpg b/data/doc/opencpn/manual/ais.h.32_tok.0c7db6_w.32.jpg deleted file mode 100644 index 847617c9a4..0000000000 Binary files a/data/doc/opencpn/manual/ais.h.32_tok.0c7db6_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais11.h.452_tok.9f8427_w.368.jpg b/data/doc/opencpn/manual/ais11.h.452_tok.9f8427_w.368.jpg deleted file mode 100644 index 37c811ee08..0000000000 Binary files a/data/doc/opencpn/manual/ais11.h.452_tok.9f8427_w.368.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais2.h.308_tok.97669c_w.356.jpg b/data/doc/opencpn/manual/ais2.h.308_tok.97669c_w.356.jpg deleted file mode 100644 index a59ef242f1..0000000000 Binary files a/data/doc/opencpn/manual/ais2.h.308_tok.97669c_w.356.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais_alarm.h.32_tok.4a31b8_w.32.jpg b/data/doc/opencpn/manual/ais_alarm.h.32_tok.4a31b8_w.32.jpg deleted file mode 100644 index 967667563e..0000000000 Binary files a/data/doc/opencpn/manual/ais_alarm.h.32_tok.4a31b8_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais_alive_active.h.32_tok.f67bf2_w.32.jpg b/data/doc/opencpn/manual/ais_alive_active.h.32_tok.f67bf2_w.32.jpg deleted file mode 100644 index 34a1e1baa6..0000000000 Binary files a/data/doc/opencpn/manual/ais_alive_active.h.32_tok.f67bf2_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais_disabled.h.32_tok.10d5ac_w.32.jpg b/data/doc/opencpn/manual/ais_disabled.h.32_tok.10d5ac_w.32.jpg deleted file mode 100644 index 11d6e2caad..0000000000 Binary files a/data/doc/opencpn/manual/ais_disabled.h.32_tok.10d5ac_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ais_supressed.h.32_tok.fdc2bb_w.32.jpg b/data/doc/opencpn/manual/ais_supressed.h.32_tok.fdc2bb_w.32.jpg deleted file mode 100644 index 05b0b6fb07..0000000000 Binary files a/data/doc/opencpn/manual/ais_supressed.h.32_tok.fdc2bb_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aisfocus.h.135_tok.3d7752_w.183.jpg b/data/doc/opencpn/manual/aisfocus.h.135_tok.3d7752_w.183.jpg deleted file mode 100644 index 823c09c176..0000000000 Binary files a/data/doc/opencpn/manual/aisfocus.h.135_tok.3d7752_w.183.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch.h.354_tok.6563d4_w.400.jpg b/data/doc/opencpn/manual/anch.h.354_tok.6563d4_w.400.jpg deleted file mode 100644 index a540c684c5..0000000000 Binary files a/data/doc/opencpn/manual/anch.h.354_tok.6563d4_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch2.h.399_tok.afa331_w.400.jpg b/data/doc/opencpn/manual/anch2.h.399_tok.afa331_w.400.jpg deleted file mode 100644 index 8528d8f36a..0000000000 Binary files a/data/doc/opencpn/manual/anch2.h.399_tok.afa331_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch3.h.393_tok.69cb61_w.400.jpg b/data/doc/opencpn/manual/anch3.h.393_tok.69cb61_w.400.jpg deleted file mode 100644 index 33dfe2f4cc..0000000000 Binary files a/data/doc/opencpn/manual/anch3.h.393_tok.69cb61_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch4.h.404_tok.3133b5_w.400.jpg b/data/doc/opencpn/manual/anch4.h.404_tok.3133b5_w.400.jpg deleted file mode 100644 index 6eafb14ee0..0000000000 Binary files a/data/doc/opencpn/manual/anch4.h.404_tok.3133b5_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch5.h.404_tok.cb03e1_w.400.jpg b/data/doc/opencpn/manual/anch5.h.404_tok.cb03e1_w.400.jpg deleted file mode 100644 index 5043915abc..0000000000 Binary files a/data/doc/opencpn/manual/anch5.h.404_tok.cb03e1_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch6.h.399_tok.b78292_w.400.jpg b/data/doc/opencpn/manual/anch6.h.399_tok.b78292_w.400.jpg deleted file mode 100644 index 51a0337d27..0000000000 Binary files a/data/doc/opencpn/manual/anch6.h.399_tok.b78292_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch8.h.400_tok.956907_w.400.jpg b/data/doc/opencpn/manual/anch8.h.400_tok.956907_w.400.jpg deleted file mode 100644 index 6b21b3071e..0000000000 Binary files a/data/doc/opencpn/manual/anch8.h.400_tok.956907_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anch9.h.560_tok.8ec2a9_w.326.jpg b/data/doc/opencpn/manual/anch9.h.560_tok.8ec2a9_w.326.jpg deleted file mode 100644 index 251359ce56..0000000000 Binary files a/data/doc/opencpn/manual/anch9.h.560_tok.8ec2a9_w.326.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/anegpass.h.569_tok.315273_w.750.jpg b/data/doc/opencpn/manual/anegpass.h.569_tok.315273_w.750.jpg deleted file mode 100644 index e4ced1ff8e..0000000000 Binary files a/data/doc/opencpn/manual/anegpass.h.569_tok.315273_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aprs.h.48_tok.af4ea1_w.44.jpg b/data/doc/opencpn/manual/aprs.h.48_tok.af4ea1_w.44.jpg deleted file mode 100644 index 1d6c2bedf9..0000000000 Binary files a/data/doc/opencpn/manual/aprs.h.48_tok.af4ea1_w.44.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/area-query.h.480_tok.798990_w.700.jpg b/data/doc/opencpn/manual/area-query.h.480_tok.798990_w.700.jpg deleted file mode 100644 index fcbf46e3d9..0000000000 Binary files a/data/doc/opencpn/manual/area-query.h.480_tok.798990_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/arpa1.jpg b/data/doc/opencpn/manual/arpa1.jpg deleted file mode 100644 index 12643fff71..0000000000 Binary files a/data/doc/opencpn/manual/arpa1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/arpa2.h.49_tok.ddde4a_w.45.jpg b/data/doc/opencpn/manual/arpa2.h.49_tok.ddde4a_w.45.jpg deleted file mode 100644 index cbc68d2e72..0000000000 Binary files a/data/doc/opencpn/manual/arpa2.h.49_tok.ddde4a_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/arpa2.jpg b/data/doc/opencpn/manual/arpa2.jpg deleted file mode 100644 index 3793cf85a3..0000000000 Binary files a/data/doc/opencpn/manual/arpa2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/arpa3.jpg b/data/doc/opencpn/manual/arpa3.jpg deleted file mode 100644 index dbe6197d54..0000000000 Binary files a/data/doc/opencpn/manual/arpa3.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/arpa4.jpg b/data/doc/opencpn/manual/arpa4.jpg deleted file mode 100644 index 7a7ff36522..0000000000 Binary files a/data/doc/opencpn/manual/arpa4.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aton_all.jpg b/data/doc/opencpn/manual/aton_all.jpg deleted file mode 100644 index fbea8de834..0000000000 Binary files a/data/doc/opencpn/manual/aton_all.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aton_off.h.44_tok.d2521f_w.45.jpg b/data/doc/opencpn/manual/aton_off.h.44_tok.d2521f_w.45.jpg deleted file mode 100644 index a4b7394af5..0000000000 Binary files a/data/doc/opencpn/manual/aton_off.h.44_tok.d2521f_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aton_reallife_great_lakes.jpg b/data/doc/opencpn/manual/aton_reallife_great_lakes.jpg deleted file mode 100644 index ddd220d913..0000000000 Binary files a/data/doc/opencpn/manual/aton_reallife_great_lakes.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aton_std.h.46_tok.27cb39_w.45.jpg b/data/doc/opencpn/manual/aton_std.h.46_tok.27cb39_w.45.jpg deleted file mode 100644 index 46996e713b..0000000000 Binary files a/data/doc/opencpn/manual/aton_std.h.46_tok.27cb39_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aton_virt.h.42_tok.bd012f_w.41.jpg b/data/doc/opencpn/manual/aton_virt.h.42_tok.bd012f_w.41.jpg deleted file mode 100644 index b0842b14f3..0000000000 Binary files a/data/doc/opencpn/manual/aton_virt.h.42_tok.bd012f_w.41.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/aton_virt.h.46_tok.1a1b07_w.45.jpg b/data/doc/opencpn/manual/aton_virt.h.46_tok.1a1b07_w.45.jpg deleted file mode 100644 index f909a344b9..0000000000 Binary files a/data/doc/opencpn/manual/aton_virt.h.46_tok.1a1b07_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/attenuation-of-ais-target.jpg b/data/doc/opencpn/manual/attenuation-of-ais-target.jpg deleted file mode 100644 index 8ff9b335fc..0000000000 Binary files a/data/doc/opencpn/manual/attenuation-of-ais-target.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/auto-follow_0.h.32_tok.f6c8e6_w.32.jpg b/data/doc/opencpn/manual/auto-follow_0.h.32_tok.f6c8e6_w.32.jpg deleted file mode 100644 index 55f9970c7f..0000000000 Binary files a/data/doc/opencpn/manual/auto-follow_0.h.32_tok.f6c8e6_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/auto-follow_0.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/auto-follow_0.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index 2302329475..0000000000 --- a/data/doc/opencpn/manual/auto-follow_0.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:auto-follow_0.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:auto-follow_0.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:auto-follow_0.jpg

- -

- - -

- - auto-follow_0.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/auto-follow_0.jpg b/data/doc/opencpn/manual/auto-follow_0.jpg deleted file mode 100644 index 55f9970c7f..0000000000 Binary files a/data/doc/opencpn/manual/auto-follow_0.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/autofollowactive.h.32_tok.431bea_w.32.jpg b/data/doc/opencpn/manual/autofollowactive.h.32_tok.431bea_w.32.jpg deleted file mode 100644 index 629b69258a..0000000000 Binary files a/data/doc/opencpn/manual/autofollowactive.h.32_tok.431bea_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/autofollowactive.h.32_tok.898123_w.33.jpg b/data/doc/opencpn/manual/autofollowactive.h.32_tok.898123_w.33.jpg deleted file mode 100644 index 5552c190fd..0000000000 Binary files a/data/doc/opencpn/manual/autofollowactive.h.32_tok.898123_w.33.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/autofollowactive.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/autofollowactive.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index 0925af07e8..0000000000 --- a/data/doc/opencpn/manual/autofollowactive.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:autofollowactive.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:autofollowactive.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:autofollowactive.jpg

- -

- - -

- - autofollowactive.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/autofollowactive.jpg b/data/doc/opencpn/manual/autofollowactive.jpg deleted file mode 100644 index 5552c190fd..0000000000 Binary files a/data/doc/opencpn/manual/autofollowactive.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/autopilot-output-sentences.h.351_tok.93f149_w.567.jpeg b/data/doc/opencpn/manual/autopilot-output-sentences.h.351_tok.93f149_w.567.jpeg deleted file mode 100644 index fe33087211..0000000000 Binary files a/data/doc/opencpn/manual/autopilot-output-sentences.h.351_tok.93f149_w.567.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ba_serveur_2-910db.h.302_tok.548ec0_w.450.jpeg b/data/doc/opencpn/manual/ba_serveur_2-910db.h.302_tok.548ec0_w.450.jpeg deleted file mode 100644 index b10cf5c7e2..0000000000 Binary files a/data/doc/opencpn/manual/ba_serveur_2-910db.h.302_tok.548ec0_w.450.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ba_serveur_2-910db.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/ba_serveur_2-910db.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index e8fee4fde4..0000000000 --- a/data/doc/opencpn/manual/ba_serveur_2-910db.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ba_serveur_2-910db.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ba_serveur_2-910db.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ba_serveur_2-910db.jpg

- -

- - -

- - ba_serveur_2-910db.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ba_serveur_2-910db.jpeg b/data/doc/opencpn/manual/ba_serveur_2-910db.jpeg deleted file mode 100644 index b10cf5c7e2..0000000000 Binary files a/data/doc/opencpn/manual/ba_serveur_2-910db.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/base.h.34_tok.3be235_w.40.jpg b/data/doc/opencpn/manual/base.h.34_tok.3be235_w.40.jpg deleted file mode 100644 index 36e66bc1c2..0000000000 Binary files a/data/doc/opencpn/manual/base.h.34_tok.3be235_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/basestn.h.43_tok.4cc2f2_w.45.jpg b/data/doc/opencpn/manual/basestn.h.43_tok.4cc2f2_w.45.jpg deleted file mode 100644 index 1931c3c612..0000000000 Binary files a/data/doc/opencpn/manual/basestn.h.43_tok.4cc2f2_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/bb_receveur_2-78e4c.h.302_tok.ce5e70_w.450.jpeg b/data/doc/opencpn/manual/bb_receveur_2-78e4c.h.302_tok.ce5e70_w.450.jpeg deleted file mode 100644 index e53a20ffdb..0000000000 Binary files a/data/doc/opencpn/manual/bb_receveur_2-78e4c.h.302_tok.ce5e70_w.450.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/bb_receveur_2-78e4c.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/bb_receveur_2-78e4c.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index 91d246add8..0000000000 --- a/data/doc/opencpn/manual/bb_receveur_2-78e4c.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:bb_receveur_2-78e4c.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:bb_receveur_2-78e4c.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:bb_receveur_2-78e4c.jpg

- -

- - -

- - bb_receveur_2-78e4c.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/bb_receveur_2-78e4c.jpeg b/data/doc/opencpn/manual/bb_receveur_2-78e4c.jpeg deleted file mode 100644 index e53a20ffdb..0000000000 Binary files a/data/doc/opencpn/manual/bb_receveur_2-78e4c.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/bgchart.h.568_tok.27d3f9_w.750.jpg b/data/doc/opencpn/manual/bgchart.h.568_tok.27d3f9_w.750.jpg deleted file mode 100644 index bd3b2494bf..0000000000 Binary files a/data/doc/opencpn/manual/bgchart.h.568_tok.27d3f9_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/bluesquare.h.38_tok.fc3d76_w.40.jpg b/data/doc/opencpn/manual/bluesquare.h.38_tok.fc3d76_w.40.jpg deleted file mode 100644 index 397ea514e4..0000000000 Binary files a/data/doc/opencpn/manual/bluesquare.h.38_tok.fc3d76_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/bramb.h.325_tok.4a7778_w.600.jpg b/data/doc/opencpn/manual/bramb.h.325_tok.4a7778_w.600.jpg deleted file mode 100644 index 58a67118f3..0000000000 Binary files a/data/doc/opencpn/manual/bramb.h.325_tok.4a7778_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/bramb1.h.335_tok.e843bd_w.600.jpg b/data/doc/opencpn/manual/bramb1.h.335_tok.e843bd_w.600.jpg deleted file mode 100644 index 0e36bf51c5..0000000000 Binary files a/data/doc/opencpn/manual/bramb1.h.335_tok.e843bd_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/bramb2.h.425_tok.be8f12_w.600.jpg b/data/doc/opencpn/manual/bramb2.h.425_tok.be8f12_w.600.jpg deleted file mode 100644 index 27ec0c6f61..0000000000 Binary files a/data/doc/opencpn/manual/bramb2.h.425_tok.be8f12_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/brazil.h.569_tok.037800_w.750.jpg b/data/doc/opencpn/manual/brazil.h.569_tok.037800_w.750.jpg deleted file mode 100644 index c020871397..0000000000 Binary files a/data/doc/opencpn/manual/brazil.h.569_tok.037800_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/bud-icon.h.45_tok.e02594_w.46.jpg b/data/doc/opencpn/manual/bud-icon.h.45_tok.e02594_w.46.jpg deleted file mode 100644 index ba8d3d3879..0000000000 Binary files a/data/doc/opencpn/manual/bud-icon.h.45_tok.e02594_w.46.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/buttons-select.h.403_tok.6cf7f2_w.450.jpg b/data/doc/opencpn/manual/buttons-select.h.403_tok.6cf7f2_w.450.jpg deleted file mode 100644 index 7571dbfa2b..0000000000 Binary files a/data/doc/opencpn/manual/buttons-select.h.403_tok.6cf7f2_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ca_serveur.h.410_tok.3ad3fe_w.800.jpeg b/data/doc/opencpn/manual/ca_serveur.h.410_tok.3ad3fe_w.800.jpeg deleted file mode 100644 index 26a564f055..0000000000 Binary files a/data/doc/opencpn/manual/ca_serveur.h.410_tok.3ad3fe_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ca_serveur.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/ca_serveur.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index 8ecceebc1a..0000000000 --- a/data/doc/opencpn/manual/ca_serveur.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ca_serveur.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ca_serveur.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ca_serveur.jpg

- -

- - -

- - ca_serveur.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ca_serveur.jpeg b/data/doc/opencpn/manual/ca_serveur.jpeg deleted file mode 100644 index 26a564f055..0000000000 Binary files a/data/doc/opencpn/manual/ca_serveur.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/cb_receveur.h.410_tok.2c9114_w.800.jpeg b/data/doc/opencpn/manual/cb_receveur.h.410_tok.2c9114_w.800.jpeg deleted file mode 100644 index da726e83ba..0000000000 Binary files a/data/doc/opencpn/manual/cb_receveur.h.410_tok.2c9114_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/cb_receveur.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/cb_receveur.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index dee9cae81d..0000000000 --- a/data/doc/opencpn/manual/cb_receveur.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:cb_receveur.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:cb_receveur.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:cb_receveur.jpg

- -

- - -

- - cb_receveur.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/cb_receveur.jpeg b/data/doc/opencpn/manual/cb_receveur.jpeg deleted file mode 100644 index da726e83ba..0000000000 Binary files a/data/doc/opencpn/manual/cb_receveur.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartbar32.h.31_tok.4e1053_w.750.jpg b/data/doc/opencpn/manual/chartbar32.h.31_tok.4e1053_w.750.jpg deleted file mode 100644 index 5950d1370f..0000000000 Binary files a/data/doc/opencpn/manual/chartbar32.h.31_tok.4e1053_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartgroups321.h.387_tok.39b405_w.600.jpg b/data/doc/opencpn/manual/chartgroups321.h.387_tok.39b405_w.600.jpg deleted file mode 100644 index 44892cc4cd..0000000000 Binary files a/data/doc/opencpn/manual/chartgroups321.h.387_tok.39b405_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartgroups322.h.412_tok.669cdb_w.600.jpg b/data/doc/opencpn/manual/chartgroups322.h.412_tok.669cdb_w.600.jpg deleted file mode 100644 index 73b487660b..0000000000 Binary files a/data/doc/opencpn/manual/chartgroups322.h.412_tok.669cdb_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartman-1.tok.69be5e_w.450.jpg b/data/doc/opencpn/manual/chartman-1.tok.69be5e_w.450.jpg deleted file mode 100644 index bcd0b42988..0000000000 Binary files a/data/doc/opencpn/manual/chartman-1.tok.69be5e_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartman_2.tok.a07779_w.450.jpg b/data/doc/opencpn/manual/chartman_2.tok.a07779_w.450.jpg deleted file mode 100644 index 5649b9028e..0000000000 Binary files a/data/doc/opencpn/manual/chartman_2.tok.a07779_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartman_3.tok.66533e_w.450.jpg b/data/doc/opencpn/manual/chartman_3.tok.66533e_w.450.jpg deleted file mode 100644 index b4c188a28c..0000000000 Binary files a/data/doc/opencpn/manual/chartman_3.tok.66533e_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartman_4.tok.16de12_w.450.jpg b/data/doc/opencpn/manual/chartman_4.tok.16de12_w.450.jpg deleted file mode 100644 index bacdebfc67..0000000000 Binary files a/data/doc/opencpn/manual/chartman_4.tok.16de12_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/chartman_5.tok.86e379_w.450.jpg b/data/doc/opencpn/manual/chartman_5.tok.86e379_w.450.jpg deleted file mode 100644 index 0f360d04f3..0000000000 Binary files a/data/doc/opencpn/manual/chartman_5.tok.86e379_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/classb.h.59_tok.82227a_w.45.jpg b/data/doc/opencpn/manual/classb.h.59_tok.82227a_w.45.jpg deleted file mode 100644 index b473008374..0000000000 Binary files a/data/doc/opencpn/manual/classb.h.59_tok.82227a_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/classicshell_zpsbfed952c.tok.c96daf_w.500.jpg b/data/doc/opencpn/manual/classicshell_zpsbfed952c.tok.c96daf_w.500.jpg deleted file mode 100644 index 96c6a788b0..0000000000 Binary files a/data/doc/opencpn/manual/classicshell_zpsbfed952c.tok.c96daf_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/cm-top.h.621_tok.a14ada_w.500.jpg b/data/doc/opencpn/manual/cm-top.h.621_tok.a14ada_w.500.jpg deleted file mode 100644 index b41d3ab053..0000000000 Binary files a/data/doc/opencpn/manual/cm-top.h.621_tok.a14ada_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/cm93.h.304_tok.53a6a4_w.294.jpg b/data/doc/opencpn/manual/cm93.h.304_tok.53a6a4_w.294.jpg deleted file mode 100644 index e51e7ee395..0000000000 Binary files a/data/doc/opencpn/manual/cm93.h.304_tok.53a6a4_w.294.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/cm93grp.h.165_tok.59117c_w.600.jpg b/data/doc/opencpn/manual/cm93grp.h.165_tok.59117c_w.600.jpg deleted file mode 100644 index a496ca8eaf..0000000000 Binary files a/data/doc/opencpn/manual/cm93grp.h.165_tok.59117c_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/colscheme.h.32_tok.1ec6ce_w.32.jpg b/data/doc/opencpn/manual/colscheme.h.32_tok.1ec6ce_w.32.jpg deleted file mode 100644 index b7fd6c0edd..0000000000 Binary files a/data/doc/opencpn/manual/colscheme.h.32_tok.1ec6ce_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/composite.h.147_tok.224840_w.500.jpg b/data/doc/opencpn/manual/composite.h.147_tok.224840_w.500.jpg deleted file mode 100644 index cd7fb06f72..0000000000 Binary files a/data/doc/opencpn/manual/composite.h.147_tok.224840_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/composite1.h.204_tok.4716a5_w.500.jpg b/data/doc/opencpn/manual/composite1.h.204_tok.4716a5_w.500.jpg deleted file mode 100644 index 657e9df8fa..0000000000 Binary files a/data/doc/opencpn/manual/composite1.h.204_tok.4716a5_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/connections-output-filter-sentence.jpg b/data/doc/opencpn/manual/connections-output-filter-sentence.jpg deleted file mode 100644 index f3b2c7a905..0000000000 Binary files a/data/doc/opencpn/manual/connections-output-filter-sentence.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/connections.tok.bb7b2a_w.600.jpg b/data/doc/opencpn/manual/connections.tok.bb7b2a_w.600.jpg deleted file mode 100644 index cf4f116bd2..0000000000 Binary files a/data/doc/opencpn/manual/connections.tok.bb7b2a_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/course-up.h.605_tok.cfc969_w.800.jpg b/data/doc/opencpn/manual/course-up.h.605_tok.cfc969_w.800.jpg deleted file mode 100644 index c9f615f5b0..0000000000 Binary files a/data/doc/opencpn/manual/course-up.h.605_tok.cfc969_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/course-up.h.681_tok.c3c253_w.900.jpg b/data/doc/opencpn/manual/course-up.h.681_tok.c3c253_w.900.jpg deleted file mode 100644 index 9b8dd889f0..0000000000 Binary files a/data/doc/opencpn/manual/course-up.h.681_tok.c3c253_w.900.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/course-up.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/course-up.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index b291c048cb..0000000000 --- a/data/doc/opencpn/manual/course-up.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:course-up.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:course-up.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:course-up.jpg

- -

- - -

- - course-up.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/course-up.jpg b/data/doc/opencpn/manual/course-up.jpg deleted file mode 100644 index 9b8dd889f0..0000000000 Binary files a/data/doc/opencpn/manual/course-up.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/course-up_0.h.28_tok.11b8b1_w.28.jpg b/data/doc/opencpn/manual/course-up_0.h.28_tok.11b8b1_w.28.jpg deleted file mode 100644 index 66d1f01413..0000000000 Binary files a/data/doc/opencpn/manual/course-up_0.h.28_tok.11b8b1_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/current-digits.tok.6fe30a_w.500.jpg b/data/doc/opencpn/manual/current-digits.tok.6fe30a_w.500.jpg deleted file mode 100644 index d373e519cc..0000000000 Binary files a/data/doc/opencpn/manual/current-digits.tok.6fe30a_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/current.h.32_tok.db34f5_w.32.jpg b/data/doc/opencpn/manual/current.h.32_tok.db34f5_w.32.jpg deleted file mode 100644 index e1a7ffcb10..0000000000 Binary files a/data/doc/opencpn/manual/current.h.32_tok.db34f5_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/current.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Atides_and_currents.png.detail.html b/data/doc/opencpn/manual/current.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Atides_and_currents.png.detail.html deleted file mode 100644 index a8c3c36623..0000000000 --- a/data/doc/opencpn/manual/current.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Atides_and_currents.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:current.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:current.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:current.jpg

- -

- - -

- - current.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/current.jpg b/data/doc/opencpn/manual/current.jpg deleted file mode 100644 index e1a7ffcb10..0000000000 Binary files a/data/doc/opencpn/manual/current.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/current1.h.458_tok.e27cb7_w.500.jpg b/data/doc/opencpn/manual/current1.h.458_tok.e27cb7_w.500.jpg deleted file mode 100644 index 632679b000..0000000000 Binary files a/data/doc/opencpn/manual/current1.h.458_tok.e27cb7_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/da_rezo-ocpn_w7.h.445_tok.a359c4_w.800.jpeg b/data/doc/opencpn/manual/da_rezo-ocpn_w7.h.445_tok.a359c4_w.800.jpeg deleted file mode 100644 index 651b78fb29..0000000000 Binary files a/data/doc/opencpn/manual/da_rezo-ocpn_w7.h.445_tok.a359c4_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/da_rezo-ocpn_w7.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/da_rezo-ocpn_w7.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index 1deef54e23..0000000000 --- a/data/doc/opencpn/manual/da_rezo-ocpn_w7.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:da_rezo-ocpn_w7.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:da_rezo-ocpn_w7.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:da_rezo-ocpn_w7.jpg

- -

- - -

- - da_rezo-ocpn_w7.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/da_rezo-ocpn_w7.jpeg b/data/doc/opencpn/manual/da_rezo-ocpn_w7.jpeg deleted file mode 100644 index 651b78fb29..0000000000 Binary files a/data/doc/opencpn/manual/da_rezo-ocpn_w7.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/dark-green.tok.c2d39a_w.45.jpg b/data/doc/opencpn/manual/dark-green.tok.c2d39a_w.45.jpg deleted file mode 100644 index ce031eba12..0000000000 Binary files a/data/doc/opencpn/manual/dark-green.tok.c2d39a_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/db_rezo-ocpn_xp.h.445_tok.363484_w.800.jpeg b/data/doc/opencpn/manual/db_rezo-ocpn_xp.h.445_tok.363484_w.800.jpeg deleted file mode 100644 index 73d8d50e0c..0000000000 Binary files a/data/doc/opencpn/manual/db_rezo-ocpn_xp.h.445_tok.363484_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/db_rezo-ocpn_xp.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/db_rezo-ocpn_xp.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index 4afe6162e5..0000000000 --- a/data/doc/opencpn/manual/db_rezo-ocpn_xp.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:db_rezo-ocpn_xp.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:db_rezo-ocpn_xp.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:db_rezo-ocpn_xp.jpg

- -

- - -

- - db_rezo-ocpn_xp.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/db_rezo-ocpn_xp.jpeg b/data/doc/opencpn/manual/db_rezo-ocpn_xp.jpeg deleted file mode 100644 index 73d8d50e0c..0000000000 Binary files a/data/doc/opencpn/manual/db_rezo-ocpn_xp.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ddd1.tok.ad29dc_w.750.jpg b/data/doc/opencpn/manual/ddd1.tok.ad29dc_w.750.jpg deleted file mode 100644 index b57783e932..0000000000 Binary files a/data/doc/opencpn/manual/ddd1.tok.ad29dc_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ddd2.tok.d45d1a_w.750.jpg b/data/doc/opencpn/manual/ddd2.tok.d45d1a_w.750.jpg deleted file mode 100644 index fb5966a81f..0000000000 Binary files a/data/doc/opencpn/manual/ddd2.tok.d45d1a_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ddd3.tok.55e84f_w.750.jpg b/data/doc/opencpn/manual/ddd3.tok.55e84f_w.750.jpg deleted file mode 100644 index aab06cfa3d..0000000000 Binary files a/data/doc/opencpn/manual/ddd3.tok.55e84f_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ddd4.tok.d8d761_w.750.jpg b/data/doc/opencpn/manual/ddd4.tok.d8d761_w.750.jpg deleted file mode 100644 index d1dcea46d5..0000000000 Binary files a/data/doc/opencpn/manual/ddd4.tok.d8d761_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/debug_win.tok.346225_w.600.jpg b/data/doc/opencpn/manual/debug_win.tok.346225_w.600.jpg deleted file mode 100644 index 186eb38153..0000000000 Binary files a/data/doc/opencpn/manual/debug_win.tok.346225_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/devicemanager-1.h.610_tok.e7eae4_w.410.jpeg b/data/doc/opencpn/manual/devicemanager-1.h.610_tok.e7eae4_w.410.jpeg deleted file mode 100644 index 14538412e6..0000000000 Binary files a/data/doc/opencpn/manual/devicemanager-1.h.610_tok.e7eae4_w.410.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/devicemanager_zpsb0197e16.h.260_tok.886bc2_w.395.jpg b/data/doc/opencpn/manual/devicemanager_zpsb0197e16.h.260_tok.886bc2_w.395.jpg deleted file mode 100644 index c7265d7ed4..0000000000 Binary files a/data/doc/opencpn/manual/devicemanager_zpsb0197e16.h.260_tok.886bc2_w.395.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/diagram-0-sm.h.538_tok.d35e50_w.509.jpg b/data/doc/opencpn/manual/diagram-0-sm.h.538_tok.d35e50_w.509.jpg deleted file mode 100644 index 300572d209..0000000000 Binary files a/data/doc/opencpn/manual/diagram-0-sm.h.538_tok.d35e50_w.509.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/diagram-0-sm.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Aroute_to_autopilot.png.detail.html b/data/doc/opencpn/manual/diagram-0-sm.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Aroute_to_autopilot.png.detail.html deleted file mode 100644 index 1cef8c3e6c..0000000000 --- a/data/doc/opencpn/manual/diagram-0-sm.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Aroute_to_autopilot.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:diagram-0-sm.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:diagram-0-sm.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:diagram-0-sm.jpg

- -

- - -

- - diagram-0-sm.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/diagram-0-sm.jpg b/data/doc/opencpn/manual/diagram-0-sm.jpg deleted file mode 100644 index 300572d209..0000000000 Binary files a/data/doc/opencpn/manual/diagram-0-sm.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/diagram-0-sm.tok.8bfd20_w.500.jpg b/data/doc/opencpn/manual/diagram-0-sm.tok.8bfd20_w.500.jpg deleted file mode 100644 index 253575629b..0000000000 Binary files a/data/doc/opencpn/manual/diagram-0-sm.tok.8bfd20_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/diagram-1-sm.tok.3c54d9_w.500.jpg b/data/doc/opencpn/manual/diagram-1-sm.tok.3c54d9_w.500.jpg deleted file mode 100644 index bf35be1098..0000000000 Binary files a/data/doc/opencpn/manual/diagram-1-sm.tok.3c54d9_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/diagram-2-sm.tok.c2caac_w.500.jpg b/data/doc/opencpn/manual/diagram-2-sm.tok.c2caac_w.500.jpg deleted file mode 100644 index b4fbeaf95e..0000000000 Binary files a/data/doc/opencpn/manual/diagram-2-sm.tok.c2caac_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/diagram-3-sm.tok.efc822_w.500.jpg b/data/doc/opencpn/manual/diagram-3-sm.tok.efc822_w.500.jpg deleted file mode 100644 index 741e14f143..0000000000 Binary files a/data/doc/opencpn/manual/diagram-3-sm.tok.efc822_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/diagram-4-sm.tok.eee4d6_w.500.jpg b/data/doc/opencpn/manual/diagram-4-sm.tok.eee4d6_w.500.jpg deleted file mode 100644 index a3272c6cfb..0000000000 Binary files a/data/doc/opencpn/manual/diagram-4-sm.tok.eee4d6_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dim1.h.500_tok.786c90_w.332.jpg b/data/doc/opencpn/manual/dim1.h.500_tok.786c90_w.332.jpg deleted file mode 100644 index e7d4ae8258..0000000000 Binary files a/data/doc/opencpn/manual/dim1.h.500_tok.786c90_w.332.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dpare.h.215_tok.d8d416_w.410.jpg b/data/doc/opencpn/manual/dpare.h.215_tok.d8d416_w.410.jpg deleted file mode 100644 index f7aea82b30..0000000000 Binary files a/data/doc/opencpn/manual/dpare.h.215_tok.d8d416_w.410.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-7-instances.h.700_tok.d9b87c_w.555.jpeg b/data/doc/opencpn/manual/dsc-7-instances.h.700_tok.d9b87c_w.555.jpeg deleted file mode 100644 index aa395393ad..0000000000 Binary files a/data/doc/opencpn/manual/dsc-7-instances.h.700_tok.d9b87c_w.555.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-7-instances.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Adsc_buddy_via_ais.jpg.detail.html b/data/doc/opencpn/manual/dsc-7-instances.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Adsc_buddy_via_ais.jpg.detail.html deleted file mode 100644 index 839af2f00d..0000000000 --- a/data/doc/opencpn/manual/dsc-7-instances.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Adsc_buddy_via_ais.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:dsc-7-instances.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:dsc-7-instances.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:dsc-7-instances.jpg

- -

- - -

- - dsc-7-instances.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/dsc-7-instances.jpeg b/data/doc/opencpn/manual/dsc-7-instances.jpeg deleted file mode 100644 index fce8eb2d1d..0000000000 Binary files a/data/doc/opencpn/manual/dsc-7-instances.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-7-instances.tok.680090_w.350.jpeg b/data/doc/opencpn/manual/dsc-7-instances.tok.680090_w.350.jpeg deleted file mode 100644 index b6f77d3dc7..0000000000 Binary files a/data/doc/opencpn/manual/dsc-7-instances.tok.680090_w.350.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-alert.tok.52a06b_w.600.jpg b/data/doc/opencpn/manual/dsc-alert.tok.52a06b_w.600.jpg deleted file mode 100644 index 64808e66ff..0000000000 Binary files a/data/doc/opencpn/manual/dsc-alert.tok.52a06b_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-list.h.280_tok.f809cf_w.800.jpg b/data/doc/opencpn/manual/dsc-list.h.280_tok.f809cf_w.800.jpg deleted file mode 100644 index 3c928abdf4..0000000000 Binary files a/data/doc/opencpn/manual/dsc-list.h.280_tok.f809cf_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-not-ok.h.42_tok.573539_w.45.jpg b/data/doc/opencpn/manual/dsc-not-ok.h.42_tok.573539_w.45.jpg deleted file mode 100644 index 9fab81c195..0000000000 Binary files a/data/doc/opencpn/manual/dsc-not-ok.h.42_tok.573539_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-ok.h.44_tok.a9ec04_w.45.jpg b/data/doc/opencpn/manual/dsc-ok.h.44_tok.a9ec04_w.45.jpg deleted file mode 100644 index a96927fbb9..0000000000 Binary files a/data/doc/opencpn/manual/dsc-ok.h.44_tok.a9ec04_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc-ok2.h.223_tok.89bba3_w.400.jpg b/data/doc/opencpn/manual/dsc-ok2.h.223_tok.89bba3_w.400.jpg deleted file mode 100644 index 5d2f6c2946..0000000000 Binary files a/data/doc/opencpn/manual/dsc-ok2.h.223_tok.89bba3_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dsc_distress.h.260_tok.fa92b4_w.400.jpeg b/data/doc/opencpn/manual/dsc_distress.h.260_tok.fa92b4_w.400.jpeg deleted file mode 100644 index 5a9c66bf71..0000000000 Binary files a/data/doc/opencpn/manual/dsc_distress.h.260_tok.fa92b4_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/dse1.h.46_tok.f39d42_w.44.jpg b/data/doc/opencpn/manual/dse1.h.46_tok.f39d42_w.44.jpg deleted file mode 100644 index 320570b8f4..0000000000 Binary files a/data/doc/opencpn/manual/dse1.h.46_tok.f39d42_w.44.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dse1.jpg b/data/doc/opencpn/manual/dse1.jpg deleted file mode 100644 index bdd48be984..0000000000 Binary files a/data/doc/opencpn/manual/dse1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dyngnaset.h.556_tok.a3d8b0_w.451.jpg b/data/doc/opencpn/manual/dyngnaset.h.556_tok.a3d8b0_w.451.jpg deleted file mode 100644 index 5237200c12..0000000000 Binary files a/data/doc/opencpn/manual/dyngnaset.h.556_tok.a3d8b0_w.451.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/dyngnaset.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html b/data/doc/opencpn/manual/dyngnaset.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html deleted file mode 100644 index ad9a121d56..0000000000 --- a/data/doc/opencpn/manual/dyngnaset.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:dyngnaset.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:dyngnaset.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:dyngnaset.jpg

- -

- - -

- - dyngnaset.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/dyngnaset.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Avector_text_display.png.detail.html b/data/doc/opencpn/manual/dyngnaset.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Avector_text_display.png.detail.html deleted file mode 100644 index d35e0c5e75..0000000000 --- a/data/doc/opencpn/manual/dyngnaset.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Avector_text_display.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:dyngnaset.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:dyngnaset.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:dyngnaset.jpg

- -

- - -

- - dyngnaset.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/dyngnaset.jpg b/data/doc/opencpn/manual/dyngnaset.jpg deleted file mode 100644 index 5237200c12..0000000000 Binary files a/data/doc/opencpn/manual/dyngnaset.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ea_nmea_emission_w7.h.293_tok.728312_w.703.jpeg b/data/doc/opencpn/manual/ea_nmea_emission_w7.h.293_tok.728312_w.703.jpeg deleted file mode 100644 index cd19fca4f3..0000000000 Binary files a/data/doc/opencpn/manual/ea_nmea_emission_w7.h.293_tok.728312_w.703.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ea_nmea_emission_w7.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/ea_nmea_emission_w7.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index 216db93eef..0000000000 --- a/data/doc/opencpn/manual/ea_nmea_emission_w7.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ea_nmea_emission_w7.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ea_nmea_emission_w7.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ea_nmea_emission_w7.jpg

- -

- - -

- - ea_nmea_emission_w7.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ea_nmea_emission_w7.jpeg b/data/doc/opencpn/manual/ea_nmea_emission_w7.jpeg deleted file mode 100644 index cd19fca4f3..0000000000 Binary files a/data/doc/opencpn/manual/ea_nmea_emission_w7.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/eb_nmea_reception_xp.h.293_tok.9236ce_w.703.jpeg b/data/doc/opencpn/manual/eb_nmea_reception_xp.h.293_tok.9236ce_w.703.jpeg deleted file mode 100644 index 033c2c3306..0000000000 Binary files a/data/doc/opencpn/manual/eb_nmea_reception_xp.h.293_tok.9236ce_w.703.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/eb_nmea_reception_xp.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html b/data/doc/opencpn/manual/eb_nmea_reception_xp.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html deleted file mode 100644 index 3ab715df58..0000000000 --- a/data/doc/opencpn/manual/eb_nmea_reception_xp.id.opencpn_3Aopencpn_user_manual_3Aadvanced_features_3Anetwork_repeater.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:eb_nmea_reception_xp.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:eb_nmea_reception_xp.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:eb_nmea_reception_xp.jpg

- -

- - -

- - eb_nmea_reception_xp.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/eb_nmea_reception_xp.jpeg b/data/doc/opencpn/manual/eb_nmea_reception_xp.jpeg deleted file mode 100644 index 033c2c3306..0000000000 Binary files a/data/doc/opencpn/manual/eb_nmea_reception_xp.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/europe1.h.415_tok.65838a_w.480.jpg b/data/doc/opencpn/manual/europe1.h.415_tok.65838a_w.480.jpg deleted file mode 100644 index 50b62a6e8e..0000000000 Binary files a/data/doc/opencpn/manual/europe1.h.415_tok.65838a_w.480.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/europe3.h.389_tok.1e9623_w.480.jpg b/data/doc/opencpn/manual/europe3.h.389_tok.1e9623_w.480.jpg deleted file mode 100644 index 7898fb31a8..0000000000 Binary files a/data/doc/opencpn/manual/europe3.h.389_tok.1e9623_w.480.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/explain.h.53_tok.a847d5_w.163.jpg b/data/doc/opencpn/manual/explain.h.53_tok.a847d5_w.163.jpg deleted file mode 100644 index 2db0d72a04..0000000000 Binary files a/data/doc/opencpn/manual/explain.h.53_tok.a847d5_w.163.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/eye33.h.18_tok.7aec0e_w.24.jpg b/data/doc/opencpn/manual/eye33.h.18_tok.7aec0e_w.24.jpg deleted file mode 100644 index f4b16bb3ab..0000000000 Binary files a/data/doc/opencpn/manual/eye33.h.18_tok.7aec0e_w.24.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/filtering.jpg b/data/doc/opencpn/manual/filtering.jpg deleted file mode 100644 index ff2cfad175..0000000000 Binary files a/data/doc/opencpn/manual/filtering.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/fishing.h.45_tok.7de552_w.51.jpg b/data/doc/opencpn/manual/fishing.h.45_tok.7de552_w.51.jpg deleted file mode 100644 index d11e7a49c5..0000000000 Binary files a/data/doc/opencpn/manual/fishing.h.45_tok.7de552_w.51.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/folderoptions.h.302_tok.f7a597_w.367.jpg b/data/doc/opencpn/manual/folderoptions.h.302_tok.f7a597_w.367.jpg deleted file mode 100644 index 1f6f1ac015..0000000000 Binary files a/data/doc/opencpn/manual/folderoptions.h.302_tok.f7a597_w.367.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/font.h.285_tok.2f35dd_w.300.jpg b/data/doc/opencpn/manual/font.h.285_tok.2f35dd_w.300.jpg deleted file mode 100644 index 7a38d4f9d6..0000000000 Binary files a/data/doc/opencpn/manual/font.h.285_tok.2f35dd_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/font1.h.357_tok.520ff8_w.300.jpg b/data/doc/opencpn/manual/font1.h.357_tok.520ff8_w.300.jpg deleted file mode 100644 index 4d1f8e9515..0000000000 Binary files a/data/doc/opencpn/manual/font1.h.357_tok.520ff8_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc-comp.h.218_tok.3bb55e_w.700.jpg b/data/doc/opencpn/manual/gc-comp.h.218_tok.3bb55e_w.700.jpg deleted file mode 100644 index 6962536708..0000000000 Binary files a/data/doc/opencpn/manual/gc-comp.h.218_tok.3bb55e_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc1.h.220_tok.9e3444_w.450.jpg b/data/doc/opencpn/manual/gc1.h.220_tok.9e3444_w.450.jpg deleted file mode 100644 index d443027e87..0000000000 Binary files a/data/doc/opencpn/manual/gc1.h.220_tok.9e3444_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc1.h.244_tok.13fed8_w.500.jpg b/data/doc/opencpn/manual/gc1.h.244_tok.13fed8_w.500.jpg deleted file mode 100644 index bddea1b992..0000000000 Binary files a/data/doc/opencpn/manual/gc1.h.244_tok.13fed8_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc3.h.157_tok.21bc94_w.500.jpg b/data/doc/opencpn/manual/gc3.h.157_tok.21bc94_w.500.jpg deleted file mode 100644 index 2dbf9376ff..0000000000 Binary files a/data/doc/opencpn/manual/gc3.h.157_tok.21bc94_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc4.h.117_tok.fa5ab3_w.450.jpg b/data/doc/opencpn/manual/gc4.h.117_tok.fa5ab3_w.450.jpg deleted file mode 100644 index 6bbdc3687f..0000000000 Binary files a/data/doc/opencpn/manual/gc4.h.117_tok.fa5ab3_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc6.h.213_tok.a0ddcd_w.500.jpg b/data/doc/opencpn/manual/gc6.h.213_tok.a0ddcd_w.500.jpg deleted file mode 100644 index 76d793dd6d..0000000000 Binary files a/data/doc/opencpn/manual/gc6.h.213_tok.a0ddcd_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc7.h.206_tok.ac02ae_w.500.jpg b/data/doc/opencpn/manual/gc7.h.206_tok.ac02ae_w.500.jpg deleted file mode 100644 index 36785d4056..0000000000 Binary files a/data/doc/opencpn/manual/gc7.h.206_tok.ac02ae_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gc8.h.152_tok.92f6b8_w.500.jpg b/data/doc/opencpn/manual/gc8.h.152_tok.92f6b8_w.500.jpg deleted file mode 100644 index 0486afd4a1..0000000000 Binary files a/data/doc/opencpn/manual/gc8.h.152_tok.92f6b8_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gd_nga24390.h.99_tok.13928a_w.381.jpg b/data/doc/opencpn/manual/gd_nga24390.h.99_tok.13928a_w.381.jpg deleted file mode 100644 index a11914b649..0000000000 Binary files a/data/doc/opencpn/manual/gd_nga24390.h.99_tok.13928a_w.381.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gdb.tok.5bdf50_w.750.jpg b/data/doc/opencpn/manual/gdb.tok.5bdf50_w.750.jpg deleted file mode 100644 index 7e9544e754..0000000000 Binary files a/data/doc/opencpn/manual/gdb.tok.5bdf50_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gdb1.tok.6809f1_w.750.jpg b/data/doc/opencpn/manual/gdb1.tok.6809f1_w.750.jpg deleted file mode 100644 index 22877048df..0000000000 Binary files a/data/doc/opencpn/manual/gdb1.tok.6809f1_w.750.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/geolocationtcp_zps5cb554ea.h.387_tok.52de34_w.386.jpg b/data/doc/opencpn/manual/geolocationtcp_zps5cb554ea.h.387_tok.52de34_w.386.jpg deleted file mode 100644 index a8fe57e593..0000000000 Binary files a/data/doc/opencpn/manual/geolocationtcp_zps5cb554ea.h.387_tok.52de34_w.386.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gl.h.172_tok.554a05_w.200.jpg b/data/doc/opencpn/manual/gl.h.172_tok.554a05_w.200.jpg deleted file mode 100644 index 7c72345259..0000000000 Binary files a/data/doc/opencpn/manual/gl.h.172_tok.554a05_w.200.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/goodsurvey.tok.d71b4b_w.100.jpg b/data/doc/opencpn/manual/goodsurvey.tok.d71b4b_w.100.jpg deleted file mode 100644 index 519eb31112..0000000000 Binary files a/data/doc/opencpn/manual/goodsurvey.tok.d71b4b_w.100.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gps1.h.28_tok.2e27bd_w.28.jpg b/data/doc/opencpn/manual/gps1.h.28_tok.2e27bd_w.28.jpg deleted file mode 100644 index 7c885e49d0..0000000000 Binary files a/data/doc/opencpn/manual/gps1.h.28_tok.2e27bd_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gps1.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/gps1.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 40c1678016..0000000000 --- a/data/doc/opencpn/manual/gps1.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gps1.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:gps1.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gps1.jpg

- -

- - -

- - gps1.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gps1.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html b/data/doc/opencpn/manual/gps1.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html deleted file mode 100644 index 39811a474a..0000000000 --- a/data/doc/opencpn/manual/gps1.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gps1.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - -
-
- -
-
-
-
- -

- opencpn:manual:gps1.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gps1.jpg

- -

- - -

- - gps1.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gps1.jpg b/data/doc/opencpn/manual/gps1.jpg deleted file mode 100644 index 7c885e49d0..0000000000 Binary files a/data/doc/opencpn/manual/gps1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gps2.h.28_tok.5ad267_w.28.jpg b/data/doc/opencpn/manual/gps2.h.28_tok.5ad267_w.28.jpg deleted file mode 100644 index 99ff35c436..0000000000 Binary files a/data/doc/opencpn/manual/gps2.h.28_tok.5ad267_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gps2.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/gps2.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 9fdadbe1a3..0000000000 --- a/data/doc/opencpn/manual/gps2.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gps2.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:gps2.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gps2.jpg

- -

- - -

- - gps2.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gps2.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html b/data/doc/opencpn/manual/gps2.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html deleted file mode 100644 index 36edef9af2..0000000000 --- a/data/doc/opencpn/manual/gps2.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gps2.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - -
-
- -
-
-
-
- -

- opencpn:manual:gps2.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gps2.jpg

- -

- - -

- - gps2.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gps2.jpg b/data/doc/opencpn/manual/gps2.jpg deleted file mode 100644 index 99ff35c436..0000000000 Binary files a/data/doc/opencpn/manual/gps2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gps3.h.28_tok.982317_w.28.jpg b/data/doc/opencpn/manual/gps3.h.28_tok.982317_w.28.jpg deleted file mode 100644 index 68ac6294f1..0000000000 Binary files a/data/doc/opencpn/manual/gps3.h.28_tok.982317_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gps3.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/gps3.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 8909c4abf6..0000000000 --- a/data/doc/opencpn/manual/gps3.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gps3.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:gps3.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gps3.jpg

- -

- - -

- - gps3.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gps3.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html b/data/doc/opencpn/manual/gps3.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html deleted file mode 100644 index d91bc90b35..0000000000 --- a/data/doc/opencpn/manual/gps3.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gps3.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - -
-
- -
-
-
-
- -

- opencpn:manual:gps3.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gps3.jpg

- -

- - -

- - gps3.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gps3.jpg b/data/doc/opencpn/manual/gps3.jpg deleted file mode 100644 index 68ac6294f1..0000000000 Binary files a/data/doc/opencpn/manual/gps3.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gpsd-con1.tok.23e4c3_w.600.jpg b/data/doc/opencpn/manual/gpsd-con1.tok.23e4c3_w.600.jpg deleted file mode 100644 index fdc9543a92..0000000000 Binary files a/data/doc/opencpn/manual/gpsd-con1.tok.23e4c3_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gpsg_buddy.h.209_tok.3b5dcb_w.400.jpeg b/data/doc/opencpn/manual/gpsg_buddy.h.209_tok.3b5dcb_w.400.jpeg deleted file mode 100644 index b3cd619059..0000000000 Binary files a/data/doc/opencpn/manual/gpsg_buddy.h.209_tok.3b5dcb_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/gpsgrn.h.28_tok.cc499e_w.28.jpg b/data/doc/opencpn/manual/gpsgrn.h.28_tok.cc499e_w.28.jpg deleted file mode 100644 index 01cb60bebb..0000000000 Binary files a/data/doc/opencpn/manual/gpsgrn.h.28_tok.cc499e_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gpsgrn.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/gpsgrn.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 6a6630c1d4..0000000000 --- a/data/doc/opencpn/manual/gpsgrn.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gpsgrn.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:gpsgrn.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gpsgrn.jpg

- -

- - -

- - gpsgrn.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gpsgrn.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html b/data/doc/opencpn/manual/gpsgrn.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html deleted file mode 100644 index 0039918d50..0000000000 --- a/data/doc/opencpn/manual/gpsgrn.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gpsgrn.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - -
-
- -
-
-
-
- -

- opencpn:manual:gpsgrn.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gpsgrn.jpg

- -

- - -

- - gpsgrn.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gpsgrn.jpg b/data/doc/opencpn/manual/gpsgrn.jpg deleted file mode 100644 index 01cb60bebb..0000000000 Binary files a/data/doc/opencpn/manual/gpsgrn.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gpsred.h.28_tok.59c3e0_w.28.jpg b/data/doc/opencpn/manual/gpsred.h.28_tok.59c3e0_w.28.jpg deleted file mode 100644 index 58ff7c894d..0000000000 Binary files a/data/doc/opencpn/manual/gpsred.h.28_tok.59c3e0_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gpsred.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/gpsred.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index db9c93c717..0000000000 --- a/data/doc/opencpn/manual/gpsred.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gpsred.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:gpsred.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gpsred.jpg

- -

- - -

- - gpsred.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gpsred.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html b/data/doc/opencpn/manual/gpsred.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html deleted file mode 100644 index 4db69fb311..0000000000 --- a/data/doc/opencpn/manual/gpsred.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gpsred.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - -
-
- -
-
-
-
- -

- opencpn:manual:gpsred.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gpsred.jpg

- -

- - -

- - gpsred.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gpsred.jpg b/data/doc/opencpn/manual/gpsred.jpg deleted file mode 100644 index 58ff7c894d..0000000000 Binary files a/data/doc/opencpn/manual/gpsred.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gray-nogps.h.53_tok.b94028_w.26.jpg b/data/doc/opencpn/manual/gray-nogps.h.53_tok.b94028_w.26.jpg deleted file mode 100644 index 9a240399ab..0000000000 Binary files a/data/doc/opencpn/manual/gray-nogps.h.53_tok.b94028_w.26.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gray-nogps.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/gray-nogps.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 661c001efa..0000000000 --- a/data/doc/opencpn/manual/gray-nogps.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gray-nogps.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:gray-nogps.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gray-nogps.jpg

- -

- - -

- - gray-nogps.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gray-nogps.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html b/data/doc/opencpn/manual/gray-nogps.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html deleted file mode 100644 index 9530c6d4d6..0000000000 --- a/data/doc/opencpn/manual/gray-nogps.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:gray-nogps.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:gray-nogps.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:gray-nogps.jpg

- -

- - -

- - gray-nogps.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/gray-nogps.jpg b/data/doc/opencpn/manual/gray-nogps.jpg deleted file mode 100644 index 9a240399ab..0000000000 Binary files a/data/doc/opencpn/manual/gray-nogps.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/gray-nogps.tok.39413d_w.25.jpg b/data/doc/opencpn/manual/gray-nogps.tok.39413d_w.25.jpg deleted file mode 100644 index 57ae70ece6..0000000000 Binary files a/data/doc/opencpn/manual/gray-nogps.tok.39413d_w.25.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/group.h.258_tok.35b873_w.564.jpeg b/data/doc/opencpn/manual/group.h.258_tok.35b873_w.564.jpeg deleted file mode 100644 index b8508fa400..0000000000 Binary files a/data/doc/opencpn/manual/group.h.258_tok.35b873_w.564.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/group.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.jpeg.detail.html b/data/doc/opencpn/manual/group.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.jpeg.detail.html deleted file mode 100644 index 8a8886e63c..0000000000 --- a/data/doc/opencpn/manual/group.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.jpeg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:group.jpeg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:group.jpeg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:group.jpeg

- -

- - -

- - group.jpeg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/group.jpeg b/data/doc/opencpn/manual/group.jpeg deleted file mode 100644 index b8508fa400..0000000000 Binary files a/data/doc/opencpn/manual/group.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/halfadegree.h.152_tok.10740e_w.607.jpg b/data/doc/opencpn/manual/halfadegree.h.152_tok.10740e_w.607.jpg deleted file mode 100644 index fcf26a05b6..0000000000 Binary files a/data/doc/opencpn/manual/halfadegree.h.152_tok.10740e_w.607.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/havannah-ext.h.254_tok.2723cb_w.500.jpg b/data/doc/opencpn/manual/havannah-ext.h.254_tok.2723cb_w.500.jpg deleted file mode 100644 index cc908294cd..0000000000 Binary files a/data/doc/opencpn/manual/havannah-ext.h.254_tok.2723cb_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/havannah-noext.h.249_tok.411f64_w.500.jpg b/data/doc/opencpn/manual/havannah-noext.h.249_tok.411f64_w.500.jpg deleted file mode 100644 index e9aa26e770..0000000000 Binary files a/data/doc/opencpn/manual/havannah-noext.h.249_tok.411f64_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/headingline1.h.314_tok.297216_w.594.jpg b/data/doc/opencpn/manual/headingline1.h.314_tok.297216_w.594.jpg deleted file mode 100644 index eee961e6bf..0000000000 Binary files a/data/doc/opencpn/manual/headingline1.h.314_tok.297216_w.594.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/headingline1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/headingline1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 8b9dda7ac6..0000000000 --- a/data/doc/opencpn/manual/headingline1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:headingline1.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:headingline1.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:headingline1.jpg

- -

- - -

- - headingline1.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/headingline1.jpg b/data/doc/opencpn/manual/headingline1.jpg deleted file mode 100644 index eee961e6bf..0000000000 Binary files a/data/doc/opencpn/manual/headingline1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/help-about.h.311_tok.b4352d_w.356.jpeg b/data/doc/opencpn/manual/help-about.h.311_tok.b4352d_w.356.jpeg deleted file mode 100644 index cf17e31a1f..0000000000 Binary files a/data/doc/opencpn/manual/help-about.h.311_tok.b4352d_w.356.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/help.h.24_tok.ce6ec6_w.24.jpg b/data/doc/opencpn/manual/help.h.24_tok.ce6ec6_w.24.jpg deleted file mode 100644 index e3966badc1..0000000000 Binary files a/data/doc/opencpn/manual/help.h.24_tok.ce6ec6_w.24.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/help.h.25_tok.1099a9_w.25.jpg b/data/doc/opencpn/manual/help.h.25_tok.1099a9_w.25.jpg deleted file mode 100644 index 3ec6d71518..0000000000 Binary files a/data/doc/opencpn/manual/help.h.25_tok.1099a9_w.25.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/help.h.31_tok.eda0cb_w.28.jpg b/data/doc/opencpn/manual/help.h.31_tok.eda0cb_w.28.jpg deleted file mode 100644 index ffa34fa9e0..0000000000 Binary files a/data/doc/opencpn/manual/help.h.31_tok.eda0cb_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/help.h.32_tok.a918da_w.32.jpg b/data/doc/opencpn/manual/help.h.32_tok.a918da_w.32.jpg deleted file mode 100644 index c8d228145d..0000000000 Binary files a/data/doc/opencpn/manual/help.h.32_tok.a918da_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/help.h.33_tok.b2c065_w.28.jpg b/data/doc/opencpn/manual/help.h.33_tok.b2c065_w.28.jpg deleted file mode 100644 index 6529cd3c58..0000000000 Binary files a/data/doc/opencpn/manual/help.h.33_tok.b2c065_w.28.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/help.jpg b/data/doc/opencpn/manual/help.jpg deleted file mode 100644 index 6529cd3c58..0000000000 Binary files a/data/doc/opencpn/manual/help.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/help_1.h.507_tok.d1ff22_w.500.jpg b/data/doc/opencpn/manual/help_1.h.507_tok.d1ff22_w.500.jpg deleted file mode 100644 index 154f307347..0000000000 Binary files a/data/doc/opencpn/manual/help_1.h.507_tok.d1ff22_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/hidden-quilt.h.21_tok.d676fb_w.150.jpg b/data/doc/opencpn/manual/hidden-quilt.h.21_tok.d676fb_w.150.jpg deleted file mode 100644 index b59165a3f0..0000000000 Binary files a/data/doc/opencpn/manual/hidden-quilt.h.21_tok.d676fb_w.150.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/hidden-quilt.h.30_tok.d7da46_w.130.jpg b/data/doc/opencpn/manual/hidden-quilt.h.30_tok.d7da46_w.130.jpg deleted file mode 100644 index bb986bffe8..0000000000 Binary files a/data/doc/opencpn/manual/hidden-quilt.h.30_tok.d7da46_w.130.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/highlight.h.308_tok.293012_w.400.jpg b/data/doc/opencpn/manual/highlight.h.308_tok.293012_w.400.jpg deleted file mode 100644 index 07cc74b3c6..0000000000 Binary files a/data/doc/opencpn/manual/highlight.h.308_tok.293012_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/highlight.h.583_tok.f43fc6_w.756.jpg b/data/doc/opencpn/manual/highlight.h.583_tok.f43fc6_w.756.jpg deleted file mode 100644 index 7d8954457b..0000000000 Binary files a/data/doc/opencpn/manual/highlight.h.583_tok.f43fc6_w.756.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/highlight.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/highlight.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 4611c8bcee..0000000000 --- a/data/doc/opencpn/manual/highlight.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:highlight.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:highlight.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:highlight.jpg

- -

- - -

- - highlight.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/highlight.jpg b/data/doc/opencpn/manual/highlight.jpg deleted file mode 100644 index 7d8954457b..0000000000 Binary files a/data/doc/opencpn/manual/highlight.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/hotkeys3.h.363_tok.956bd3_w.681.gif b/data/doc/opencpn/manual/hotkeys3.h.363_tok.956bd3_w.681.gif deleted file mode 100644 index aa112a7877..0000000000 Binary files a/data/doc/opencpn/manual/hotkeys3.h.363_tok.956bd3_w.681.gif and /dev/null differ diff --git a/data/doc/opencpn/manual/hsc.h.52_tok.af4d9d_w.50.jpg b/data/doc/opencpn/manual/hsc.h.52_tok.af4d9d_w.50.jpg deleted file mode 100644 index 041f3af14b..0000000000 Binary files a/data/doc/opencpn/manual/hsc.h.52_tok.af4d9d_w.50.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/icon-enc-text-on.h.34_tok.7969e0_w.33.jpg b/data/doc/opencpn/manual/icon-enc-text-on.h.34_tok.7969e0_w.33.jpg deleted file mode 100644 index b3209718ca..0000000000 Binary files a/data/doc/opencpn/manual/icon-enc-text-on.h.34_tok.7969e0_w.33.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/iec_ais_aton_sym-real.h.632_tok.6282c5_w.600.jpeg b/data/doc/opencpn/manual/iec_ais_aton_sym-real.h.632_tok.6282c5_w.600.jpeg deleted file mode 100644 index db1be9d815..0000000000 Binary files a/data/doc/opencpn/manual/iec_ais_aton_sym-real.h.632_tok.6282c5_w.600.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/iec_ais_aton_sym-virtual.h.630_tok.e781dd_w.599.jpeg b/data/doc/opencpn/manual/iec_ais_aton_sym-virtual.h.630_tok.e781dd_w.599.jpeg deleted file mode 100644 index 469644c1d0..0000000000 Binary files a/data/doc/opencpn/manual/iec_ais_aton_sym-virtual.h.630_tok.e781dd_w.599.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ifeahche_1.h.50_tok.ddb82e_w.51.jpg b/data/doc/opencpn/manual/ifeahche_1.h.50_tok.ddb82e_w.51.jpg deleted file mode 100644 index 01fed4a834..0000000000 Binary files a/data/doc/opencpn/manual/ifeahche_1.h.50_tok.ddb82e_w.51.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/in1.h.89_tok.304960_w.600.jpg b/data/doc/opencpn/manual/in1.h.89_tok.304960_w.600.jpg deleted file mode 100644 index c4e01b6952..0000000000 Binary files a/data/doc/opencpn/manual/in1.h.89_tok.304960_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/in11.h.21_tok.9a67af_w.217.jpg b/data/doc/opencpn/manual/in11.h.21_tok.9a67af_w.217.jpg deleted file mode 100644 index d17af32b57..0000000000 Binary files a/data/doc/opencpn/manual/in11.h.21_tok.9a67af_w.217.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/in2.h.93_tok.c417ba_w.600.jpg b/data/doc/opencpn/manual/in2.h.93_tok.c417ba_w.600.jpg deleted file mode 100644 index 37ff87f602..0000000000 Binary files a/data/doc/opencpn/manual/in2.h.93_tok.c417ba_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/in2.h.95_tok.2f8a23_w.614.jpg b/data/doc/opencpn/manual/in2.h.95_tok.2f8a23_w.614.jpg deleted file mode 100644 index 7ff6d49ed5..0000000000 Binary files a/data/doc/opencpn/manual/in2.h.95_tok.2f8a23_w.614.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/in22.h.21_tok.abacca_w.230.jpg b/data/doc/opencpn/manual/in22.h.21_tok.abacca_w.230.jpg deleted file mode 100644 index a7a5c9fbb0..0000000000 Binary files a/data/doc/opencpn/manual/in22.h.21_tok.abacca_w.230.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt.h.284_tok.5dfa03_w.600.jpg b/data/doc/opencpn/manual/incwpt.h.284_tok.5dfa03_w.600.jpg deleted file mode 100644 index d87954d82f..0000000000 Binary files a/data/doc/opencpn/manual/incwpt.h.284_tok.5dfa03_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt1.h.438_tok.3d0b2c_w.600.jpg b/data/doc/opencpn/manual/incwpt1.h.438_tok.3d0b2c_w.600.jpg deleted file mode 100644 index a62f8085a3..0000000000 Binary files a/data/doc/opencpn/manual/incwpt1.h.438_tok.3d0b2c_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt2.h.245_tok.ed27c7_w.600.jpg b/data/doc/opencpn/manual/incwpt2.h.245_tok.ed27c7_w.600.jpg deleted file mode 100644 index 11ef472fb5..0000000000 Binary files a/data/doc/opencpn/manual/incwpt2.h.245_tok.ed27c7_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt3.h.429_tok.5222f7_w.600.jpg b/data/doc/opencpn/manual/incwpt3.h.429_tok.5222f7_w.600.jpg deleted file mode 100644 index 4f76306a1b..0000000000 Binary files a/data/doc/opencpn/manual/incwpt3.h.429_tok.5222f7_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt4.h.114_tok.633218_w.600.jpg b/data/doc/opencpn/manual/incwpt4.h.114_tok.633218_w.600.jpg deleted file mode 100644 index e9b7410ed6..0000000000 Binary files a/data/doc/opencpn/manual/incwpt4.h.114_tok.633218_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt5.h.435_tok.43dd08_w.600.jpg b/data/doc/opencpn/manual/incwpt5.h.435_tok.43dd08_w.600.jpg deleted file mode 100644 index 671f3b72ee..0000000000 Binary files a/data/doc/opencpn/manual/incwpt5.h.435_tok.43dd08_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt6.h.361_tok.429cd7_w.600.jpg b/data/doc/opencpn/manual/incwpt6.h.361_tok.429cd7_w.600.jpg deleted file mode 100644 index 239037cd75..0000000000 Binary files a/data/doc/opencpn/manual/incwpt6.h.361_tok.429cd7_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt7.h.172_tok.764f5a_w.600.jpg b/data/doc/opencpn/manual/incwpt7.h.172_tok.764f5a_w.600.jpg deleted file mode 100644 index 52195a2a30..0000000000 Binary files a/data/doc/opencpn/manual/incwpt7.h.172_tok.764f5a_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/incwpt8.jpg b/data/doc/opencpn/manual/incwpt8.jpg deleted file mode 100644 index e3e1248a85..0000000000 Binary files a/data/doc/opencpn/manual/incwpt8.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/inland-blue.h.44_tok.43c006_w.45.jpg b/data/doc/opencpn/manual/inland-blue.h.44_tok.43c006_w.45.jpg deleted file mode 100644 index 46a0a136d9..0000000000 Binary files a/data/doc/opencpn/manual/inland-blue.h.44_tok.43c006_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/last-button.h.119_tok.59cb2b_w.400.jpg b/data/doc/opencpn/manual/last-button.h.119_tok.59cb2b_w.400.jpg deleted file mode 100644 index 39d8d09c3f..0000000000 Binary files a/data/doc/opencpn/manual/last-button.h.119_tok.59cb2b_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/layer-prop.h.121_tok.485325_w.400.jpg b/data/doc/opencpn/manual/layer-prop.h.121_tok.485325_w.400.jpg deleted file mode 100644 index 3084f66b67..0000000000 Binary files a/data/doc/opencpn/manual/layer-prop.h.121_tok.485325_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/layer-prop1.h.65_tok.ce252b_w.400.jpg b/data/doc/opencpn/manual/layer-prop1.h.65_tok.ce252b_w.400.jpg deleted file mode 100644 index 43f371556c..0000000000 Binary files a/data/doc/opencpn/manual/layer-prop1.h.65_tok.ce252b_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/layer-track2.jpg b/data/doc/opencpn/manual/layer-track2.jpg deleted file mode 100644 index e7d4922e71..0000000000 Binary files a/data/doc/opencpn/manual/layer-track2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/layer22.h.455_tok.8645ee_w.600.jpg b/data/doc/opencpn/manual/layer22.h.455_tok.8645ee_w.600.jpg deleted file mode 100644 index ae728d7859..0000000000 Binary files a/data/doc/opencpn/manual/layer22.h.455_tok.8645ee_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/layer_route1.h.80_tok.f73098_w.200.jpg b/data/doc/opencpn/manual/layer_route1.h.80_tok.f73098_w.200.jpg deleted file mode 100644 index 9aaa08ccab..0000000000 Binary files a/data/doc/opencpn/manual/layer_route1.h.80_tok.f73098_w.200.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/layers-show2.jpg b/data/doc/opencpn/manual/layers-show2.jpg deleted file mode 100644 index 7876adf6c1..0000000000 Binary files a/data/doc/opencpn/manual/layers-show2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/lockwpt.h.45_tok.b21c56_w.471.jpg b/data/doc/opencpn/manual/lockwpt.h.45_tok.b21c56_w.471.jpg deleted file mode 100644 index a1ed9380ac..0000000000 Binary files a/data/doc/opencpn/manual/lockwpt.h.45_tok.b21c56_w.471.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/lowprec.h.58_tok.0fd88b_w.55.jpg b/data/doc/opencpn/manual/lowprec.h.58_tok.0fd88b_w.55.jpg deleted file mode 100644 index 33af13e67e..0000000000 Binary files a/data/doc/opencpn/manual/lowprec.h.58_tok.0fd88b_w.55.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/lowprec.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/lowprec.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 9e2f168d36..0000000000 --- a/data/doc/opencpn/manual/lowprec.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:lowprec.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:lowprec.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:lowprec.jpg

- -

- - -

- - lowprec.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/lowprec.jpg b/data/doc/opencpn/manual/lowprec.jpg deleted file mode 100644 index 33af13e67e..0000000000 Binary files a/data/doc/opencpn/manual/lowprec.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/lowprec1.h.72_tok.f545d9_w.539.jpg b/data/doc/opencpn/manual/lowprec1.h.72_tok.f545d9_w.539.jpg deleted file mode 100644 index b6c713b837..0000000000 Binary files a/data/doc/opencpn/manual/lowprec1.h.72_tok.f545d9_w.539.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/lowprec1.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/lowprec1.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index ef0465572a..0000000000 --- a/data/doc/opencpn/manual/lowprec1.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:lowprec1.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:lowprec1.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:lowprec1.jpg

- -

- - -

- - lowprec1.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/lowprec1.jpg b/data/doc/opencpn/manual/lowprec1.jpg deleted file mode 100644 index b6c713b837..0000000000 Binary files a/data/doc/opencpn/manual/lowprec1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mad-track.h.323_tok.a045d5_w.400.jpg b/data/doc/opencpn/manual/mad-track.h.323_tok.a045d5_w.400.jpg deleted file mode 100644 index 229853f692..0000000000 Binary files a/data/doc/opencpn/manual/mad-track.h.323_tok.a045d5_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mad-track2.h.314_tok.d521ef_w.400.jpg b/data/doc/opencpn/manual/mad-track2.h.314_tok.d521ef_w.400.jpg deleted file mode 100644 index 71e23ee861..0000000000 Binary files a/data/doc/opencpn/manual/mad-track2.h.314_tok.d521ef_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/magnetic_show.h.48_tok.c0e613_w.146.jpg b/data/doc/opencpn/manual/magnetic_show.h.48_tok.c0e613_w.146.jpg deleted file mode 100644 index aab5ef2d31..0000000000 Binary files a/data/doc/opencpn/manual/magnetic_show.h.48_tok.c0e613_w.146.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/magnetic_show.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/magnetic_show.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index 7b44237e7a..0000000000 --- a/data/doc/opencpn/manual/magnetic_show.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:magnetic_show.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:magnetic_show.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:magnetic_show.jpg

- -

- - -

- - magnetic_show.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/magnetic_show.jpg b/data/doc/opencpn/manual/magnetic_show.jpg deleted file mode 100644 index aab5ef2d31..0000000000 Binary files a/data/doc/opencpn/manual/magnetic_show.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark-create.h.284_tok.527931_w.300.jpg b/data/doc/opencpn/manual/mark-create.h.284_tok.527931_w.300.jpg deleted file mode 100644 index 13c251fe24..0000000000 Binary files a/data/doc/opencpn/manual/mark-create.h.284_tok.527931_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark-shipwreck.h.36_tok.63a7e3_w.40.jpg b/data/doc/opencpn/manual/mark-shipwreck.h.36_tok.63a7e3_w.40.jpg deleted file mode 100644 index fe5be0a455..0000000000 Binary files a/data/doc/opencpn/manual/mark-shipwreck.h.36_tok.63a7e3_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark-triangle.h.36_tok.1768a1_w.37.jpg b/data/doc/opencpn/manual/mark-triangle.h.36_tok.1768a1_w.37.jpg deleted file mode 100644 index 354872e935..0000000000 Binary files a/data/doc/opencpn/manual/mark-triangle.h.36_tok.1768a1_w.37.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark-undo-create-waypoint.h.272_tok.149d26_w.300.jpg b/data/doc/opencpn/manual/mark-undo-create-waypoint.h.272_tok.149d26_w.300.jpg deleted file mode 100644 index 94cbe228fa..0000000000 Binary files a/data/doc/opencpn/manual/mark-undo-create-waypoint.h.272_tok.149d26_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark10.h.220_tok.5bf06b_w.500.jpg b/data/doc/opencpn/manual/mark10.h.220_tok.5bf06b_w.500.jpg deleted file mode 100644 index da5bb9aa95..0000000000 Binary files a/data/doc/opencpn/manual/mark10.h.220_tok.5bf06b_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark2.h.489_tok.9e5cbc_w.500.jpg b/data/doc/opencpn/manual/mark2.h.489_tok.9e5cbc_w.500.jpg deleted file mode 100644 index 8d4cc7fbb5..0000000000 Binary files a/data/doc/opencpn/manual/mark2.h.489_tok.9e5cbc_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark3.h.489_tok.9ce806_w.500.jpg b/data/doc/opencpn/manual/mark3.h.489_tok.9ce806_w.500.jpg deleted file mode 100644 index 4939997e4f..0000000000 Binary files a/data/doc/opencpn/manual/mark3.h.489_tok.9ce806_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark4.h.601_tok.71c48d_w.700.jpg b/data/doc/opencpn/manual/mark4.h.601_tok.71c48d_w.700.jpg deleted file mode 100644 index 890d674b57..0000000000 Binary files a/data/doc/opencpn/manual/mark4.h.601_tok.71c48d_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark6.h.180_tok.b52aed_w.500.jpg b/data/doc/opencpn/manual/mark6.h.180_tok.b52aed_w.500.jpg deleted file mode 100644 index fc5777b3be..0000000000 Binary files a/data/doc/opencpn/manual/mark6.h.180_tok.b52aed_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark7.h.178_tok.562119_w.500.jpg b/data/doc/opencpn/manual/mark7.h.178_tok.562119_w.500.jpg deleted file mode 100644 index a2f2c0c320..0000000000 Binary files a/data/doc/opencpn/manual/mark7.h.178_tok.562119_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark8.h.489_tok.202541_w.500.jpg b/data/doc/opencpn/manual/mark8.h.489_tok.202541_w.500.jpg deleted file mode 100644 index 8ac3c36380..0000000000 Binary files a/data/doc/opencpn/manual/mark8.h.489_tok.202541_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mark9.h.176_tok.dcd996_w.500.jpg b/data/doc/opencpn/manual/mark9.h.176_tok.dcd996_w.500.jpg deleted file mode 100644 index 00a8ae7c6e..0000000000 Binary files a/data/doc/opencpn/manual/mark9.h.176_tok.dcd996_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-ais.h.208_tok.29f17d_w.318.jpg b/data/doc/opencpn/manual/menubar-ais.h.208_tok.29f17d_w.318.jpg deleted file mode 100644 index f6651be036..0000000000 Binary files a/data/doc/opencpn/manual/menubar-ais.h.208_tok.29f17d_w.318.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-ais.h.216_tok.4f6dcd_w.462.jpg b/data/doc/opencpn/manual/menubar-ais.h.216_tok.4f6dcd_w.462.jpg deleted file mode 100644 index 1f2a8c8d54..0000000000 Binary files a/data/doc/opencpn/manual/menubar-ais.h.216_tok.4f6dcd_w.462.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-help.h.81_tok.881da0_w.203.jpg b/data/doc/opencpn/manual/menubar-help.h.81_tok.881da0_w.203.jpg deleted file mode 100644 index ff5a0b372c..0000000000 Binary files a/data/doc/opencpn/manual/menubar-help.h.81_tok.881da0_w.203.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-navigation.h.278_tok.6b145f_w.290.jpg b/data/doc/opencpn/manual/menubar-navigation.h.278_tok.6b145f_w.290.jpg deleted file mode 100644 index b298f2d69e..0000000000 Binary files a/data/doc/opencpn/manual/menubar-navigation.h.278_tok.6b145f_w.290.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-toolbar-chart.h.130_tok.97010f_w.656.jpg b/data/doc/opencpn/manual/menubar-toolbar-chart.h.130_tok.97010f_w.656.jpg deleted file mode 100644 index 3e882e1dc4..0000000000 Binary files a/data/doc/opencpn/manual/menubar-toolbar-chart.h.130_tok.97010f_w.656.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-toolbar-chart.h.148_tok.40fd1c_w.744.jpg b/data/doc/opencpn/manual/menubar-toolbar-chart.h.148_tok.40fd1c_w.744.jpg deleted file mode 100644 index 56d9409db7..0000000000 Binary files a/data/doc/opencpn/manual/menubar-toolbar-chart.h.148_tok.40fd1c_w.744.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-toolbar-chart.h.161_tok.964529_w.800.jpg b/data/doc/opencpn/manual/menubar-toolbar-chart.h.161_tok.964529_w.800.jpg deleted file mode 100644 index ee1d2cd9d3..0000000000 Binary files a/data/doc/opencpn/manual/menubar-toolbar-chart.h.161_tok.964529_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-toolbar-chart.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/menubar-toolbar-chart.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index fddc6c5b50..0000000000 --- a/data/doc/opencpn/manual/menubar-toolbar-chart.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:menubar-toolbar-chart.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:menubar-toolbar-chart.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:menubar-toolbar-chart.jpg

- -

- - -

- - menubar-toolbar-chart.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/menubar-toolbar-chart.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html b/data/doc/opencpn/manual/menubar-toolbar-chart.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html deleted file mode 100644 index cf3a7707c5..0000000000 --- a/data/doc/opencpn/manual/menubar-toolbar-chart.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:menubar-toolbar-chart.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:menubar-toolbar-chart.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:menubar-toolbar-chart.jpg

- -

- - -

- - menubar-toolbar-chart.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/menubar-toolbar-chart.jpg b/data/doc/opencpn/manual/menubar-toolbar-chart.jpg deleted file mode 100644 index ee1d2cd9d3..0000000000 Binary files a/data/doc/opencpn/manual/menubar-toolbar-chart.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-toolbar-chart.tok.344b0a_w.400.jpg b/data/doc/opencpn/manual/menubar-toolbar-chart.tok.344b0a_w.400.jpg deleted file mode 100644 index c004ddf1e5..0000000000 Binary files a/data/doc/opencpn/manual/menubar-toolbar-chart.tok.344b0a_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-tools.h.229_tok.1be6a9_w.325.jpg b/data/doc/opencpn/manual/menubar-tools.h.229_tok.1be6a9_w.325.jpg deleted file mode 100644 index f930e14b58..0000000000 Binary files a/data/doc/opencpn/manual/menubar-tools.h.229_tok.1be6a9_w.325.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar-view.h.325_tok.4c07c2_w.301.jpg b/data/doc/opencpn/manual/menubar-view.h.325_tok.4c07c2_w.301.jpg deleted file mode 100644 index 45c54c9774..0000000000 Binary files a/data/doc/opencpn/manual/menubar-view.h.325_tok.4c07c2_w.301.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/menubar.tok.49909c_w.700.jpg b/data/doc/opencpn/manual/menubar.tok.49909c_w.700.jpg deleted file mode 100644 index 3e41a2c958..0000000000 Binary files a/data/doc/opencpn/manual/menubar.tok.49909c_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mmsi_prop_list1.h.588_tok.9af40b_w.635.jpg b/data/doc/opencpn/manual/mmsi_prop_list1.h.588_tok.9af40b_w.635.jpg deleted file mode 100644 index 656fe90fde..0000000000 Binary files a/data/doc/opencpn/manual/mmsi_prop_list1.h.588_tok.9af40b_w.635.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mmsi_prop_list1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/mmsi_prop_list1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index a34992c600..0000000000 --- a/data/doc/opencpn/manual/mmsi_prop_list1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:mmsi_prop_list1.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:mmsi_prop_list1.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:mmsi_prop_list1.jpg

- -

- - -

- - mmsi_prop_list1.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/mmsi_prop_list1.jpg b/data/doc/opencpn/manual/mmsi_prop_list1.jpg deleted file mode 100644 index 656fe90fde..0000000000 Binary files a/data/doc/opencpn/manual/mmsi_prop_list1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mob-choice.h.178_tok.5a9916_w.500.jpg b/data/doc/opencpn/manual/mob-choice.h.178_tok.5a9916_w.500.jpg deleted file mode 100644 index 6319c3fb74..0000000000 Binary files a/data/doc/opencpn/manual/mob-choice.h.178_tok.5a9916_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mob_btn.h.32_tok.58ec3f_w.32.jpg b/data/doc/opencpn/manual/mob_btn.h.32_tok.58ec3f_w.32.jpg deleted file mode 100644 index e50ff0c0f5..0000000000 Binary files a/data/doc/opencpn/manual/mob_btn.h.32_tok.58ec3f_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/moored.h.40_tok.4f82b4_w.54.jpg b/data/doc/opencpn/manual/moored.h.40_tok.4f82b4_w.54.jpg deleted file mode 100644 index 7dbadeccf6..0000000000 Binary files a/data/doc/opencpn/manual/moored.h.40_tok.4f82b4_w.54.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/mqual.tok.20176a_w.400.jpg b/data/doc/opencpn/manual/mqual.tok.20176a_w.400.jpg deleted file mode 100644 index 76a3f6eedf..0000000000 Binary files a/data/doc/opencpn/manual/mqual.tok.20176a_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/multileg.h.581_tok.464c0e_w.500.jpg b/data/doc/opencpn/manual/multileg.h.581_tok.464c0e_w.500.jpg deleted file mode 100644 index 4afdfed28b..0000000000 Binary files a/data/doc/opencpn/manual/multileg.h.581_tok.464c0e_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/nogl.h.167_tok.e9efce_w.200.jpg b/data/doc/opencpn/manual/nogl.h.167_tok.e9efce_w.200.jpg deleted file mode 100644 index 65fcd3238e..0000000000 Binary files a/data/doc/opencpn/manual/nogl.h.167_tok.e9efce_w.200.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/north-up.h.34_tok.bdfc3d_w.29.jpg b/data/doc/opencpn/manual/north-up.h.34_tok.bdfc3d_w.29.jpg deleted file mode 100644 index 028f85bbca..0000000000 Binary files a/data/doc/opencpn/manual/north-up.h.34_tok.bdfc3d_w.29.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/not_participate.h.30_tok.e7318f_w.130.jpg b/data/doc/opencpn/manual/not_participate.h.30_tok.e7318f_w.130.jpg deleted file mode 100644 index 4a8fe8a9c4..0000000000 Binary files a/data/doc/opencpn/manual/not_participate.h.30_tok.e7318f_w.130.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/notundcom.h.54_tok.ca8f00_w.50.jpg b/data/doc/opencpn/manual/notundcom.h.54_tok.ca8f00_w.50.jpg deleted file mode 100644 index 676cd191e3..0000000000 Binary files a/data/doc/opencpn/manual/notundcom.h.54_tok.ca8f00_w.50.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/nr9.h.49_tok.d5b65d_w.51.jpg b/data/doc/opencpn/manual/nr9.h.49_tok.d5b65d_w.51.jpg deleted file mode 100644 index b7102d498f..0000000000 Binary files a/data/doc/opencpn/manual/nr9.h.49_tok.d5b65d_w.51.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/objq.h.489_tok.b86de5_w.441.jpg b/data/doc/opencpn/manual/objq.h.489_tok.b86de5_w.441.jpg deleted file mode 100644 index b2f5dd0463..0000000000 Binary files a/data/doc/opencpn/manual/objq.h.489_tok.b86de5_w.441.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/offsets2.h.607_tok.8a35cb_w.800.jpg b/data/doc/opencpn/manual/offsets2.h.607_tok.8a35cb_w.800.jpg deleted file mode 100644 index ed1da68e9b..0000000000 Binary files a/data/doc/opencpn/manual/offsets2.h.607_tok.8a35cb_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/offsets4.h.607_tok.af195e_w.800.jpg b/data/doc/opencpn/manual/offsets4.h.607_tok.af195e_w.800.jpg deleted file mode 100644 index ee2155062f..0000000000 Binary files a/data/doc/opencpn/manual/offsets4.h.607_tok.af195e_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/offsets5.h.607_tok.1235f0_w.800.jpg b/data/doc/opencpn/manual/offsets5.h.607_tok.1235f0_w.800.jpg deleted file mode 100644 index 0cd4066b37..0000000000 Binary files a/data/doc/opencpn/manual/offsets5.h.607_tok.1235f0_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/offsets6.h.607_tok.0db8bc_w.800.jpg b/data/doc/opencpn/manual/offsets6.h.607_tok.0db8bc_w.800.jpg deleted file mode 100644 index 000a7f2d38..0000000000 Binary files a/data/doc/opencpn/manual/offsets6.h.607_tok.0db8bc_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/opencpn-options-userinterface1-scales.tok.1ed7a6_w.400.jpg b/data/doc/opencpn/manual/opencpn-options-userinterface1-scales.tok.1ed7a6_w.400.jpg deleted file mode 100644 index cfc6a739ff..0000000000 Binary files a/data/doc/opencpn/manual/opencpn-options-userinterface1-scales.tok.1ed7a6_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/opencpn-options-userinterface1.tok.25d212_w.400.jpg b/data/doc/opencpn/manual/opencpn-options-userinterface1.tok.25d212_w.400.jpg deleted file mode 100644 index 18a3b7ceb3..0000000000 Binary files a/data/doc/opencpn/manual/opencpn-options-userinterface1.tok.25d212_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/opencpnicons.tok.84e77b_w.600.jpeg b/data/doc/opencpn/manual/opencpnicons.tok.84e77b_w.600.jpeg deleted file mode 100644 index 95d2487fe8..0000000000 Binary files a/data/doc/opencpn/manual/opencpnicons.tok.84e77b_w.600.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-chart-buttons-enc.h.24_tok.e801b5_w.148.jpg b/data/doc/opencpn/manual/options-chart-buttons-enc.h.24_tok.e801b5_w.148.jpg deleted file mode 100644 index a1b7e2f8c4..0000000000 Binary files a/data/doc/opencpn/manual/options-chart-buttons-enc.h.24_tok.e801b5_w.148.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-chart-buttons-rnc-icon.h.26_tok.3857ac_w.197.jpg b/data/doc/opencpn/manual/options-chart-buttons-rnc-icon.h.26_tok.3857ac_w.197.jpg deleted file mode 100644 index 8d5a960430..0000000000 Binary files a/data/doc/opencpn/manual/options-chart-buttons-rnc-icon.h.26_tok.3857ac_w.197.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-charts-chartfiles-tab.h.479_tok.73e237_w.550.jpeg b/data/doc/opencpn/manual/options-charts-chartfiles-tab.h.479_tok.73e237_w.550.jpeg deleted file mode 100644 index b5e8a653ba..0000000000 Binary files a/data/doc/opencpn/manual/options-charts-chartfiles-tab.h.479_tok.73e237_w.550.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-charts-chartfiles-tab.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.jpg.detail.html b/data/doc/opencpn/manual/options-charts-chartfiles-tab.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.jpg.detail.html deleted file mode 100644 index 47ccf54faf..0000000000 --- a/data/doc/opencpn/manual/options-charts-chartfiles-tab.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:options-charts-chartfiles-tab.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:options-charts-chartfiles-tab.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:options-charts-chartfiles-tab.jpg

- -

- - -

- - options-charts-chartfiles-tab.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/options-charts-chartfiles-tab.jpeg b/data/doc/opencpn/manual/options-charts-chartfiles-tab.jpeg deleted file mode 100644 index b5e8a653ba..0000000000 Binary files a/data/doc/opencpn/manual/options-charts-chartfiles-tab.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-charts-icon.h.74_tok.6dbde7_w.75.jpg b/data/doc/opencpn/manual/options-charts-icon.h.74_tok.6dbde7_w.75.jpg deleted file mode 100644 index 4dfc0251ec..0000000000 Binary files a/data/doc/opencpn/manual/options-charts-icon.h.74_tok.6dbde7_w.75.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-charts-icon.tok.ead5ac_w.60.jpg b/data/doc/opencpn/manual/options-charts-icon.tok.ead5ac_w.60.jpg deleted file mode 100644 index 0c5141f613..0000000000 Binary files a/data/doc/opencpn/manual/options-charts-icon.tok.ead5ac_w.60.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-connection-icon.h.78_tok.4df91d_w.97.jpg b/data/doc/opencpn/manual/options-connection-icon.h.78_tok.4df91d_w.97.jpg deleted file mode 100644 index 2fd1e12acc..0000000000 Binary files a/data/doc/opencpn/manual/options-connection-icon.h.78_tok.4df91d_w.97.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-connection-icon.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html b/data/doc/opencpn/manual/options-connection-icon.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html deleted file mode 100644 index f1ad8a9c55..0000000000 --- a/data/doc/opencpn/manual/options-connection-icon.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:options-connection-icon.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:options-connection-icon.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:options-connection-icon.jpg

- -

- - -

- - options-connection-icon.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/options-connection-icon.jpg b/data/doc/opencpn/manual/options-connection-icon.jpg deleted file mode 100644 index 2fd1e12acc..0000000000 Binary files a/data/doc/opencpn/manual/options-connection-icon.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-connections-network_0.tok.e29212_w.600.jpg b/data/doc/opencpn/manual/options-connections-network_0.tok.e29212_w.600.jpg deleted file mode 100644 index 1f691b3af5..0000000000 Binary files a/data/doc/opencpn/manual/options-connections-network_0.tok.e29212_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-connections_zps80f51d7f.tok.92c89c_w.500.jpg b/data/doc/opencpn/manual/options-connections_zps80f51d7f.tok.92c89c_w.500.jpg deleted file mode 100644 index 8cbe0cfbdc..0000000000 Binary files a/data/doc/opencpn/manual/options-connections_zps80f51d7f.tok.92c89c_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-gps-orient-icon.h.44_tok.c8c5c6_w.84.jpg b/data/doc/opencpn/manual/options-gps-orient-icon.h.44_tok.c8c5c6_w.84.jpg deleted file mode 100644 index c8ad8c3e8f..0000000000 Binary files a/data/doc/opencpn/manual/options-gps-orient-icon.h.44_tok.c8c5c6_w.84.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-plugins-icon.h.65_tok.59a39c_w.68.jpg b/data/doc/opencpn/manual/options-plugins-icon.h.65_tok.59a39c_w.68.jpg deleted file mode 100644 index 226414ac05..0000000000 Binary files a/data/doc/opencpn/manual/options-plugins-icon.h.65_tok.59a39c_w.68.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-plugins.h.581_tok.75fb80_w.748.jpg b/data/doc/opencpn/manual/options-plugins.h.581_tok.75fb80_w.748.jpg deleted file mode 100644 index c09eeb64da..0000000000 Binary files a/data/doc/opencpn/manual/options-plugins.h.581_tok.75fb80_w.748.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-plugins.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aplugins.png.detail.html b/data/doc/opencpn/manual/options-plugins.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aplugins.png.detail.html deleted file mode 100644 index 86f8d9c9df..0000000000 --- a/data/doc/opencpn/manual/options-plugins.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aplugins.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:options-plugins.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:options-plugins.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:options-plugins.jpg

- -

- - -

- - options-plugins.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/options-plugins.jpg b/data/doc/opencpn/manual/options-plugins.jpg deleted file mode 100644 index c09eeb64da..0000000000 Binary files a/data/doc/opencpn/manual/options-plugins.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-plugins.tok.f3f635_w.400.jpg b/data/doc/opencpn/manual/options-plugins.tok.f3f635_w.400.jpg deleted file mode 100644 index 6f9a452b27..0000000000 Binary files a/data/doc/opencpn/manual/options-plugins.tok.f3f635_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships-ownship-routes.h.105_tok.7a0365_w.736.jpg b/data/doc/opencpn/manual/options-ships-ownship-routes.h.105_tok.7a0365_w.736.jpg deleted file mode 100644 index f7b251634f..0000000000 Binary files a/data/doc/opencpn/manual/options-ships-ownship-routes.h.105_tok.7a0365_w.736.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships-ownship-routes.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/options-ships-ownship-routes.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index eb842498a2..0000000000 --- a/data/doc/opencpn/manual/options-ships-ownship-routes.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:options-ships-ownship-routes.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:options-ships-ownship-routes.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:options-ships-ownship-routes.jpg

- -

- - -

- - options-ships-ownship-routes.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/options-ships-ownship-routes.jpg b/data/doc/opencpn/manual/options-ships-ownship-routes.jpg deleted file mode 100644 index f7b251634f..0000000000 Binary files a/data/doc/opencpn/manual/options-ships-ownship-routes.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships2.h.83_tok.2daa35_w.150.jpg b/data/doc/opencpn/manual/options-ships2.h.83_tok.2daa35_w.150.jpg deleted file mode 100644 index 21ada48eef..0000000000 Binary files a/data/doc/opencpn/manual/options-ships2.h.83_tok.2daa35_w.150.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships2.h.93_tok.2dad71_w.169.jpg b/data/doc/opencpn/manual/options-ships2.h.93_tok.2dad71_w.169.jpg deleted file mode 100644 index 23fa90d845..0000000000 Binary files a/data/doc/opencpn/manual/options-ships2.h.93_tok.2dad71_w.169.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/options-ships2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 6598f07177..0000000000 --- a/data/doc/opencpn/manual/options-ships2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:options-ships2.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:options-ships2.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:options-ships2.jpg

- -

- - -

- - options-ships2.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/options-ships2.jpg b/data/doc/opencpn/manual/options-ships2.jpg deleted file mode 100644 index 23fa90d845..0000000000 Binary files a/data/doc/opencpn/manual/options-ships2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships4.h.263_tok.2ede21_w.75.jpg b/data/doc/opencpn/manual/options-ships4.h.263_tok.2ede21_w.75.jpg deleted file mode 100644 index 86c8563ea2..0000000000 Binary files a/data/doc/opencpn/manual/options-ships4.h.263_tok.2ede21_w.75.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships4.h.309_tok.7169d5_w.88.jpg b/data/doc/opencpn/manual/options-ships4.h.309_tok.7169d5_w.88.jpg deleted file mode 100644 index f52f21efd0..0000000000 Binary files a/data/doc/opencpn/manual/options-ships4.h.309_tok.7169d5_w.88.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships4.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/options-ships4.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 4bb9432ffe..0000000000 --- a/data/doc/opencpn/manual/options-ships4.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:options-ships4.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:options-ships4.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:options-ships4.jpg

- -

- - -

- - options-ships4.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/options-ships4.jpg b/data/doc/opencpn/manual/options-ships4.jpg deleted file mode 100644 index f52f21efd0..0000000000 Binary files a/data/doc/opencpn/manual/options-ships4.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships6.h.89_tok.f738d1_w.100.jpg b/data/doc/opencpn/manual/options-ships6.h.89_tok.f738d1_w.100.jpg deleted file mode 100644 index f6e108af8a..0000000000 Binary files a/data/doc/opencpn/manual/options-ships6.h.89_tok.f738d1_w.100.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships6.h.93_tok.219438_w.105.jpg b/data/doc/opencpn/manual/options-ships6.h.93_tok.219438_w.105.jpg deleted file mode 100644 index f5ba6eaf06..0000000000 Binary files a/data/doc/opencpn/manual/options-ships6.h.93_tok.219438_w.105.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/options-ships6.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/options-ships6.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 4e14302f1f..0000000000 --- a/data/doc/opencpn/manual/options-ships6.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:options-ships6.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:options-ships6.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:options-ships6.jpg

- -

- - -

- - options-ships6.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/options-ships6.jpg b/data/doc/opencpn/manual/options-ships6.jpg deleted file mode 100644 index f5ba6eaf06..0000000000 Binary files a/data/doc/opencpn/manual/options-ships6.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/orig.h.455_tok.584687_w.421.jpg b/data/doc/opencpn/manual/orig.h.455_tok.584687_w.421.jpg deleted file mode 100644 index 44c6114c72..0000000000 Binary files a/data/doc/opencpn/manual/orig.h.455_tok.584687_w.421.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/orig1.h.359_tok.3984fb_w.600.jpg b/data/doc/opencpn/manual/orig1.h.359_tok.3984fb_w.600.jpg deleted file mode 100644 index bc60b1cdb6..0000000000 Binary files a/data/doc/opencpn/manual/orig1.h.359_tok.3984fb_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/orig2.h.316_tok.dc4f91_w.600.jpg b/data/doc/opencpn/manual/orig2.h.316_tok.dc4f91_w.600.jpg deleted file mode 100644 index 426545ce7c..0000000000 Binary files a/data/doc/opencpn/manual/orig2.h.316_tok.dc4f91_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/out11.h.97_tok.7a572f_w.600.jpg b/data/doc/opencpn/manual/out11.h.97_tok.7a572f_w.600.jpg deleted file mode 100644 index deec583db6..0000000000 Binary files a/data/doc/opencpn/manual/out11.h.97_tok.7a572f_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/out12.h.25_tok.26c76a_w.247.jpg b/data/doc/opencpn/manual/out12.h.25_tok.26c76a_w.247.jpg deleted file mode 100644 index e950913009..0000000000 Binary files a/data/doc/opencpn/manual/out12.h.25_tok.26c76a_w.247.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/out22.h.23_tok.fabe2a_w.234.jpg b/data/doc/opencpn/manual/out22.h.23_tok.fabe2a_w.234.jpg deleted file mode 100644 index 5c60885b81..0000000000 Binary files a/data/doc/opencpn/manual/out22.h.23_tok.fabe2a_w.234.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/output-test-sm.h.566_tok.6ff2b7_w.500.jpeg b/data/doc/opencpn/manual/output-test-sm.h.566_tok.6ff2b7_w.500.jpeg deleted file mode 100644 index 107c413c7e..0000000000 Binary files a/data/doc/opencpn/manual/output-test-sm.h.566_tok.6ff2b7_w.500.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/overzoom.h.682_tok.7d1c71_w.900.jpg b/data/doc/opencpn/manual/overzoom.h.682_tok.7d1c71_w.900.jpg deleted file mode 100644 index 17cc78b52a..0000000000 Binary files a/data/doc/opencpn/manual/overzoom.h.682_tok.7d1c71_w.900.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/overzoom.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/overzoom.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index 7b128a361e..0000000000 --- a/data/doc/opencpn/manual/overzoom.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:overzoom.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:overzoom.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:overzoom.jpg

- -

- - -

- - overzoom.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/overzoom.jpg b/data/doc/opencpn/manual/overzoom.jpg deleted file mode 100644 index 17cc78b52a..0000000000 Binary files a/data/doc/opencpn/manual/overzoom.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/overzoom.tok.fd68b7_w.500.jpg b/data/doc/opencpn/manual/overzoom.tok.fd68b7_w.500.jpg deleted file mode 100644 index b2680823b1..0000000000 Binary files a/data/doc/opencpn/manual/overzoom.tok.fd68b7_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/overzoom2.h.682_tok.73d4ae_w.900.jpg b/data/doc/opencpn/manual/overzoom2.h.682_tok.73d4ae_w.900.jpg deleted file mode 100644 index bfe835065e..0000000000 Binary files a/data/doc/opencpn/manual/overzoom2.h.682_tok.73d4ae_w.900.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/overzoom2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/overzoom2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index cbd2b28bff..0000000000 --- a/data/doc/opencpn/manual/overzoom2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:overzoom2.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:overzoom2.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:overzoom2.jpg

- -

- - -

- - overzoom2.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/overzoom2.jpg b/data/doc/opencpn/manual/overzoom2.jpg deleted file mode 100644 index bfe835065e..0000000000 Binary files a/data/doc/opencpn/manual/overzoom2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/overzoom2.tok.651324_w.500.jpg b/data/doc/opencpn/manual/overzoom2.tok.651324_w.500.jpg deleted file mode 100644 index a56459daf3..0000000000 Binary files a/data/doc/opencpn/manual/overzoom2.tok.651324_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/own4.h.31_tok.dd46b0_w.30.jpg b/data/doc/opencpn/manual/own4.h.31_tok.dd46b0_w.30.jpg deleted file mode 100644 index defb2ca61d..0000000000 Binary files a/data/doc/opencpn/manual/own4.h.31_tok.dd46b0_w.30.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/own4.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/own4.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index fecdb888db..0000000000 --- a/data/doc/opencpn/manual/own4.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:own4.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:own4.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:own4.jpg

- -

- - -

- - own4.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/own4.jpg b/data/doc/opencpn/manual/own4.jpg deleted file mode 100644 index defb2ca61d..0000000000 Binary files a/data/doc/opencpn/manual/own4.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/own5.h.30_tok.cdad39_w.31.jpg b/data/doc/opencpn/manual/own5.h.30_tok.cdad39_w.31.jpg deleted file mode 100644 index c4be1daa87..0000000000 Binary files a/data/doc/opencpn/manual/own5.h.30_tok.cdad39_w.31.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/own5.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/own5.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index 92aa2d69bc..0000000000 --- a/data/doc/opencpn/manual/own5.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:own5.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:own5.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:own5.jpg

- -

- - -

- - own5.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/own5.jpg b/data/doc/opencpn/manual/own5.jpg deleted file mode 100644 index c4be1daa87..0000000000 Binary files a/data/doc/opencpn/manual/own5.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/own_vector.h.281_tok.bd9b1a_w.365.jpg b/data/doc/opencpn/manual/own_vector.h.281_tok.bd9b1a_w.365.jpg deleted file mode 100644 index 7048702382..0000000000 Binary files a/data/doc/opencpn/manual/own_vector.h.281_tok.bd9b1a_w.365.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/own_vector.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/own_vector.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 41777eb8eb..0000000000 --- a/data/doc/opencpn/manual/own_vector.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:own_vector.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:own_vector.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:own_vector.jpg

- -

- - -

- - own_vector.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/own_vector.jpg b/data/doc/opencpn/manual/own_vector.jpg deleted file mode 100644 index 7048702382..0000000000 Binary files a/data/doc/opencpn/manual/own_vector.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ownshipicons.jpeg b/data/doc/opencpn/manual/ownshipicons.jpeg deleted file mode 100644 index 645c104540..0000000000 Binary files a/data/doc/opencpn/manual/ownshipicons.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/oz.tok.618612_w.500.jpg b/data/doc/opencpn/manual/oz.tok.618612_w.500.jpg deleted file mode 100644 index 7986ff20c2..0000000000 Binary files a/data/doc/opencpn/manual/oz.tok.618612_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/oz1.tok.d3bea2_w.500.jpg b/data/doc/opencpn/manual/oz1.tok.d3bea2_w.500.jpg deleted file mode 100644 index 26e59b59a1..0000000000 Binary files a/data/doc/opencpn/manual/oz1.tok.d3bea2_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/oz2-int702.tok.3950a7_w.500.jpg b/data/doc/opencpn/manual/oz2-int702.tok.3950a7_w.500.jpg deleted file mode 100644 index 0073714e14..0000000000 Binary files a/data/doc/opencpn/manual/oz2-int702.tok.3950a7_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/particlemap.h.363_tok.6e67c6_w.549.jpg b/data/doc/opencpn/manual/particlemap.h.363_tok.6e67c6_w.549.jpg deleted file mode 100644 index 062bf5e533..0000000000 Binary files a/data/doc/opencpn/manual/particlemap.h.363_tok.6e67c6_w.549.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/pencil.h.45_tok.c40e1f_w.45.jpg b/data/doc/opencpn/manual/pencil.h.45_tok.c40e1f_w.45.jpg deleted file mode 100644 index a6d00d8b86..0000000000 Binary files a/data/doc/opencpn/manual/pencil.h.45_tok.c40e1f_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/pencil2.h.16_tok.1bbff1_w.31.jpg b/data/doc/opencpn/manual/pencil2.h.16_tok.1bbff1_w.31.jpg deleted file mode 100644 index b66eb52b9b..0000000000 Binary files a/data/doc/opencpn/manual/pencil2.h.16_tok.1bbff1_w.31.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plan1.h.455_tok.cf829c_w.600.jpg b/data/doc/opencpn/manual/plan1.h.455_tok.cf829c_w.600.jpg deleted file mode 100644 index 65442b46ce..0000000000 Binary files a/data/doc/opencpn/manual/plan1.h.455_tok.cf829c_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plan2.h.292_tok.37a349_w.600.jpg b/data/doc/opencpn/manual/plan2.h.292_tok.37a349_w.600.jpg deleted file mode 100644 index 2f32be786c..0000000000 Binary files a/data/doc/opencpn/manual/plan2.h.292_tok.37a349_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plan5.h.283_tok.c5d7e5_w.600.jpg b/data/doc/opencpn/manual/plan5.h.283_tok.c5d7e5_w.600.jpg deleted file mode 100644 index dca88cbc06..0000000000 Binary files a/data/doc/opencpn/manual/plan5.h.283_tok.c5d7e5_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/chart_downloader/03-chart-downloader-tab-first-time.h.639_tok.100f8b_w.724.jpg b/data/doc/opencpn/manual/plugins/chart_downloader/03-chart-downloader-tab-first-time.h.639_tok.100f8b_w.724.jpg deleted file mode 100644 index 2cd1aeb09b..0000000000 Binary files a/data/doc/opencpn/manual/plugins/chart_downloader/03-chart-downloader-tab-first-time.h.639_tok.100f8b_w.724.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/chart_downloader/08-afterdownloading.h.174_tok.aefbd2_w.478.jpg b/data/doc/opencpn/manual/plugins/chart_downloader/08-afterdownloading.h.174_tok.aefbd2_w.478.jpg deleted file mode 100644 index 029ee762a4..0000000000 Binary files a/data/doc/opencpn/manual/plugins/chart_downloader/08-afterdownloading.h.174_tok.aefbd2_w.478.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dash-big-fonts.h.691_tok.9dbd07_w.700.jpg b/data/doc/opencpn/manual/plugins/dashboard/dash-big-fonts.h.691_tok.9dbd07_w.700.jpg deleted file mode 100644 index ee431bd61c..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dash-big-fonts.h.691_tok.9dbd07_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dash-drag.h.454_tok.173229_w.600.jpg b/data/doc/opencpn/manual/plugins/dashboard/dash-drag.h.454_tok.173229_w.600.jpg deleted file mode 100644 index b910688d85..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dash-drag.h.454_tok.173229_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dash-select-instr_0.h.265_tok.7d7a55_w.260.jpg b/data/doc/opencpn/manual/plugins/dashboard/dash-select-instr_0.h.265_tok.7d7a55_w.260.jpg deleted file mode 100644 index 2d310fc0b4..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dash-select-instr_0.h.265_tok.7d7a55_w.260.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dash-set.h.239_tok.f1c383_w.298.jpg b/data/doc/opencpn/manual/plugins/dashboard/dash-set.h.239_tok.f1c383_w.298.jpg deleted file mode 100644 index 70b3c51fd1..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dash-set.h.239_tok.f1c383_w.298.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashboard-docked32.h.480_tok.2b2afc_w.600.jpg b/data/doc/opencpn/manual/plugins/dashboard/dashboard-docked32.h.480_tok.2b2afc_w.600.jpg deleted file mode 100644 index c35fc7185c..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashboard-docked32.h.480_tok.2b2afc_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashboard-plugin32.h.682_tok.29c450_w.600.jpg b/data/doc/opencpn/manual/plugins/dashboard/dashboard-plugin32.h.682_tok.29c450_w.600.jpg deleted file mode 100644 index 51563f1ea6..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashboard-plugin32.h.682_tok.29c450_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashboard-preferences-appearance.h.385_tok.a12ee0_w.443.jpeg b/data/doc/opencpn/manual/plugins/dashboard/dashboard-preferences-appearance.h.385_tok.a12ee0_w.443.jpeg deleted file mode 100644 index 88fea56cb3..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashboard-preferences-appearance.h.385_tok.a12ee0_w.443.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashboard32.h.454_tok.963638_w.600.jpg b/data/doc/opencpn/manual/plugins/dashboard/dashboard32.h.454_tok.963638_w.600.jpg deleted file mode 100644 index 37916b1096..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashboard32.h.454_tok.963638_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashn3.h.187_tok.d24f84_w.200.jpg b/data/doc/opencpn/manual/plugins/dashboard/dashn3.h.187_tok.d24f84_w.200.jpg deleted file mode 100644 index 7aa7b65994..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashn3.h.187_tok.d24f84_w.200.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashn3.h.221_tok.ab45ca_w.236.jpg b/data/doc/opencpn/manual/plugins/dashboard/dashn3.h.221_tok.ab45ca_w.236.jpg deleted file mode 100644 index fec773908a..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashn3.h.221_tok.ab45ca_w.236.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashn3.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/plugins/dashboard/dashn3.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index 41016b63b2..0000000000 --- a/data/doc/opencpn/manual/plugins/dashboard/dashn3.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:plugins:dashboard:dashn3.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:plugins:dashboard:dashn3.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:plugins:dashboard:dashn3.jpg

- -

- - -

- - dashn3.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashn3.jpg b/data/doc/opencpn/manual/plugins/dashboard/dashn3.jpg deleted file mode 100644 index fec773908a..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashn3.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/dashboard/dashprop322.h.455_tok.779138_w.450.jpg b/data/doc/opencpn/manual/plugins/dashboard/dashprop322.h.455_tok.779138_w.450.jpg deleted file mode 100644 index 2613bba90c..0000000000 Binary files a/data/doc/opencpn/manual/plugins/dashboard/dashprop322.h.455_tok.779138_w.450.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribcurrent.h.106_tok.d53ae2_w.605.jpg b/data/doc/opencpn/manual/plugins/grib/33gribcurrent.h.106_tok.d53ae2_w.605.jpg deleted file mode 100644 index 4d474f4b8c..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribcurrent.h.106_tok.d53ae2_w.605.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribinterpolation.h.165_tok.cdfcae_w.477.jpg b/data/doc/opencpn/manual/plugins/grib/33gribinterpolation.h.165_tok.cdfcae_w.477.jpg deleted file mode 100644 index 72f4e0f764..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribinterpolation.h.165_tok.cdfcae_w.477.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail1.tok.601846_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail1.tok.601846_w.650.jpg deleted file mode 100644 index edccda96de..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail1.tok.601846_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail10.tok.420277_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail10.tok.420277_w.650.jpg deleted file mode 100644 index 84dca62731..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail10.tok.420277_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail2.tok.849373_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail2.tok.849373_w.650.jpg deleted file mode 100644 index 1d02426ea9..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail2.tok.849373_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail3.tok.e63bec_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail3.tok.e63bec_w.650.jpg deleted file mode 100644 index b4db5832ea..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail3.tok.e63bec_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail4.tok.15b29b_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail4.tok.15b29b_w.650.jpg deleted file mode 100644 index 865184bde4..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail4.tok.15b29b_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail5.tok.43d7ff_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail5.tok.43d7ff_w.650.jpg deleted file mode 100644 index 5e50ba10ae..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail5.tok.43d7ff_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail6.tok.c15216_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail6.tok.c15216_w.650.jpg deleted file mode 100644 index 31c6a27dcc..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail6.tok.c15216_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail7.tok.0fa601_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail7.tok.0fa601_w.650.jpg deleted file mode 100644 index 5a7d617894..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail7.tok.0fa601_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail8.tok.b63870_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail8.tok.b63870_w.650.jpg deleted file mode 100644 index 90cee34585..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail8.tok.b63870_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribmail9.tok.8bb68f_w.650.jpg b/data/doc/opencpn/manual/plugins/grib/33gribmail9.tok.8bb68f_w.650.jpg deleted file mode 100644 index e763d1f5b7..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribmail9.tok.8bb68f_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33griboverlaycolors.h.178_tok.4ef472_w.137.jpg b/data/doc/opencpn/manual/plugins/grib/33griboverlaycolors.h.178_tok.4ef472_w.137.jpg deleted file mode 100644 index b5bc790693..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33griboverlaycolors.h.178_tok.4ef472_w.137.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribpreference2.h.483_tok.dfaf0f_w.340.jpg b/data/doc/opencpn/manual/plugins/grib/33gribpreference2.h.483_tok.dfaf0f_w.340.jpg deleted file mode 100644 index 7ce9a3b50a..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribpreference2.h.483_tok.dfaf0f_w.340.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/33gribunits.h.102_tok.77f7dc_w.92.jpg b/data/doc/opencpn/manual/plugins/grib/33gribunits.h.102_tok.77f7dc_w.92.jpg deleted file mode 100644 index f6433add11..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/33gribunits.h.102_tok.77f7dc_w.92.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/4gribareaselection.h.79_tok.833504_w.513.jpg b/data/doc/opencpn/manual/plugins/grib/4gribareaselection.h.79_tok.833504_w.513.jpg deleted file mode 100644 index 6b3328cd1d..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/4gribareaselection.h.79_tok.833504_w.513.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/4gribcontrol.h.260_tok.6d9d97_w.637.jpg b/data/doc/opencpn/manual/plugins/grib/4gribcontrol.h.260_tok.6d9d97_w.637.jpg deleted file mode 100644 index 2bc6ee0bc1..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/4gribcontrol.h.260_tok.6d9d97_w.637.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/4gribcontroledcolours.h.187_tok.8c383f_w.300.jpg b/data/doc/opencpn/manual/plugins/grib/4gribcontroledcolours.h.187_tok.8c383f_w.300.jpg deleted file mode 100644 index 213944c588..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/4gribcontroledcolours.h.187_tok.8c383f_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/4gribcurrent_0.h.291_tok.1b6f98_w.317.jpg b/data/doc/opencpn/manual/plugins/grib/4gribcurrent_0.h.291_tok.1b6f98_w.317.jpg deleted file mode 100644 index 066beacedb..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/4gribcurrent_0.h.291_tok.1b6f98_w.317.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/4gribdisplaychoices.h.308_tok.32463b_w.188.jpg b/data/doc/opencpn/manual/plugins/grib/4gribdisplaychoices.h.308_tok.32463b_w.188.jpg deleted file mode 100644 index 7d418689f9..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/4gribdisplaychoices.h.308_tok.32463b_w.188.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/4gribgraph-selection.h.383_tok.9f66c1_w.481.jpg b/data/doc/opencpn/manual/plugins/grib/4gribgraph-selection.h.383_tok.9f66c1_w.481.jpg deleted file mode 100644 index d0c90840e1..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/4gribgraph-selection.h.383_tok.9f66c1_w.481.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/girb-hide-data.h.57_tok.022024_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/girb-hide-data.h.57_tok.022024_w.550.jpg deleted file mode 100644 index 1e11dfc748..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/girb-hide-data.h.57_tok.022024_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-menu-2.h.283_tok.4436f7_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-menu-2.h.283_tok.4436f7_w.550.jpg deleted file mode 100644 index f92d0f4469..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-menu-2.h.283_tok.4436f7_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-bottom-slider.h.159_tok.e12382_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-bottom-slider.h.159_tok.e12382_w.550.jpg deleted file mode 100644 index f06b8ac828..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-bottom-slider.h.159_tok.e12382_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-air-temperature.h.251_tok.7855a1_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-air-temperature.h.251_tok.7855a1_w.550.jpg deleted file mode 100644 index 7e1df94abf..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-air-temperature.h.251_tok.7855a1_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-cape.h.248_tok.723d67_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-cape.h.248_tok.723d67_w.550.jpg deleted file mode 100644 index a9564ec725..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-cape.h.248_tok.723d67_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-pressure.h.215_tok.74336a_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-pressure.h.215_tok.74336a_w.550.jpg deleted file mode 100644 index 777e20dd0b..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-pressure.h.215_tok.74336a_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-data.h.304_tok.b49886_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-data.h.304_tok.b49886_w.550.jpg deleted file mode 100644 index c8c2918b8f..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-data.h.304_tok.b49886_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-gui.h.534_tok.9cd286_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-gui.h.534_tok.9cd286_w.550.jpg deleted file mode 100644 index 062438380f..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-gui.h.534_tok.9cd286_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-playback.h.223_tok.c6cdc2_w.549.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-playback.h.223_tok.c6cdc2_w.549.jpg deleted file mode 100644 index 18c7a75bef..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-waves-playback.h.223_tok.c6cdc2_w.549.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-wind-gust.h.250_tok.9755cc_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-wind-gust.h.250_tok.9755cc_w.550.jpg deleted file mode 100644 index 3b5cad89f8..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-wind-gust.h.250_tok.9755cc_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-wind.h.399_tok.384157_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-data-wind.h.399_tok.384157_w.550.jpg deleted file mode 100644 index 3c163f443d..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-data-wind.h.399_tok.384157_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-message-saildocs.h.661_tok.e5c05b_w.572.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-message-saildocs.h.661_tok.e5c05b_w.572.jpg deleted file mode 100644 index 8fd8b80c3f..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-message-saildocs.h.661_tok.e5c05b_w.572.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-settings-message-zygrib.h.692_tok.70fc7e_w.550.jpg b/data/doc/opencpn/manual/plugins/grib/grib-settings-message-zygrib.h.692_tok.70fc7e_w.550.jpg deleted file mode 100644 index c31ba08aa9..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-settings-message-zygrib.h.692_tok.70fc7e_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.h.548_tok.dea5d0_w.800.jpg b/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.h.548_tok.dea5d0_w.800.jpg deleted file mode 100644 index 7070d9e524..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.h.548_tok.dea5d0_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.png.detail.html b/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.png.detail.html deleted file mode 100644 index c5ba39ea22..0000000000 --- a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:plugins:grib:grib-table-arrows.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:plugins:grib:grib-table-arrows.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:plugins:grib:grib-table-arrows.jpg

- -

- - -

- - grib-table-arrows.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.jpg b/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.jpg deleted file mode 100644 index 7070d9e524..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.tok.c330c8_w.600.jpg b/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.tok.c330c8_w.600.jpg deleted file mode 100644 index ded4d498bf..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-table-arrows.tok.c330c8_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.h.544_tok.9985aa_w.800.jpg b/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.h.544_tok.9985aa_w.800.jpg deleted file mode 100644 index 8ebdf930e5..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.h.544_tok.9985aa_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.png.detail.html b/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.png.detail.html deleted file mode 100644 index f0b0570fda..0000000000 --- a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:plugins:grib:grib-table-degrees.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:plugins:grib:grib-table-degrees.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:plugins:grib:grib-table-degrees.jpg

- -

- - -

- - grib-table-degrees.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.jpg b/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.jpg deleted file mode 100644 index 8ebdf930e5..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.tok.5e4021_w.600.jpg b/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.tok.5e4021_w.600.jpg deleted file mode 100644 index fd4489a949..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib-table-degrees.tok.5e4021_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib.h.32_tok.7af5ea_w.32.jpg b/data/doc/opencpn/manual/plugins/grib/grib.h.32_tok.7af5ea_w.32.jpg deleted file mode 100644 index 2648bf4cbc..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib.h.32_tok.7af5ea_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/grib_0.h.32_tok.ec8bb4_w.32.jpg b/data/doc/opencpn/manual/plugins/grib/grib_0.h.32_tok.ec8bb4_w.32.jpg deleted file mode 100644 index 57cf05f3e9..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/grib_0.h.32_tok.ec8bb4_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/grib/gribplugin33.h.722_tok.d9df8c_w.549.jpg b/data/doc/opencpn/manual/plugins/grib/gribplugin33.h.722_tok.d9df8c_w.549.jpg deleted file mode 100644 index edd79540bc..0000000000 Binary files a/data/doc/opencpn/manual/plugins/grib/gribplugin33.h.722_tok.d9df8c_w.549.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm1.h.236_tok.8d84bc_w.500.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm1.h.236_tok.8d84bc_w.500.jpg deleted file mode 100644 index 1d4240b11c..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm1.h.236_tok.8d84bc_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm2.h.236_tok.520b1c_w.250.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm2.h.236_tok.520b1c_w.250.jpg deleted file mode 100644 index 34dcbb742a..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm2.h.236_tok.520b1c_w.250.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm3.h.46_tok.012448_w.118.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm3.h.46_tok.012448_w.118.jpg deleted file mode 100644 index 582f37328c..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm3.h.46_tok.012448_w.118.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm4.h.159_tok.e16801_w.225.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm4.h.159_tok.e16801_w.225.jpg deleted file mode 100644 index 8d1f3998c9..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm4.h.159_tok.e16801_w.225.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm5.h.236_tok.9ae836_w.250.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm5.h.236_tok.9ae836_w.250.jpg deleted file mode 100644 index 3658db1f50..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm5.h.236_tok.9ae836_w.250.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm6.h.681_tok.4ffe1f_w.225.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm6.h.681_tok.4ffe1f_w.225.jpg deleted file mode 100644 index d9e8b26706..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm6.h.681_tok.4ffe1f_w.225.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm7.h.240_tok.1e1a85_w.417.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm7.h.240_tok.1e1a85_w.417.jpg deleted file mode 100644 index 708a690531..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm7.h.240_tok.1e1a85_w.417.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm8.h.500_tok.63e4dd_w.500.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm8.h.500_tok.63e4dd_w.500.jpg deleted file mode 100644 index c1c472f29f..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm8.h.500_tok.63e4dd_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wmm9.h.500_tok.84954c_w.500.jpg b/data/doc/opencpn/manual/plugins/wmm/wmm9.h.500_tok.84954c_w.500.jpg deleted file mode 100644 index 416a315863..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wmm9.h.500_tok.84954c_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/plugins/wmm/wwm.h.32_tok.611331_w.33.jpg b/data/doc/opencpn/manual/plugins/wmm/wwm.h.32_tok.611331_w.33.jpg deleted file mode 100644 index bad721ffbe..0000000000 Binary files a/data/doc/opencpn/manual/plugins/wmm/wwm.h.32_tok.611331_w.33.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/polyconic.h.30_tok.08ce5d_w.130.jpg b/data/doc/opencpn/manual/polyconic.h.30_tok.08ce5d_w.130.jpg deleted file mode 100644 index cdcbbd613f..0000000000 Binary files a/data/doc/opencpn/manual/polyconic.h.30_tok.08ce5d_w.130.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/portable.h.31_tok.fbbae4_w.605.jpg b/data/doc/opencpn/manual/portable.h.31_tok.fbbae4_w.605.jpg deleted file mode 100644 index 9efd765e37..0000000000 Binary files a/data/doc/opencpn/manual/portable.h.31_tok.fbbae4_w.605.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ppa_1.h.251_tok.2bff23_w.452.jpeg b/data/doc/opencpn/manual/ppa_1.h.251_tok.2bff23_w.452.jpeg deleted file mode 100644 index 221fc881c7..0000000000 Binary files a/data/doc/opencpn/manual/ppa_1.h.251_tok.2bff23_w.452.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ppa_2.h.267_tok.65e27a_w.384.jpeg b/data/doc/opencpn/manual/ppa_2.h.267_tok.65e27a_w.384.jpeg deleted file mode 100644 index 152c59af77..0000000000 Binary files a/data/doc/opencpn/manual/ppa_2.h.267_tok.65e27a_w.384.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ppa_3.h.471_tok.9e831c_w.606.jpg b/data/doc/opencpn/manual/ppa_3.h.471_tok.9e831c_w.606.jpg deleted file mode 100644 index 5fb90d9ebe..0000000000 Binary files a/data/doc/opencpn/manual/ppa_3.h.471_tok.9e831c_w.606.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ppa_4.h.229_tok.c9d81c_w.604.jpg b/data/doc/opencpn/manual/ppa_4.h.229_tok.c9d81c_w.604.jpg deleted file mode 100644 index 744dcba75b..0000000000 Binary files a/data/doc/opencpn/manual/ppa_4.h.229_tok.c9d81c_w.604.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ppa_5.h.93_tok.00ed6b_w.606.jpeg b/data/doc/opencpn/manual/ppa_5.h.93_tok.00ed6b_w.606.jpeg deleted file mode 100644 index d7b20f2730..0000000000 Binary files a/data/doc/opencpn/manual/ppa_5.h.93_tok.00ed6b_w.606.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/ppa_6.h.421_tok.b5f019_w.613.jpeg b/data/doc/opencpn/manual/ppa_6.h.421_tok.b5f019_w.613.jpeg deleted file mode 100644 index 6bd03f864f..0000000000 Binary files a/data/doc/opencpn/manual/ppa_6.h.421_tok.b5f019_w.613.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/print.h.32_tok.c27103_w.32.jpg b/data/doc/opencpn/manual/print.h.32_tok.c27103_w.32.jpg deleted file mode 100644 index 96c959fdf1..0000000000 Binary files a/data/doc/opencpn/manual/print.h.32_tok.c27103_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/printroute.h.55_tok.8ac4fa_w.597.jpg b/data/doc/opencpn/manual/printroute.h.55_tok.8ac4fa_w.597.jpg deleted file mode 100644 index 7f60d880a1..0000000000 Binary files a/data/doc/opencpn/manual/printroute.h.55_tok.8ac4fa_w.597.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/prolific.h.450_tok.a9205d_w.410.jpeg b/data/doc/opencpn/manual/prolific.h.450_tok.a9205d_w.410.jpeg deleted file mode 100644 index b006fa2a21..0000000000 Binary files a/data/doc/opencpn/manual/prolific.h.450_tok.a9205d_w.410.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/puerto_morelos1.h.283_tok.e17d64_w.549.jpg b/data/doc/opencpn/manual/puerto_morelos1.h.283_tok.e17d64_w.549.jpg deleted file mode 100644 index 96a881ab92..0000000000 Binary files a/data/doc/opencpn/manual/puerto_morelos1.h.283_tok.e17d64_w.549.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/puerto_morelos2.h.274_tok.83ed5b_w.399.jpg b/data/doc/opencpn/manual/puerto_morelos2.h.274_tok.83ed5b_w.399.jpg deleted file mode 100644 index 88789aae84..0000000000 Binary files a/data/doc/opencpn/manual/puerto_morelos2.h.274_tok.83ed5b_w.399.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quality-of-data.h.162_tok.897d33_w.641.jpg b/data/doc/opencpn/manual/quality-of-data.h.162_tok.897d33_w.641.jpg deleted file mode 100644 index 582da687af..0000000000 Binary files a/data/doc/opencpn/manual/quality-of-data.h.162_tok.897d33_w.641.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quality-of-data.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html b/data/doc/opencpn/manual/quality-of-data.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html deleted file mode 100644 index ae88f8d0d6..0000000000 --- a/data/doc/opencpn/manual/quality-of-data.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:quality-of-data.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:quality-of-data.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:quality-of-data.jpg

- -

- - -

- - quality-of-data.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/quality-of-data.jpg b/data/doc/opencpn/manual/quality-of-data.jpg deleted file mode 100644 index 582da687af..0000000000 Binary files a/data/doc/opencpn/manual/quality-of-data.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quality-of-data.tok.5a25f0_w.600.jpg b/data/doc/opencpn/manual/quality-of-data.tok.5a25f0_w.600.jpg deleted file mode 100644 index de65fbed2f..0000000000 Binary files a/data/doc/opencpn/manual/quality-of-data.tok.5a25f0_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quilt-ref.h.27_tok.7cccc3_w.600.jpg b/data/doc/opencpn/manual/quilt-ref.h.27_tok.7cccc3_w.600.jpg deleted file mode 100644 index 7cd581230c..0000000000 Binary files a/data/doc/opencpn/manual/quilt-ref.h.27_tok.7cccc3_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quilt1.h.424_tok.fba310_w.551.jpg b/data/doc/opencpn/manual/quilt1.h.424_tok.fba310_w.551.jpg deleted file mode 100644 index f0095e915d..0000000000 Binary files a/data/doc/opencpn/manual/quilt1.h.424_tok.fba310_w.551.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quilt2.h.530_tok.718cb3_w.700.jpg b/data/doc/opencpn/manual/quilt2.h.530_tok.718cb3_w.700.jpg deleted file mode 100644 index e886d34173..0000000000 Binary files a/data/doc/opencpn/manual/quilt2.h.530_tok.718cb3_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quilt3.h.530_tok.2db4fb_w.700.jpg b/data/doc/opencpn/manual/quilt3.h.530_tok.2db4fb_w.700.jpg deleted file mode 100644 index 7d9bd0fc43..0000000000 Binary files a/data/doc/opencpn/manual/quilt3.h.530_tok.2db4fb_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/quilt4.h.530_tok.b48484_w.700.jpg b/data/doc/opencpn/manual/quilt4.h.530_tok.b48484_w.700.jpg deleted file mode 100644 index 19537994b1..0000000000 Binary files a/data/doc/opencpn/manual/quilt4.h.530_tok.b48484_w.700.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/rasteroverz.h.455_tok.27e4e5_w.600.jpg b/data/doc/opencpn/manual/rasteroverz.h.455_tok.27e4e5_w.600.jpg deleted file mode 100644 index d297243d1b..0000000000 Binary files a/data/doc/opencpn/manual/rasteroverz.h.455_tok.27e4e5_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/rc_wpt-del-mv.h.360_tok.63cfb0_w.288.jpg b/data/doc/opencpn/manual/rc_wpt-del-mv.h.360_tok.63cfb0_w.288.jpg deleted file mode 100644 index 599e0331dc..0000000000 Binary files a/data/doc/opencpn/manual/rc_wpt-del-mv.h.360_tok.63cfb0_w.288.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/red-gps.h.55_tok.90b465_w.43.jpg b/data/doc/opencpn/manual/red-gps.h.55_tok.90b465_w.43.jpg deleted file mode 100644 index 5b020cd899..0000000000 Binary files a/data/doc/opencpn/manual/red-gps.h.55_tok.90b465_w.43.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/red-gps.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html b/data/doc/opencpn/manual/red-gps.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html deleted file mode 100644 index 351f662ac4..0000000000 --- a/data/doc/opencpn/manual/red-gps.id.opencpn_3Aopencpn_user_manual_3Agetting_around_3Agps_setup_and_status.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:red-gps.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:red-gps.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:red-gps.jpg

- -

- - -

- - red-gps.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/red-gps.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html b/data/doc/opencpn/manual/red-gps.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html deleted file mode 100644 index a7980cf7ff..0000000000 --- a/data/doc/opencpn/manual/red-gps.id.opencpn_3Aopencpn_user_manual_3Agetting_started_3Agps_setup.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:red-gps.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:red-gps.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:red-gps.jpg

- -

- - -

- - red-gps.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/red-gps.jpg b/data/doc/opencpn/manual/red-gps.jpg deleted file mode 100644 index 5b020cd899..0000000000 Binary files a/data/doc/opencpn/manual/red-gps.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/red-gps.tok.c22e9b_w.35.jpg b/data/doc/opencpn/manual/red-gps.tok.c22e9b_w.35.jpg deleted file mode 100644 index 231609edb2..0000000000 Binary files a/data/doc/opencpn/manual/red-gps.tok.c22e9b_w.35.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/reduce-data.h.415_tok.d195d5_w.600.jpg b/data/doc/opencpn/manual/reduce-data.h.415_tok.d195d5_w.600.jpg deleted file mode 100644 index 11661d495a..0000000000 Binary files a/data/doc/opencpn/manual/reduce-data.h.415_tok.d195d5_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/reduce-data1.h.311_tok.f28742_w.400.jpg b/data/doc/opencpn/manual/reduce-data1.h.311_tok.f28742_w.400.jpg deleted file mode 100644 index b2847ab85e..0000000000 Binary files a/data/doc/opencpn/manual/reduce-data1.h.311_tok.f28742_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/restrman_1.h.50_tok.a7075e_w.51.jpg b/data/doc/opencpn/manual/restrman_1.h.50_tok.a7075e_w.51.jpg deleted file mode 100644 index 86e26ea536..0000000000 Binary files a/data/doc/opencpn/manual/restrman_1.h.50_tok.a7075e_w.51.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/right-click-enc-quilting.h.251_tok.e3aa3a_w.254.jpg b/data/doc/opencpn/manual/right-click-enc-quilting.h.251_tok.e3aa3a_w.254.jpg deleted file mode 100644 index a429fa9e3e..0000000000 Binary files a/data/doc/opencpn/manual/right-click-enc-quilting.h.251_tok.e3aa3a_w.254.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/right-click-enc-single-chart.h.252_tok.e226fb_w.254.jpg b/data/doc/opencpn/manual/right-click-enc-single-chart.h.252_tok.e226fb_w.254.jpg deleted file mode 100644 index d055c4b4ef..0000000000 Binary files a/data/doc/opencpn/manual/right-click-enc-single-chart.h.252_tok.e226fb_w.254.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/right-click-rnc-quilting.h.275_tok.26913e_w.274.jpg b/data/doc/opencpn/manual/right-click-rnc-quilting.h.275_tok.26913e_w.274.jpg deleted file mode 100644 index bcb65eedba..0000000000 Binary files a/data/doc/opencpn/manual/right-click-rnc-quilting.h.275_tok.26913e_w.274.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/right-click-rnc-single-chart.h.273_tok.4fedf2_w.274.jpg b/data/doc/opencpn/manual/right-click-rnc-single-chart.h.273_tok.4fedf2_w.274.jpg deleted file mode 100644 index bba02830ee..0000000000 Binary files a/data/doc/opencpn/manual/right-click-rnc-single-chart.h.273_tok.4fedf2_w.274.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/rollover.h.214_tok.7a44ab_w.466.jpg b/data/doc/opencpn/manual/rollover.h.214_tok.7a44ab_w.466.jpg deleted file mode 100644 index df2267fe82..0000000000 Binary files a/data/doc/opencpn/manual/rollover.h.214_tok.7a44ab_w.466.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-activated-right-click.h.432_tok.2d0b6a_w.616.jpeg b/data/doc/opencpn/manual/route-activated-right-click.h.432_tok.2d0b6a_w.616.jpeg deleted file mode 100644 index 0b4fb7358d..0000000000 Binary files a/data/doc/opencpn/manual/route-activated-right-click.h.432_tok.2d0b6a_w.616.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-activated-right-click.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html b/data/doc/opencpn/manual/route-activated-right-click.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html deleted file mode 100644 index 44c8f30348..0000000000 --- a/data/doc/opencpn/manual/route-activated-right-click.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:route-activated-right-click.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:route-activated-right-click.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:route-activated-right-click.jpg

- -

- - -

- - route-activated-right-click.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/route-activated-right-click.jpeg b/data/doc/opencpn/manual/route-activated-right-click.jpeg deleted file mode 100644 index 0b4fb7358d..0000000000 Binary files a/data/doc/opencpn/manual/route-activated-right-click.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-activated-right-click.tok.0590cc_w.400.jpeg b/data/doc/opencpn/manual/route-activated-right-click.tok.0590cc_w.400.jpeg deleted file mode 100644 index 439e32f7b1..0000000000 Binary files a/data/doc/opencpn/manual/route-activated-right-click.tok.0590cc_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-active-activate-next-wp.h.336_tok.02925d_w.398.jpeg b/data/doc/opencpn/manual/route-active-activate-next-wp.h.336_tok.02925d_w.398.jpeg deleted file mode 100644 index 3a3e741ac7..0000000000 Binary files a/data/doc/opencpn/manual/route-active-activate-next-wp.h.336_tok.02925d_w.398.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-active-activate-next-wp.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html b/data/doc/opencpn/manual/route-active-activate-next-wp.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html deleted file mode 100644 index 776c278ebd..0000000000 --- a/data/doc/opencpn/manual/route-active-activate-next-wp.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:route-active-activate-next-wp.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:route-active-activate-next-wp.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:route-active-activate-next-wp.jpg

- -

- - -

- - route-active-activate-next-wp.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/route-active-activate-next-wp.jpeg b/data/doc/opencpn/manual/route-active-activate-next-wp.jpeg deleted file mode 100644 index 3a3e741ac7..0000000000 Binary files a/data/doc/opencpn/manual/route-active-activate-next-wp.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-active-activate-next-wp.tok.c68445_w.400.jpeg b/data/doc/opencpn/manual/route-active-activate-next-wp.tok.c68445_w.400.jpeg deleted file mode 100644 index 6fd0ea35e5..0000000000 Binary files a/data/doc/opencpn/manual/route-active-activate-next-wp.tok.c68445_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-active-now-eta-wp1.h.425_tok.8c3ef0_w.638.jpeg b/data/doc/opencpn/manual/route-active-now-eta-wp1.h.425_tok.8c3ef0_w.638.jpeg deleted file mode 100644 index 76aa6b0612..0000000000 Binary files a/data/doc/opencpn/manual/route-active-now-eta-wp1.h.425_tok.8c3ef0_w.638.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-active-now-eta-wp4.h.400_tok.2f06c6_w.633.jpeg b/data/doc/opencpn/manual/route-active-now-eta-wp4.h.400_tok.2f06c6_w.633.jpeg deleted file mode 100644 index e294f1706b..0000000000 Binary files a/data/doc/opencpn/manual/route-active-now-eta-wp4.h.400_tok.2f06c6_w.633.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-button.h.31_tok.dfd02a_w.30.jpg b/data/doc/opencpn/manual/route-button.h.31_tok.dfd02a_w.30.jpg deleted file mode 100644 index d2d015e505..0000000000 Binary files a/data/doc/opencpn/manual/route-button.h.31_tok.dfd02a_w.30.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-create-insert.gif b/data/doc/opencpn/manual/route-create-insert.gif deleted file mode 100644 index 9ada2d4ed4..0000000000 Binary files a/data/doc/opencpn/manual/route-create-insert.gif and /dev/null differ diff --git a/data/doc/opencpn/manual/route-create-insert.h.600_tok.e7f83c_w.800.gif b/data/doc/opencpn/manual/route-create-insert.h.600_tok.e7f83c_w.800.gif deleted file mode 100644 index 9ada2d4ed4..0000000000 Binary files a/data/doc/opencpn/manual/route-create-insert.h.600_tok.e7f83c_w.800.gif and /dev/null differ diff --git a/data/doc/opencpn/manual/route-create-insert.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.gif.detail.html b/data/doc/opencpn/manual/route-create-insert.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.gif.detail.html deleted file mode 100644 index e833f7ed6a..0000000000 --- a/data/doc/opencpn/manual/route-create-insert.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.gif.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:route-create-insert.gif [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:route-create-insert.gif

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:route-create-insert.gif

- -

- - -

- - route-create-insert.gif -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/route-create-insert.tok.14f7fe_w.400.gif b/data/doc/opencpn/manual/route-create-insert.tok.14f7fe_w.400.gif deleted file mode 100644 index 6b6dbb8a74..0000000000 Binary files a/data/doc/opencpn/manual/route-create-insert.tok.14f7fe_w.400.gif and /dev/null differ diff --git a/data/doc/opencpn/manual/route-inactive-active-date-time-eta.h.440_tok.bc49ed_w.639.jpeg b/data/doc/opencpn/manual/route-inactive-active-date-time-eta.h.440_tok.bc49ed_w.639.jpeg deleted file mode 100644 index f61d9fd481..0000000000 Binary files a/data/doc/opencpn/manual/route-inactive-active-date-time-eta.h.440_tok.bc49ed_w.639.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-legs.h.446_tok.b6d0a5_w.110.jpg b/data/doc/opencpn/manual/route-legs.h.446_tok.b6d0a5_w.110.jpg deleted file mode 100644 index 14a12ea9e1..0000000000 Binary files a/data/doc/opencpn/manual/route-legs.h.446_tok.b6d0a5_w.110.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-legs1.h.106_tok.abfbf7_w.164.jpg b/data/doc/opencpn/manual/route-legs1.h.106_tok.abfbf7_w.164.jpg deleted file mode 100644 index c10bba8185..0000000000 Binary files a/data/doc/opencpn/manual/route-legs1.h.106_tok.abfbf7_w.164.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-properties-normal-ete.h.425_tok.de4316_w.637.jpeg b/data/doc/opencpn/manual/route-properties-normal-ete.h.425_tok.de4316_w.637.jpeg deleted file mode 100644 index 69453da26f..0000000000 Binary files a/data/doc/opencpn/manual/route-properties-normal-ete.h.425_tok.de4316_w.637.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-properties.h.385_tok.25605f_w.600.jpg b/data/doc/opencpn/manual/route-properties.h.385_tok.25605f_w.600.jpg deleted file mode 100644 index ec541c6148..0000000000 Binary files a/data/doc/opencpn/manual/route-properties.h.385_tok.25605f_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-properties1.h.230_tok.9c1d23_w.600.jpg b/data/doc/opencpn/manual/route-properties1.h.230_tok.9c1d23_w.600.jpg deleted file mode 100644 index 8c33e5be48..0000000000 Binary files a/data/doc/opencpn/manual/route-properties1.h.230_tok.9c1d23_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-properties2.h.287_tok.419fcc_w.400.jpg b/data/doc/opencpn/manual/route-properties2.h.287_tok.419fcc_w.400.jpg deleted file mode 100644 index 6eb0ee0f3e..0000000000 Binary files a/data/doc/opencpn/manual/route-properties2.h.287_tok.419fcc_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-right-click-activate.h.262_tok.ecd2c3_w.448.jpeg b/data/doc/opencpn/manual/route-right-click-activate.h.262_tok.ecd2c3_w.448.jpeg deleted file mode 100644 index ed35cc2397..0000000000 Binary files a/data/doc/opencpn/manual/route-right-click-activate.h.262_tok.ecd2c3_w.448.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-right-click-activate.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html b/data/doc/opencpn/manual/route-right-click-activate.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html deleted file mode 100644 index 750eddccbc..0000000000 --- a/data/doc/opencpn/manual/route-right-click-activate.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:route-right-click-activate.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:route-right-click-activate.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:route-right-click-activate.jpg

- -

- - -

- - route-right-click-activate.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/route-right-click-activate.jpeg b/data/doc/opencpn/manual/route-right-click-activate.jpeg deleted file mode 100644 index ed35cc2397..0000000000 Binary files a/data/doc/opencpn/manual/route-right-click-activate.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-right-click-activate.tok.f1fca8_w.400.jpeg b/data/doc/opencpn/manual/route-right-click-activate.tok.f1fca8_w.400.jpeg deleted file mode 100644 index 65bc1b0559..0000000000 Binary files a/data/doc/opencpn/manual/route-right-click-activate.tok.f1fca8_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/route-rollover.h.535_tok.74dbb6_w.650.jpg b/data/doc/opencpn/manual/route-rollover.h.535_tok.74dbb6_w.650.jpg deleted file mode 100644 index 5d9718c636..0000000000 Binary files a/data/doc/opencpn/manual/route-rollover.h.535_tok.74dbb6_w.650.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route.h.32_tok.481319_w.32.jpg b/data/doc/opencpn/manual/route.h.32_tok.481319_w.32.jpg deleted file mode 100644 index 5c3510ac43..0000000000 Binary files a/data/doc/opencpn/manual/route.h.32_tok.481319_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route21.h.383_tok.496007_w.600.jpg b/data/doc/opencpn/manual/route21.h.383_tok.496007_w.600.jpg deleted file mode 100644 index cd82ece4a9..0000000000 Binary files a/data/doc/opencpn/manual/route21.h.383_tok.496007_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route_manager.h.32_tok.70ad64_w.32.jpg b/data/doc/opencpn/manual/route_manager.h.32_tok.70ad64_w.32.jpg deleted file mode 100644 index 6db8614a4e..0000000000 Binary files a/data/doc/opencpn/manual/route_manager.h.32_tok.70ad64_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/route_plugin.h.415_tok.04122f_w.500.jpg b/data/doc/opencpn/manual/route_plugin.h.415_tok.04122f_w.500.jpg deleted file mode 100644 index 43638d6e08..0000000000 Binary files a/data/doc/opencpn/manual/route_plugin.h.415_tok.04122f_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/saildocscurrent.h.700_tok.687ba2_w.756.jpeg b/data/doc/opencpn/manual/saildocscurrent.h.700_tok.687ba2_w.756.jpeg deleted file mode 100644 index 3e7d621206..0000000000 Binary files a/data/doc/opencpn/manual/saildocscurrent.h.700_tok.687ba2_w.756.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/saildocscurrent.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.jpg.detail.html b/data/doc/opencpn/manual/saildocscurrent.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.jpg.detail.html deleted file mode 100644 index 621818128a..0000000000 --- a/data/doc/opencpn/manual/saildocscurrent.id.opencpn_3Aopencpn_user_manual_3Aplugins_3Aincluded_plugins_3Agrib_weather.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:saildocscurrent.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:saildocscurrent.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:saildocscurrent.jpg

- -

- - -

- - saildocscurrent.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/saildocscurrent.jpeg b/data/doc/opencpn/manual/saildocscurrent.jpeg deleted file mode 100644 index 9ac460be3b..0000000000 Binary files a/data/doc/opencpn/manual/saildocscurrent.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/saildocscurrent.tok.38af4d_w.400.jpeg b/data/doc/opencpn/manual/saildocscurrent.tok.38af4d_w.400.jpeg deleted file mode 100644 index 827dc6d40d..0000000000 Binary files a/data/doc/opencpn/manual/saildocscurrent.tok.38af4d_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/sart-alarm2.h.370_tok.ddd552_w.600.jpg b/data/doc/opencpn/manual/sart-alarm2.h.370_tok.ddd552_w.600.jpg deleted file mode 100644 index dbcaca4e65..0000000000 Binary files a/data/doc/opencpn/manual/sart-alarm2.h.370_tok.ddd552_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sart-testing.tok.9aae14_w.600.jpg b/data/doc/opencpn/manual/sart-testing.tok.9aae14_w.600.jpg deleted file mode 100644 index 2ae489100c..0000000000 Binary files a/data/doc/opencpn/manual/sart-testing.tok.9aae14_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sart1.h.147_tok.4ff38e_w.300.jpg b/data/doc/opencpn/manual/sart1.h.147_tok.4ff38e_w.300.jpg deleted file mode 100644 index 6f17664e4b..0000000000 Binary files a/data/doc/opencpn/manual/sart1.h.147_tok.4ff38e_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sart3.h.310_tok.cf1c87_w.400.jpg b/data/doc/opencpn/manual/sart3.h.310_tok.cf1c87_w.400.jpg deleted file mode 100644 index 50b11ecd15..0000000000 Binary files a/data/doc/opencpn/manual/sart3.h.310_tok.cf1c87_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sart4.h.41_tok.a4f6d1_w.45.jpg b/data/doc/opencpn/manual/sart4.h.41_tok.a4f6d1_w.45.jpg deleted file mode 100644 index 2f73830ddb..0000000000 Binary files a/data/doc/opencpn/manual/sart4.h.41_tok.a4f6d1_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sart4.h.48_tok.0f2d59_w.52.jpg b/data/doc/opencpn/manual/sart4.h.48_tok.0f2d59_w.52.jpg deleted file mode 100644 index 0fb181547d..0000000000 Binary files a/data/doc/opencpn/manual/sart4.h.48_tok.0f2d59_w.52.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sart5.h.46_tok.c43908_w.45.jpg b/data/doc/opencpn/manual/sart5.h.46_tok.c43908_w.45.jpg deleted file mode 100644 index e20e2e3272..0000000000 Binary files a/data/doc/opencpn/manual/sart5.h.46_tok.c43908_w.45.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sartalarm.h.377_tok.38a6a4_w.600.jpg b/data/doc/opencpn/manual/sartalarm.h.377_tok.38a6a4_w.600.jpg deleted file mode 100644 index 18715dc29b..0000000000 Binary files a/data/doc/opencpn/manual/sartalarm.h.377_tok.38a6a4_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/scin.h.32_tok.ab9680_w.32.jpg b/data/doc/opencpn/manual/scin.h.32_tok.ab9680_w.32.jpg deleted file mode 100644 index a024e818d6..0000000000 Binary files a/data/doc/opencpn/manual/scin.h.32_tok.ab9680_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/scout.h.32_tok.d43f56_w.32.jpg b/data/doc/opencpn/manual/scout.h.32_tok.d43f56_w.32.jpg deleted file mode 100644 index dcec1bfcd8..0000000000 Binary files a/data/doc/opencpn/manual/scout.h.32_tok.d43f56_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/seg.h.97_tok.715b88_w.550.jpg b/data/doc/opencpn/manual/seg.h.97_tok.715b88_w.550.jpg deleted file mode 100644 index 276b20604d..0000000000 Binary files a/data/doc/opencpn/manual/seg.h.97_tok.715b88_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sentence-filters.h.420_tok.6aec81_w.280.jpg b/data/doc/opencpn/manual/sentence-filters.h.420_tok.6aec81_w.280.jpg deleted file mode 100644 index 8cbc2bcb7e..0000000000 Binary files a/data/doc/opencpn/manual/sentence-filters.h.420_tok.6aec81_w.280.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sentence-filters1.h.97_tok.c6cc1f_w.313.jpg b/data/doc/opencpn/manual/sentence-filters1.h.97_tok.c6cc1f_w.313.jpg deleted file mode 100644 index 74e9e64371..0000000000 Binary files a/data/doc/opencpn/manual/sentence-filters1.h.97_tok.c6cc1f_w.313.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sentence-filters2.h.166_tok.9b5d51_w.459.jpg b/data/doc/opencpn/manual/sentence-filters2.h.166_tok.9b5d51_w.459.jpg deleted file mode 100644 index 8bb5b99c4a..0000000000 Binary files a/data/doc/opencpn/manual/sentence-filters2.h.166_tok.9b5d51_w.459.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.h.292_tok.3fa4bd_w.393.jpg b/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.h.292_tok.3fa4bd_w.393.jpg deleted file mode 100644 index 23ecc60ed5..0000000000 Binary files a/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.h.292_tok.3fa4bd_w.393.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index f94147eaa7..0000000000 --- a/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:settings-ship-mmsi-add-mmsi-properties.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:settings-ship-mmsi-add-mmsi-properties.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:settings-ship-mmsi-add-mmsi-properties.jpg

- -

- - -

- - settings-ship-mmsi-add-mmsi-properties.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.jpg b/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.jpg deleted file mode 100644 index 23ecc60ed5..0000000000 Binary files a/data/doc/opencpn/manual/settings-ship-mmsi-add-mmsi-properties.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.h.128_tok.b18e76_w.292.jpg b/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.h.128_tok.b18e76_w.292.jpg deleted file mode 100644 index 281fe50e89..0000000000 Binary files a/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.h.128_tok.b18e76_w.292.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 10aba476c5..0000000000 --- a/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:settings-ship-mmsi-less-than-nine.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:settings-ship-mmsi-less-than-nine.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:settings-ship-mmsi-less-than-nine.jpg

- -

- - -

- - settings-ship-mmsi-less-than-nine.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.jpg b/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.jpg deleted file mode 100644 index 281fe50e89..0000000000 Binary files a/data/doc/opencpn/manual/settings-ship-mmsi-less-than-nine.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/settings.h.32_tok.90bb99_w.32.jpg b/data/doc/opencpn/manual/settings.h.32_tok.90bb99_w.32.jpg deleted file mode 100644 index a9e280ace6..0000000000 Binary files a/data/doc/opencpn/manual/settings.h.32_tok.90bb99_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/settings.h.42_tok.6fadf0_w.43.jpg b/data/doc/opencpn/manual/settings.h.42_tok.6fadf0_w.43.jpg deleted file mode 100644 index 619fa4aa3a..0000000000 Binary files a/data/doc/opencpn/manual/settings.h.42_tok.6fadf0_w.43.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/settings.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting.png.detail.html b/data/doc/opencpn/manual/settings.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting.png.detail.html deleted file mode 100644 index 7a4eb87dfd..0000000000 --- a/data/doc/opencpn/manual/settings.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:settings.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - -
-
- -
-
-
-
- -

- opencpn:manual:settings.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:settings.jpg

- -

- - -

- - settings.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/settings.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aoptions.png.detail.html b/data/doc/opencpn/manual/settings.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aoptions.png.detail.html deleted file mode 100644 index c225ba4988..0000000000 --- a/data/doc/opencpn/manual/settings.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aoptions.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:settings.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:settings.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:settings.jpg

- -

- - -

- - settings.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/settings.jpg b/data/doc/opencpn/manual/settings.jpg deleted file mode 100644 index 619fa4aa3a..0000000000 Binary files a/data/doc/opencpn/manual/settings.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ship_grey.h.45_tok.2e157a_w.19.jpg b/data/doc/opencpn/manual/ship_grey.h.45_tok.2e157a_w.19.jpg deleted file mode 100644 index dc37df78c3..0000000000 Binary files a/data/doc/opencpn/manual/ship_grey.h.45_tok.2e157a_w.19.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ship_grey.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/ship_grey.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index 7034d2516d..0000000000 --- a/data/doc/opencpn/manual/ship_grey.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ship_grey.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ship_grey.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ship_grey.jpg

- -

- - -

- - ship_grey.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ship_grey.jpg b/data/doc/opencpn/manual/ship_grey.jpg deleted file mode 100644 index dc37df78c3..0000000000 Binary files a/data/doc/opencpn/manual/ship_grey.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ship_red.h.45_tok.032b33_w.19.jpg b/data/doc/opencpn/manual/ship_red.h.45_tok.032b33_w.19.jpg deleted file mode 100644 index 3f8f07aa67..0000000000 Binary files a/data/doc/opencpn/manual/ship_red.h.45_tok.032b33_w.19.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ship_red.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html b/data/doc/opencpn/manual/ship_red.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html deleted file mode 100644 index 118fd93d18..0000000000 --- a/data/doc/opencpn/manual/ship_red.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aauto_follow.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:ship_red.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:ship_red.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:ship_red.jpg

- -

- - -

- - ship_red.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/ship_red.jpg b/data/doc/opencpn/manual/ship_red.jpg deleted file mode 100644 index 3f8f07aa67..0000000000 Binary files a/data/doc/opencpn/manual/ship_red.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/skewed.h.30_tok.2be2d9_w.130.jpg b/data/doc/opencpn/manual/skewed.h.30_tok.2be2d9_w.130.jpg deleted file mode 100644 index 2b5941dc56..0000000000 Binary files a/data/doc/opencpn/manual/skewed.h.30_tok.2be2d9_w.130.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/sounding.h.299_tok.4d5179_w.374.jpg b/data/doc/opencpn/manual/sounding.h.299_tok.4d5179_w.374.jpg deleted file mode 100644 index c243583c5b..0000000000 Binary files a/data/doc/opencpn/manual/sounding.h.299_tok.4d5179_w.374.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/start.h.374_tok.5099a4_w.488.jpg b/data/doc/opencpn/manual/start.h.374_tok.5099a4_w.488.jpg deleted file mode 100644 index 8b48150f30..0000000000 Binary files a/data/doc/opencpn/manual/start.h.374_tok.5099a4_w.488.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/start1.h.132_tok.b6628b_w.401.jpg b/data/doc/opencpn/manual/start1.h.132_tok.b6628b_w.401.jpg deleted file mode 100644 index f5c1696eb2..0000000000 Binary files a/data/doc/opencpn/manual/start1.h.132_tok.b6628b_w.401.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/start3.h.429_tok.756808_w.551.jpg b/data/doc/opencpn/manual/start3.h.429_tok.756808_w.551.jpg deleted file mode 100644 index c273588a55..0000000000 Binary files a/data/doc/opencpn/manual/start3.h.429_tok.756808_w.551.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/status-bar.h.18_tok.68e43c_w.550.jpg b/data/doc/opencpn/manual/status-bar.h.18_tok.68e43c_w.550.jpg deleted file mode 100644 index 785357703e..0000000000 Binary files a/data/doc/opencpn/manual/status-bar.h.18_tok.68e43c_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/std-grib.h.50_tok.14d9f6_w.132.jpg b/data/doc/opencpn/manual/std-grib.h.50_tok.14d9f6_w.132.jpg deleted file mode 100644 index 2e5dba5aa8..0000000000 Binary files a/data/doc/opencpn/manual/std-grib.h.50_tok.14d9f6_w.132.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/stxhole1.h.547_tok.a17e77_w.600.jpg b/data/doc/opencpn/manual/stxhole1.h.547_tok.a17e77_w.600.jpg deleted file mode 100644 index ec04b965ca..0000000000 Binary files a/data/doc/opencpn/manual/stxhole1.h.547_tok.a17e77_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/swlook.h.389_tok.f5dcad_w.600.jpg b/data/doc/opencpn/manual/swlook.h.389_tok.f5dcad_w.600.jpg deleted file mode 100644 index 0a402fdf1c..0000000000 Binary files a/data/doc/opencpn/manual/swlook.h.389_tok.f5dcad_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/targetcpa.h.135_tok.5f4204_w.183.jpg b/data/doc/opencpn/manual/targetcpa.h.135_tok.5f4204_w.183.jpg deleted file mode 100644 index 19e2f45ebd..0000000000 Binary files a/data/doc/opencpn/manual/targetcpa.h.135_tok.5f4204_w.183.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/text.h.32_tok.879d9c_w.32.jpg b/data/doc/opencpn/manual/text.h.32_tok.879d9c_w.32.jpg deleted file mode 100644 index 55c37148e7..0000000000 Binary files a/data/doc/opencpn/manual/text.h.32_tok.879d9c_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide-interference.h.200_tok.870a13_w.223.jpg b/data/doc/opencpn/manual/tide-interference.h.200_tok.870a13_w.223.jpg deleted file mode 100644 index a34f68748c..0000000000 Binary files a/data/doc/opencpn/manual/tide-interference.h.200_tok.870a13_w.223.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide-select1.h.436_tok.b9a442_w.500.jpg b/data/doc/opencpn/manual/tide-select1.h.436_tok.b9a442_w.500.jpg deleted file mode 100644 index 68bb8431d5..0000000000 Binary files a/data/doc/opencpn/manual/tide-select1.h.436_tok.b9a442_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide-select2.h.436_tok.5bae26_w.500.jpg b/data/doc/opencpn/manual/tide-select2.h.436_tok.5bae26_w.500.jpg deleted file mode 100644 index ffcc422d6f..0000000000 Binary files a/data/doc/opencpn/manual/tide-select2.h.436_tok.5bae26_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide.h.32_tok.3c4d44_w.32.jpg b/data/doc/opencpn/manual/tide.h.32_tok.3c4d44_w.32.jpg deleted file mode 100644 index 6284128ce8..0000000000 Binary files a/data/doc/opencpn/manual/tide.h.32_tok.3c4d44_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Atides_and_currents.png.detail.html b/data/doc/opencpn/manual/tide.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Atides_and_currents.png.detail.html deleted file mode 100644 index 573ac7b33a..0000000000 --- a/data/doc/opencpn/manual/tide.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Atides_and_currents.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:tide.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:tide.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:tide.jpg

- -

- - -

- - tide.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/tide.jpg b/data/doc/opencpn/manual/tide.jpg deleted file mode 100644 index 6284128ce8..0000000000 Binary files a/data/doc/opencpn/manual/tide.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide1.h.219_tok.358872_w.300.jpg b/data/doc/opencpn/manual/tide1.h.219_tok.358872_w.300.jpg deleted file mode 100644 index 9bc667a281..0000000000 Binary files a/data/doc/opencpn/manual/tide1.h.219_tok.358872_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide2.h.232_tok.84c3dd_w.300.jpg b/data/doc/opencpn/manual/tide2.h.232_tok.84c3dd_w.300.jpg deleted file mode 100644 index aef3237996..0000000000 Binary files a/data/doc/opencpn/manual/tide2.h.232_tok.84c3dd_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide4.h.56_tok.7d17c9_w.40.jpg b/data/doc/opencpn/manual/tide4.h.56_tok.7d17c9_w.40.jpg deleted file mode 100644 index 17fca8343e..0000000000 Binary files a/data/doc/opencpn/manual/tide4.h.56_tok.7d17c9_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide5.h.71_tok.c81d86_w.40.jpg b/data/doc/opencpn/manual/tide5.h.71_tok.c81d86_w.40.jpg deleted file mode 100644 index e29f9b5961..0000000000 Binary files a/data/doc/opencpn/manual/tide5.h.71_tok.c81d86_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide6.h.62_tok.2eb207_w.40.jpg b/data/doc/opencpn/manual/tide6.h.62_tok.2eb207_w.40.jpg deleted file mode 100644 index 80028bfb6f..0000000000 Binary files a/data/doc/opencpn/manual/tide6.h.62_tok.2eb207_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tide7.h.70_tok.0ed8e9_w.40.jpg b/data/doc/opencpn/manual/tide7.h.70_tok.0ed8e9_w.40.jpg deleted file mode 100644 index 99a493d642..0000000000 Binary files a/data/doc/opencpn/manual/tide7.h.70_tok.0ed8e9_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tmerc.h.30_tok.4b16af_w.130.jpg b/data/doc/opencpn/manual/tmerc.h.30_tok.4b16af_w.130.jpg deleted file mode 100644 index 3ba2eb9b7c..0000000000 Binary files a/data/doc/opencpn/manual/tmerc.h.30_tok.4b16af_w.130.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-2.h.33_tok.72b8d8_w.32.jpg b/data/doc/opencpn/manual/toolbar-2.h.33_tok.72b8d8_w.32.jpg deleted file mode 100644 index d8e837427d..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-2.h.33_tok.72b8d8_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-ais.h.33_tok.c75a68_w.156.jpg b/data/doc/opencpn/manual/toolbar-ais.h.33_tok.c75a68_w.156.jpg deleted file mode 100644 index 1dd5457dbb..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-ais.h.33_tok.c75a68_w.156.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-ais.h.46_tok.9e24e5_w.194.jpg b/data/doc/opencpn/manual/toolbar-ais.h.46_tok.9e24e5_w.194.jpg deleted file mode 100644 index 02b15abad1..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-ais.h.46_tok.9e24e5_w.194.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-ais.tok.13de75_w.150.jpg b/data/doc/opencpn/manual/toolbar-ais.tok.13de75_w.150.jpg deleted file mode 100644 index f39296e436..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-ais.tok.13de75_w.150.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.h.402_tok.028fbe_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.h.402_tok.028fbe_w.550.jpg deleted file mode 100644 index c4bdebc63e..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.h.402_tok.028fbe_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html b/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html deleted file mode 100644 index b2161a05db..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-charts-chart-groups.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-charts-chart-groups.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-charts-chart-groups.jpg

- -

- - -

- - toolbar-options-charts-chart-groups.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.jpg b/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.jpg deleted file mode 100644 index c4bdebc63e..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-charts-chart-groups.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.h.244_tok.69ed46_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.h.244_tok.69ed46_w.550.jpg deleted file mode 100644 index ae983ae1c7..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.h.244_tok.69ed46_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html b/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html deleted file mode 100644 index 2f32aaee26..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-charts-tides-currents.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-charts-tides-currents.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-charts-tides-currents.jpg

- -

- - -

- - toolbar-options-charts-tides-currents.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.jpg b/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.jpg deleted file mode 100644 index ae983ae1c7..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-charts-tides-currents.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.h.595_tok.733874_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.h.595_tok.733874_w.550.jpg deleted file mode 100644 index 94c51bd286..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.h.595_tok.733874_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html b/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html deleted file mode 100644 index 71f95ecfe2..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Achart.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-charts-vector-chart-display.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-charts-vector-chart-display.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-charts-vector-chart-display.jpg

- -

- - -

- - toolbar-options-charts-vector-chart-display.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.jpg b/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.jpg deleted file mode 100644 index 94c51bd286..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-charts-vector-chart-display.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-connections-net-1.h.622_tok.158d61_w.548.jpg b/data/doc/opencpn/manual/toolbar-options-connections-net-1.h.622_tok.158d61_w.548.jpg deleted file mode 100644 index 47fb2b0e27..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-connections-net-1.h.622_tok.158d61_w.548.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-connections-net-1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html b/data/doc/opencpn/manual/toolbar-options-connections-net-1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html deleted file mode 100644 index a23935d67f..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-connections-net-1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-connections-net-1.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-connections-net-1.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-connections-net-1.jpg

- -

- - -

- - toolbar-options-connections-net-1.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-connections-net-1.jpg b/data/doc/opencpn/manual/toolbar-options-connections-net-1.jpg deleted file mode 100644 index 47fb2b0e27..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-connections-net-1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-connections-net-2.h.213_tok.eb73d5_w.547.jpg b/data/doc/opencpn/manual/toolbar-options-connections-net-2.h.213_tok.eb73d5_w.547.jpg deleted file mode 100644 index 6308dd9de6..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-connections-net-2.h.213_tok.eb73d5_w.547.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-connections-net-2.h.214_tok.6dfc04_w.552.jpg b/data/doc/opencpn/manual/toolbar-options-connections-net-2.h.214_tok.6dfc04_w.552.jpg deleted file mode 100644 index a1814982e0..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-connections-net-2.h.214_tok.6dfc04_w.552.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-connections-net-2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html b/data/doc/opencpn/manual/toolbar-options-connections-net-2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html deleted file mode 100644 index 3ad289599b..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-connections-net-2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aconnections.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-connections-net-2.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-connections-net-2.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-connections-net-2.jpg

- -

- - -

- - toolbar-options-connections-net-2.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-connections-net-2.jpg b/data/doc/opencpn/manual/toolbar-options-connections-net-2.jpg deleted file mode 100644 index 6308dd9de6..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-connections-net-2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-display-advanced.h.497_tok.f8c60a_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-display-advanced.h.497_tok.f8c60a_w.550.jpg deleted file mode 100644 index 411a92c9b6..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-display-advanced.h.497_tok.f8c60a_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-display-advanced.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/toolbar-options-display-advanced.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index 3e56a2d297..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-display-advanced.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-display-advanced.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-display-advanced.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-display-advanced.jpg

- -

- - -

- - toolbar-options-display-advanced.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-display-advanced.jpg b/data/doc/opencpn/manual/toolbar-options-display-advanced.jpg deleted file mode 100644 index 411a92c9b6..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-display-advanced.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-display-general_0.h.390_tok.202b8b_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-display-general_0.h.390_tok.202b8b_w.550.jpg deleted file mode 100644 index 927297f648..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-display-general_0.h.390_tok.202b8b_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting.png.detail.html b/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting.png.detail.html deleted file mode 100644 index 393a2a8ff3..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-display-general_0.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - -
-
- -
-
-
-
- -

- opencpn:manual:toolbar-options-display-general_0.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-display-general_0.jpg

- -

- - -

- - toolbar-options-display-general_0.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index ffdbcc076b..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-display-general_0.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-display-general_0.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-display-general_0.jpg

- -

- - -

- - toolbar-options-display-general_0.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aoptions.png.detail.html b/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aoptions.png.detail.html deleted file mode 100644 index fe5bcc71ec..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-display-general_0.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aoptions.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-display-general_0.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-display-general_0.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-display-general_0.jpg

- -

- - -

- - toolbar-options-display-general_0.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-display-general_0.jpg b/data/doc/opencpn/manual/toolbar-options-display-general_0.jpg deleted file mode 100644 index 927297f648..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-display-general_0.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-display-units_0.h.503_tok.8cf544_w.533.jpg b/data/doc/opencpn/manual/toolbar-options-display-units_0.h.503_tok.8cf544_w.533.jpg deleted file mode 100644 index f1c717a0ac..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-display-units_0.h.503_tok.8cf544_w.533.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-display-units_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/toolbar-options-display-units_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index d317d97ddc..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-display-units_0.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-display-units_0.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-display-units_0.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-display-units_0.jpg

- -

- - -

- - toolbar-options-display-units_0.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-display-units_0.jpg b/data/doc/opencpn/manual/toolbar-options-display-units_0.jpg deleted file mode 100644 index f1c717a0ac..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-display-units_0.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.h.65_tok.47a87e_w.128.jpg b/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.h.65_tok.47a87e_w.128.jpg deleted file mode 100644 index b650df5abc..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.h.65_tok.47a87e_w.128.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html b/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html deleted file mode 100644 index 99987b08a7..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Adisplay.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-mag-true-both-ticked.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-mag-true-both-ticked.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-mag-true-both-ticked.jpg

- -

- - -

- - toolbar-options-mag-true-both-ticked.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.jpg b/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.jpg deleted file mode 100644 index b650df5abc..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-mag-true-both-ticked.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.h.513_tok.729cea_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.h.513_tok.729cea_w.550.jpg deleted file mode 100644 index 086087f776..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.h.513_tok.729cea_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index b250621aed..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-ships-ais-targets-1.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-ships-ais-targets-1.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-ships-ais-targets-1.jpg

- -

- - -

- - toolbar-options-ships-ais-targets-1.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.jpg b/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.jpg deleted file mode 100644 index 086087f776..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.h.292_tok.211b6f_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.h.292_tok.211b6f_w.550.jpg deleted file mode 100644 index 824777dfe4..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.h.292_tok.211b6f_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index 926a1f2294..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-ships-ais-targets-2.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-ships-ais-targets-2.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-ships-ais-targets-2.jpg

- -

- - -

- - toolbar-options-ships-ais-targets-2.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.jpg b/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.jpg deleted file mode 100644 index 824777dfe4..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-ships-ais-targets-2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-ships-own-ship.h.566_tok.72fb45_w.550.jpg b/data/doc/opencpn/manual/toolbar-options-ships-own-ship.h.566_tok.72fb45_w.550.jpg deleted file mode 100644 index b52c14ec77..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-ships-own-ship.h.566_tok.72fb45_w.550.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar-options-ships-own-ship.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html b/data/doc/opencpn/manual/toolbar-options-ships-own-ship.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html deleted file mode 100644 index b8ede64d25..0000000000 --- a/data/doc/opencpn/manual/toolbar-options-ships-own-ship.id.opencpn_3Aopencpn_user_manual_3Aoptions_setting_3Aships.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar-options-ships-own-ship.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar-options-ships-own-ship.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar-options-ships-own-ship.jpg

- -

- - -

- - toolbar-options-ships-own-ship.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar-options-ships-own-ship.jpg b/data/doc/opencpn/manual/toolbar-options-ships-own-ship.jpg deleted file mode 100644 index b52c14ec77..0000000000 Binary files a/data/doc/opencpn/manual/toolbar-options-ships-own-ship.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar22.h.36_tok.03d1b6_w.64.jpg b/data/doc/opencpn/manual/toolbar22.h.36_tok.03d1b6_w.64.jpg deleted file mode 100644 index 7f8e992fd4..0000000000 Binary files a/data/doc/opencpn/manual/toolbar22.h.36_tok.03d1b6_w.64.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.h.600_tok.a56235_w.737.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.h.600_tok.a56235_w.737.jpeg deleted file mode 100644 index 4c652db24c..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.h.600_tok.a56235_w.737.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index bec743bf22..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:ais:ais-mmsi-properties-new.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:ais:ais-mmsi-properties-new.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:ais:ais-mmsi-properties-new.jpg

- -

- - -

- - ais-mmsi-properties-new.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.jpeg deleted file mode 100644 index 4c652db24c..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.tok.b8d487_w.600.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.tok.b8d487_w.600.jpeg deleted file mode 100644 index 65a6ce8530..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mmsi-properties-new.tok.b8d487_w.600.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.h.526_tok.abb48b_w.800.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.h.526_tok.abb48b_w.800.jpeg deleted file mode 100644 index dc0e23a1a5..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.h.526_tok.abb48b_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais.jpg.detail.html b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais.jpg.detail.html deleted file mode 100644 index d9330756a9..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:ais:ais-mob-simple-track.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:ais:ais-mob-simple-track.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:ais:ais-mob-simple-track.jpg

- -

- - -

- - ais-mob-simple-track.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.jpeg deleted file mode 100644 index dc0e23a1a5..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.tok.8db3cc_w.200.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.tok.8db3cc_w.200.jpeg deleted file mode 100644 index e0e45ca4e8..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-track.tok.8db3cc_w.200.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.h.541_tok.ad7ea1_w.800.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.h.541_tok.ad7ea1_w.800.jpeg deleted file mode 100644 index ed68243769..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.h.541_tok.ad7ea1_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index bbbaf194cc..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:ais:ais-mob-simple-waypoints.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:ais:ais-mob-simple-waypoints.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:ais:ais-mob-simple-waypoints.jpg

- -

- - -

- - ais-mob-simple-waypoints.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.jpeg deleted file mode 100644 index ed68243769..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.tok.8b683b_w.400.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.tok.8b683b_w.400.jpeg deleted file mode 100644 index 7530cdc188..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-mob-simple-waypoints.tok.8b683b_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.h.600_tok.c0d92b_w.678.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.h.600_tok.c0d92b_w.678.jpeg deleted file mode 100644 index 2bc347bf2d..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.h.600_tok.c0d92b_w.678.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index 19a1750361..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:ais:ais-sart-mob-change-settings-cpa.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-change-settings-cpa.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-change-settings-cpa.jpg

- -

- - -

- - ais-sart-mob-change-settings-cpa.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.jpeg deleted file mode 100644 index 2bc347bf2d..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.tok.a158de_w.600.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.tok.a158de_w.600.jpeg deleted file mode 100644 index 99ae048a53..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-change-settings-cpa.tok.a158de_w.600.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.h.477_tok.53dec6_w.800.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.h.477_tok.53dec6_w.800.jpeg deleted file mode 100644 index 8a0c7624bb..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.h.477_tok.53dec6_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index acc103e7ee..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:ais:ais-sart-mob-navigate-to-this.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-navigate-to-this.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-navigate-to-this.jpg

- -

- - -

- - ais-sart-mob-navigate-to-this.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.jpeg deleted file mode 100644 index 8a0c7624bb..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.tok.fee709_w.600.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.tok.fee709_w.600.jpeg deleted file mode 100644 index d55eb6a0e7..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-navigate-to-this.tok.fee709_w.600.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.h.545_tok.f28285_w.800.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.h.545_tok.f28285_w.800.jpeg deleted file mode 100644 index e831253d71..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.h.545_tok.f28285_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index 05efcf32c0..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:ais:ais-sart-mob-route-track-waypoint.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-route-track-waypoint.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-route-track-waypoint.jpg

- -

- - -

- - ais-sart-mob-route-track-waypoint.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.jpeg deleted file mode 100644 index e831253d71..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.tok.6ac743_w.400.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.tok.6ac743_w.400.jpeg deleted file mode 100644 index dd164eb043..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-route-track-waypoint.tok.6ac743_w.400.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.h.450_tok.269bb2_w.800.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.h.450_tok.269bb2_w.800.jpeg deleted file mode 100644 index cccab834c3..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.h.450_tok.269bb2_w.800.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html deleted file mode 100644 index a40cb57ae3..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Aais_3Asart.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:ais:ais-sart-mob-showaistargets-off.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-showaistargets-off.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:ais:ais-sart-mob-showaistargets-off.jpg

- -

- - -

- - ais-sart-mob-showaistargets-off.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.jpeg deleted file mode 100644 index cccab834c3..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.tok.845424_w.600.jpeg b/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.tok.845424_w.600.jpeg deleted file mode 100644 index c973d5f431..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/ais/ais-sart-mob-showaistargets-off.tok.845424_w.600.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.h.189_tok.4f6f2c_w.325.jpg b/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.h.189_tok.4f6f2c_w.325.jpg deleted file mode 100644 index ef104d2e01..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.h.189_tok.4f6f2c_w.325.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Ascaling_charts.png.detail.html b/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Ascaling_charts.png.detail.html deleted file mode 100644 index 883bc2e78a..0000000000 --- a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Ascaling_charts.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:toolbar_buttons:horizontal_scalebar.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:toolbar_buttons:horizontal_scalebar.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:toolbar_buttons:horizontal_scalebar.jpg

- -

- - -

- - horizontal_scalebar.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.jpg b/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.jpg deleted file mode 100644 index ef104d2e01..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.tok.cd7edc_w.400.jpg b/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.tok.cd7edc_w.400.jpg deleted file mode 100644 index 5a07774b35..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_buttons/horizontal_scalebar.tok.cd7edc_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_ecdis_mode_01.jpg b/data/doc/opencpn/manual/toolbar_ecdis_mode_01.jpg deleted file mode 100644 index ffdeeeba28..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_ecdis_mode_01.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/toolbar_ecdis_mode_02.jpg b/data/doc/opencpn/manual/toolbar_ecdis_mode_02.jpg deleted file mode 100644 index e9e18cbb2a..0000000000 Binary files a/data/doc/opencpn/manual/toolbar_ecdis_mode_02.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/track-pressed.h.43_tok.d32ec0_w.42.jpg b/data/doc/opencpn/manual/track-pressed.h.43_tok.d32ec0_w.42.jpg deleted file mode 100644 index 4594c095b1..0000000000 Binary files a/data/doc/opencpn/manual/track-pressed.h.43_tok.d32ec0_w.42.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/track-prop1.h.293_tok.9bb5bd_w.400.jpg b/data/doc/opencpn/manual/track-prop1.h.293_tok.9bb5bd_w.400.jpg deleted file mode 100644 index 91ab192081..0000000000 Binary files a/data/doc/opencpn/manual/track-prop1.h.293_tok.9bb5bd_w.400.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/track_off.h.38_tok.524d13_w.37.jpg b/data/doc/opencpn/manual/track_off.h.38_tok.524d13_w.37.jpg deleted file mode 100644 index 5a986ec444..0000000000 Binary files a/data/doc/opencpn/manual/track_off.h.38_tok.524d13_w.37.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/track_off.h.39_tok.b84d45_w.38.jpg b/data/doc/opencpn/manual/track_off.h.39_tok.b84d45_w.38.jpg deleted file mode 100644 index 55a8cd799b..0000000000 Binary files a/data/doc/opencpn/manual/track_off.h.39_tok.b84d45_w.38.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/track_off.h.41_tok.e3dfb6_w.40.jpg b/data/doc/opencpn/manual/track_off.h.41_tok.e3dfb6_w.40.jpg deleted file mode 100644 index 428d16148f..0000000000 Binary files a/data/doc/opencpn/manual/track_off.h.41_tok.e3dfb6_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/trackingon1.h.39_tok.af09c7_w.38.jpg b/data/doc/opencpn/manual/trackingon1.h.39_tok.af09c7_w.38.jpg deleted file mode 100644 index 11f7370ed6..0000000000 Binary files a/data/doc/opencpn/manual/trackingon1.h.39_tok.af09c7_w.38.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/tracks.h.164_tok.a2585c_w.600.jpg b/data/doc/opencpn/manual/tracks.h.164_tok.a2585c_w.600.jpg deleted file mode 100644 index ee8310bd68..0000000000 Binary files a/data/doc/opencpn/manual/tracks.h.164_tok.a2585c_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/trail.h.213_tok.3e0d9a_w.600.jpg b/data/doc/opencpn/manual/trail.h.213_tok.3e0d9a_w.600.jpg deleted file mode 100644 index 9b66c2db54..0000000000 Binary files a/data/doc/opencpn/manual/trail.h.213_tok.3e0d9a_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ts1.jpg b/data/doc/opencpn/manual/ts1.jpg deleted file mode 100644 index 6048a54daf..0000000000 Binary files a/data/doc/opencpn/manual/ts1.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/ts2.jpg b/data/doc/opencpn/manual/ts2.jpg deleted file mode 100644 index f9be94c3d2..0000000000 Binary files a/data/doc/opencpn/manual/ts2.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/unassessed.tok.0658e1_w.100.jpg b/data/doc/opencpn/manual/unassessed.tok.0658e1_w.100.jpg deleted file mode 100644 index 1c20fa26ae..0000000000 Binary files a/data/doc/opencpn/manual/unassessed.tok.0658e1_w.100.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/us_rnc_charts_structure.tok.cfa16b_w.500.jpg b/data/doc/opencpn/manual/us_rnc_charts_structure.tok.cfa16b_w.500.jpg deleted file mode 100644 index 4da2a4f65b..0000000000 Binary files a/data/doc/opencpn/manual/us_rnc_charts_structure.tok.cfa16b_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/use-nearby-waypoint.h.114_tok.594630_w.346.jpg b/data/doc/opencpn/manual/use-nearby-waypoint.h.114_tok.594630_w.346.jpg deleted file mode 100644 index 965471ebd3..0000000000 Binary files a/data/doc/opencpn/manual/use-nearby-waypoint.h.114_tok.594630_w.346.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/use-nearby-waypoint.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.png.detail.html b/data/doc/opencpn/manual/use-nearby-waypoint.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.png.detail.html deleted file mode 100644 index 131c76c0a8..0000000000 --- a/data/doc/opencpn/manual/use-nearby-waypoint.id.opencpn_3Aopencpn_user_manual_3Atoolbar_buttons_3Acreate_route.png.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:use-nearby-waypoint.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:use-nearby-waypoint.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:use-nearby-waypoint.jpg

- -

- - -

- - use-nearby-waypoint.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/use-nearby-waypoint.jpg b/data/doc/opencpn/manual/use-nearby-waypoint.jpg deleted file mode 100644 index 965471ebd3..0000000000 Binary files a/data/doc/opencpn/manual/use-nearby-waypoint.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/vecoverz.h.455_tok.9a8f4a_w.600.jpg b/data/doc/opencpn/manual/vecoverz.h.455_tok.9a8f4a_w.600.jpg deleted file mode 100644 index d6b8f520f1..0000000000 Binary files a/data/doc/opencpn/manual/vecoverz.h.455_tok.9a8f4a_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/vector-display-scale.tok.7d67b7_w.350.jpeg b/data/doc/opencpn/manual/vector-display-scale.tok.7d67b7_w.350.jpeg deleted file mode 100644 index 528ecab2f6..0000000000 Binary files a/data/doc/opencpn/manual/vector-display-scale.tok.7d67b7_w.350.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/vector-display.h.700_tok.3fc06f_w.570.jpeg b/data/doc/opencpn/manual/vector-display.h.700_tok.3fc06f_w.570.jpeg deleted file mode 100644 index b6d6f7994d..0000000000 Binary files a/data/doc/opencpn/manual/vector-display.h.700_tok.3fc06f_w.570.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/vector-display.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.jpg.detail.html b/data/doc/opencpn/manual/vector-display.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.jpg.detail.html deleted file mode 100644 index 60efc1714d..0000000000 --- a/data/doc/opencpn/manual/vector-display.id.opencpn_3Aopencpn_user_manual_3Acharts_3Avector_display_tab.jpg.detail.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - opencpn:manual:vector-display.jpg [OpenCPN Manuals] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- -
- - - - -

- opencpn:manual:vector-display.jpg

- -
-
- -
- -
- -
-
- - - -

- opencpn:manual:vector-display.jpg

- -

- - -

- - vector-display.jpg -
- - - - - - -
-
-
- -
- - -
- -
-
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3
- -
- - GNU Free Documentation License 1.3 - - Built with Bootstrap 3 - - - - Powered by PHP - - - - Valid HTML5 - - - - Valid CSS - - - - Driven by DokuWiki - - -
- - - -
- - - -
- -
- - - diff --git a/data/doc/opencpn/manual/vector-display.jpeg b/data/doc/opencpn/manual/vector-display.jpeg deleted file mode 100644 index df239c172d..0000000000 Binary files a/data/doc/opencpn/manual/vector-display.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/vector-display.tok.c8094c_w.500.jpeg b/data/doc/opencpn/manual/vector-display.tok.c8094c_w.500.jpeg deleted file mode 100644 index 51cc0e2e24..0000000000 Binary files a/data/doc/opencpn/manual/vector-display.tok.c8094c_w.500.jpeg and /dev/null differ diff --git a/data/doc/opencpn/manual/vector-light.h.338_tok.9ce018_w.234.jpg b/data/doc/opencpn/manual/vector-light.h.338_tok.9ce018_w.234.jpg deleted file mode 100644 index b13e9c1fb4..0000000000 Binary files a/data/doc/opencpn/manual/vector-light.h.338_tok.9ce018_w.234.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/warning.tok.c3af54_w.50.jpg b/data/doc/opencpn/manual/warning.tok.c3af54_w.50.jpg deleted file mode 100644 index ff5b480caf..0000000000 Binary files a/data/doc/opencpn/manual/warning.tok.c3af54_w.50.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/waypoint-active.h.37_tok.d0a6c9_w.40.jpg b/data/doc/opencpn/manual/waypoint-active.h.37_tok.d0a6c9_w.40.jpg deleted file mode 100644 index ef91ede86d..0000000000 Binary files a/data/doc/opencpn/manual/waypoint-active.h.37_tok.d0a6c9_w.40.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/waypoint-delete.h.233_tok.1c7a7a_w.300.jpg b/data/doc/opencpn/manual/waypoint-delete.h.233_tok.1c7a7a_w.300.jpg deleted file mode 100644 index 626e562e91..0000000000 Binary files a/data/doc/opencpn/manual/waypoint-delete.h.233_tok.1c7a7a_w.300.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/waypoint-rings-bottom.h.197_tok.b44280_w.348.jpg b/data/doc/opencpn/manual/waypoint-rings-bottom.h.197_tok.b44280_w.348.jpg deleted file mode 100644 index bb27d61f0f..0000000000 Binary files a/data/doc/opencpn/manual/waypoint-rings-bottom.h.197_tok.b44280_w.348.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/waypoint-rings.h.394_tok.c66a28_w.471.jpg b/data/doc/opencpn/manual/waypoint-rings.h.394_tok.c66a28_w.471.jpg deleted file mode 100644 index aca1a458e1..0000000000 Binary files a/data/doc/opencpn/manual/waypoint-rings.h.394_tok.c66a28_w.471.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/waypoint-rings_0.jpg b/data/doc/opencpn/manual/waypoint-rings_0.jpg deleted file mode 100644 index 2c9134ffab..0000000000 Binary files a/data/doc/opencpn/manual/waypoint-rings_0.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/werror1.h.293_tok.8a028d_w.496.jpg b/data/doc/opencpn/manual/werror1.h.293_tok.8a028d_w.496.jpg deleted file mode 100644 index 1ce7fdda87..0000000000 Binary files a/data/doc/opencpn/manual/werror1.h.293_tok.8a028d_w.496.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/werror2.h.382_tok.e5dd0b_w.491.jpg b/data/doc/opencpn/manual/werror2.h.382_tok.e5dd0b_w.491.jpg deleted file mode 100644 index 45608fc48f..0000000000 Binary files a/data/doc/opencpn/manual/werror2.h.382_tok.e5dd0b_w.491.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/werror3.h.404_tok.984e50_w.442.jpg b/data/doc/opencpn/manual/werror3.h.404_tok.984e50_w.442.jpg deleted file mode 100644 index 9c6e55fbcf..0000000000 Binary files a/data/doc/opencpn/manual/werror3.h.404_tok.984e50_w.442.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/wh.h.181_tok.698a4c_w.800.jpg b/data/doc/opencpn/manual/wh.h.181_tok.698a4c_w.800.jpg deleted file mode 100644 index 967cd34b7f..0000000000 Binary files a/data/doc/opencpn/manual/wh.h.181_tok.698a4c_w.800.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/wh1.h.134_tok.cf37cf_w.162.jpg b/data/doc/opencpn/manual/wh1.h.134_tok.cf37cf_w.162.jpg deleted file mode 100644 index 0a860f161c..0000000000 Binary files a/data/doc/opencpn/manual/wh1.h.134_tok.cf37cf_w.162.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/wh2.h.421_tok.73563c_w.345.jpg b/data/doc/opencpn/manual/wh2.h.421_tok.73563c_w.345.jpg deleted file mode 100644 index b18147782c..0000000000 Binary files a/data/doc/opencpn/manual/wh2.h.421_tok.73563c_w.345.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/wpt21.h.383_tok.9d0a86_w.600.jpg b/data/doc/opencpn/manual/wpt21.h.383_tok.9d0a86_w.600.jpg deleted file mode 100644 index c17b57feba..0000000000 Binary files a/data/doc/opencpn/manual/wpt21.h.383_tok.9d0a86_w.600.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/wpt_focus2.h.193_tok.a189cb_w.306.jpg b/data/doc/opencpn/manual/wpt_focus2.h.193_tok.a189cb_w.306.jpg deleted file mode 100644 index 31fb07badf..0000000000 Binary files a/data/doc/opencpn/manual/wpt_focus2.h.193_tok.a189cb_w.306.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/yellow-ownship.h.48_tok.7cf362_w.25.jpg b/data/doc/opencpn/manual/yellow-ownship.h.48_tok.7cf362_w.25.jpg deleted file mode 100644 index 57d940eef5..0000000000 Binary files a/data/doc/opencpn/manual/yellow-ownship.h.48_tok.7cf362_w.25.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/zeroxte.tok.95a100_w.500.jpg b/data/doc/opencpn/manual/zeroxte.tok.95a100_w.500.jpg deleted file mode 100644 index cf273500e8..0000000000 Binary files a/data/doc/opencpn/manual/zeroxte.tok.95a100_w.500.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/zoomin.h.32_tok.161869_w.32.jpg b/data/doc/opencpn/manual/zoomin.h.32_tok.161869_w.32.jpg deleted file mode 100644 index 41aabe73f5..0000000000 Binary files a/data/doc/opencpn/manual/zoomin.h.32_tok.161869_w.32.jpg and /dev/null differ diff --git a/data/doc/opencpn/manual/zoomout.h.32_tok.0104c9_w.32.jpg b/data/doc/opencpn/manual/zoomout.h.32_tok.0104c9_w.32.jpg deleted file mode 100644 index ab0d90509d..0000000000 Binary files a/data/doc/opencpn/manual/zoomout.h.32_tok.0104c9_w.32.jpg and /dev/null differ diff --git a/data/doc/options_setting.html b/data/doc/options_setting.html deleted file mode 100644 index 576e7a62b1..0000000000 --- a/data/doc/options_setting.html +++ /dev/null @@ -1,158 +0,0 @@ - - - - - opencpn:opencpn_user_manual:options_setting - - - - - - - - - - - - - - - - - - - - - -
- - - -

OPTIONS Setting

-
- -

-Click the icon to open the Options Dialog which has 6 tabs, as seen below. All Settings that are not context sensitive are set in Options. The Settings are persistent, meaning that settings entered in one session will still be there on restart. -

- -

- -

- -
- - -
- -

-The Display
- - General
- - Units
- - Advanced

- -
- -The Chart
- - Chart Files
- - Vector Charts Display
- - Chart Groups
- - Tides and Currents

- -
- -The Connections
- - Linux Serial Connections
- - Connections Window
- - Example Data Connections Window
- - Filter NMEA Course and Speed Data
- - Show NMEA Debug Window
- - Data Connections - Add and Remove
- - Add a Serial Connection
- - Add a Network Connection
- - Network GPSD connection
- - Connections Filter
- - Input Filtering
- - Output Filtering
- - Connection Notes
- - Sending an Active Route to an Autopilot
- - Sending Routes and Waypoints to a GPS
- - Broadcast and Multicast

- -

- -

-
- -The Ships
- - Own Ship
- - AIS Targets
- - MMSI Properties

- -
- -The User Interface
- - Graphical User Interface
- - Touch Screen Tablets
- - InlandECDIS

- -
- -The Plugins
- - Plugins
- -
- -Click the icon to open the Options Dialog which has 6 tabs, as seen above. All Settings that are not context sensitive are set in Options. The Settings are persistent, meaning that settings entered in one session will still be there on restart. -

- -
- - -
- - diff --git a/data/doc/options_setting/chart.html b/data/doc/options_setting/chart.html deleted file mode 100644 index 2c7c59e7db..0000000000 --- a/data/doc/options_setting/chart.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - opencpn:opencpn_user_manual:options_setting:chart - - - - - - - - - - - - - - - - - - - - - -
- - - -

The Chart

-
- -
- -

Chart Files

-
- -

-options-charts-chartfiles-tab.jpg -

- -
- -

Add Directory

-
- -

-In OpenCPN charts are added by adding the directory (folder) that contains the chart files. This tab is where charts are added and removed. Read about the details in Installing Charts -

- -
- -

Remove Selected

-
- -

-Mark the chart directories that are no longer needed, press the button an then “Apply” or “OK”. -

- -
- -

Scan Charts and Update Database

-
- -

-Use this option if you have made any changes to the contents of your chart directories, as for example after downloading new charts from NOAA, etc. It need not be checked if directories are added or subtracted, as the entire database will be scanned and updated automatically in this case. -

- -
- -

Force Full Database Rebuild

-
- -

-Is mainly aimed at users converting or correcting existing charts, in a situation where changes are made to the geo-referencing, outline of the chart, or other attributes in the kap file header section. -

- -
- -

Prepare all ENC charts

-
- -

-Converts all existing S57/S63 charts to an internal SENC format for fast loading. The button is there on popular request, and means that O don't stop to process a chart when encountered the first time, but instead process all charts at once. The process can take quite some time, depending on your system. If you already done the new conversion once and add a chart, pressing the button will be fast as only the new chart is processed. NOTE: There is also a new naming system for the processed files. It's a good idea to delete the SENC folder the first time you use the new beta, and then press “Prepare all ENC charts”. The only reason for this is to save some space on your hard desk. -

- -
- -

Vector Charts Display

-
- -

- -

- -

-Read more about Vector Charts . -

- -
- -

Chart Groups

-
- -

- -

- -

-Read more about Chart Groups . -

- -
- -

Tides & Currents

-
- -

- -

- -

-Read more about Tides and Currents . -

- -
- - -
- - diff --git a/data/doc/options_setting/connections.html b/data/doc/options_setting/connections.html deleted file mode 100644 index 58df726ab1..0000000000 --- a/data/doc/options_setting/connections.html +++ /dev/null @@ -1,821 +0,0 @@ - - - - - opencpn:opencpn_user_manual:options_setting:connections - - - - - - - - - - - - - - - - - - - - - -
- - - -

The Connections

-
- -

- -

- -

- -

- -

- -

- -
- -

Features and Improvements

-
- -

-NMEA Sentences moved to “Advanced Features” -

- -

-OpenCPN version 3.2 featured a complete redesign of the NMEA message handling structure, including a new GUI and monitor window. This feature has been further improved and tuned in version 4.2. The current scheme provides extensive NMEA management capabilities, including: -

-
    -
  • Input message filtering, by TALKER ID and/or message type.
    -
  • -
  • Implement configurable NMEA Talker ID.
    -
  • -
  • Virtually unlimited input port multiplexing, with shared I/O and individual data rate settings.
    -
  • -
  • Selective message echo capability, similar to third-party mux applications.
    -
  • -
  • Programmable output port messages, for e.g. autopilot interfaces.
    -
  • -
  • Full Network input and output, including TCP, UDP, and GPSD services.
    -
  • -
  • GPSD client support for Windows platforms.
    -
  • -
- -
- -

Contents

- - -

Linux Serial Connections

-
- -

-Make sure that you belong to the “dialout” group. To find out, run the “$groups” command. If you're not in “dialout”, add yourself with the command “$sudo usermod -a -G dialout $USER”. Logout of your current session for group changes to take effect. Check this straight away, it will save you from frustration later on. If there is a problem connecting the GPS to a physical port, such as /dev/ttyS0, the reason is probably that you don't belong to “dialout”. OpenCPN will display a warning, once per session, if you try to configure a serial connection, or starts the program with an active serial connection, and don't belong to the right group. -

- -

-group.jpeg -

- -

-Red Hat based Linux versions are using the “uucp” group. Check what applies to your version of Linux, by using the return from the command stat -c %G `ls /dev/*|grep -m1 tty[A-Z,a-z][0] If the return is “root”, upgrade to a contemporary Linux version. -

- -
- -

Connections Window

-
- -

-All this is different from the logic in earlier versions of OpenCPN. From version 3.2, there is no defined “autopilot” port. The autopilot is simply connected to any available output- enabled data-stream, and gets everything on the bus, subject to user specified output filtering. There is no specific “shared” AIS and GPS port, as all ports are shared. -

- -

-
- - -

- -

-The key point to keep in mind with this new setup is the complete orthogonality between message sources, message destinations, and transport media. All messages come and go from an internal “bus”, and all internal modules have access to all messages. Any message can be received, and possibly re-transmitted according to the configuration established. If the messages get onto the bus, -

- -

-OpenCPN will do the right thing. For example, if it is an AIS message, the AIS module will get the message and act accordingly. Plugins also get all messages. -

- -
- -

Example Data Connections Window

-
- -

- -

- -

-To get a taste of what can be done, we start with a lab scenario. In the screen-shot above, four Data Ports are enabled. -

-
    -
  • GPSD on localhost port 2947
    -
  • -
  • /dev/ttyUSB1 as ais port
    -
  • -
  • output port to a computer on the local network
    -
  • -
  • San Fransisco AIS feed.
    -
  • -
- -

-Note that the connections are automatically sorted in order of the priority setting The picture is from a Linux computer, but the receiving box is an Win XP. Both boxes are configured to use the same broadcasting address '192.168.0.255' on the local network, using the default 10110 port. Note that UDP, and not TCP, is used. OpenCPN on the XP box receives and shows all info from the three first ports and even data from the VDR plugin, if it's running. All input sources are merged together and available to transmit to an external computer. Every computer on-board can be used as a repeater to the main box! -

- -

-Note that in this scenario the UDP connection is output only. In previous releases of OpenCPN all UDP data connections would read data as well as write. This is a possible configuration in the current release but neither required nor generally desirable. If a broadcast connection is read/write, all data written will be read back leading to the potential for data loops. -

-
    -
  • To avoid this, the priority of any read/write broadcast connection should be set lower than that of any other interface on which OpenCPN receives data for re-distribution over that interface.
    -
  • -
  • For most purposes setting a broadcast connection to either read or write is the preferable solution.
    -
  • -
  • The San Francisco AIS feed has now changed to ip address 76.103.90.196, also on port 9009.
    -
  • -
- -

-There is no advantage to using a broadcast address on the local network with just a few computers. It's as easy to just specify the addresses of the receiving computers as outgoing connections on the transmitting computer. The “receivers” specify the “transmitter” as address for a connection. -

- -

-In real life, a common setup will include input from GPS, AIS and output to an Autopilot. If your GPS produces GPRMC, then this will be automatically shipped to the autopilot. -

-
    -
  • Everything on the internal multiplex bus will be sent to the output port that the autopilot is connected to, even if a route is inactive.
    -
  • -
  • If, a route is active, OpenCPN will create and send NMEA (EC)RMC sentences to output data ports.
    -
  • -
  • The only reason OpenCPN “synthesize” an ECRMC sentence is to cover those odd cases when there is no other source of RMC in the system, and the Autopilot wants variation, SOG, etc. This might be the case if an older GPS produces GPGLL alone, for instance, which has no var. There is no “new” information in the transmitted, synthesized ECRMC.
    -
  • -
  • The autopilot might be complaining that it is getting RMC information from two different talkers (GP and EC) at the same time, and cannot decide what to do. The easiest solution if don't like the ECRMC, is to filter it out of the output stream of the port connected to the autopilot. Or choose a filter to allow only GPRMC and ECRMB for this port.
    -
  • -
- -
- -

Filter NMEA Course and Speed Data

-
- -

-Providing a rolling average of COG/SOG, with configurable sampling period. This feature is useful, for example, if you find that course and speed from the gps is varying erratically due to the sea state. The Dashboard plugin is not affected by this setting - COG and SOG are updated about once per second. -

- -

- -

- -
- -

Show NMEA Debug Window

-
- -

-If you check this box you will get a window that shows the NMEA data sentences coming into or going out from OpenCPN. In the picture above we can see the color-coding at work. Messages in red could occur as well, and indicates a transmit error. Connections Priority change messages, will also be printed to the NMEA Debug Window. The reason that AIVDM messages are both dropped and appear as “Output message”, is that there is more than one source for this message, and the filter just applies to one source. -

- -

-Have a look at the page NMEA Sentences to see which messages are understood. OpenCPN generally does not care about the Talker ID, the first two letters in the message type. $GPGGA above, is the talker GP = the gps, sending a GGA = position message, for example. At the end of each sentence there is a “*” followed by a calculated checksum. -

- -

-To see all messages it's important to close the Options dialog completely, while leaving the NMEA Debug window open. The ECAPB sentences etc, will not appear while the Connections dialog box is open as autopilot output is disabled during this time. -

- -

-Known issues: The pause button only works if the main Options dialog is closed. In Linux, the debug window can only be closed by unticking the Show NMEA Debug Window box, unless the the main Options dialog is closed. -

- -

-If there are NMEA sentences in the debug window, then OpenCPN has opened the port set in the Data Connections. Note that the source of each NMEA sentence is printed after the time stamp o each line. If your GPS port is configured, and there is no “red” boat, then the only reasons are: no gps fix or wrong sentence configuration from the GPS. -

- -

-Messages originating from GPSD or the VDR (Voyage Data Recorder plugin) will also show up in the debug window. -

- -

-For simple NMEA data stream debugging, add the following to your opencpn.ini file:Under [Settings] add a line DebugNMEA=1500 This will provide up to 1500 debug messages pertaining to NMEA traffic to the opencpn.log. -

- -

-Format uploads for FurunoGP3Xinputfiltering: If the special Furuno gps protocol is needed, tick this box. The reason is that Furuno uses their own version of NMEA for uploading routes. Furuno GPS users take note. It is now allowed to use a numeric, two digit OpenCPN route name (e.g. 10, 21, etc). -

- -

-Use GarminGRMN (Host) mode for uploads. Make sure that this box is ticked, if you have a Garmin GPS. The reason for this is that Garmin units cannot accept route uploads via standard NMEA0183. This is a “design feature” of all Garmin receivers. -

- -

-Use magnetic bearings in output sentence ECAPB. Some autopilots, among them Simrad, require navigational bearings, contained in the APB sentence, to be transmitted as Magnetic bearings rather than as True bearings, OpenCPNs default. -

- -
- -

Data Connections - Add and Remove

-
- -

-Two Buttons “Add Connections” and “Remove Connections”, to the right of the Connections window are the key to this whole tab. -

- -

-The enable choice at the start of each connection line, is handy to organize connections, but still only use those that are needed for the moment. Tick or un-tick, and then press “Apply”, to activate the setting. -

- -

-A connection can be used for input and output at the same time, with the reservation that they have to use the same Baud rate. For more details, read on. -

- -

-When pressing “Add Connections” two basic choices are given, a serial or a network connection. -

- -
- -

Add a Serial Connection

-
- -

- -

- -

-DataPort: Pick a port by pressing the \/ o the right side of the field. If the port you are looking for does not appear in the selection, write the correct port yourself in this field. -

- -

-Baud Rate: This is normally 4800 for GPS and 38400 for AIS, but check the documentation for the connected device. It's important to get this right and not just guess. -

- -

-Protocol: For future use, as only NMEA 0183 works, for now. -

- -

-Priority: Higher number equals Higher priority. The priority is set for each NMEA sentence individually. As long as a higher priority stream is available it's used. If this fails the next stream in line, with lower priority, kicks in and is used, until a higher priority stream appears. The present filter does not handle the case where, for example position messages, are received from different sentences.As an example, GPGLL and GPRMC both transmits the position information. The last received of either message will be used. -

- -

-Control Checksum. At the end of each NMEA sentence is a checksum, that makes sure that sentences are correctly received. This box is ticked by default, as OpenCPN calculates the checksum and compares it to the received checksum. Only sentences with a valid checksum are passed through. Un-ticking may help, if an application calculates checksums incorrectly or if the checksums are missing. -

- -

-Use Garmin(GRMN) mode for input: Make sure that this box is ticked, if you have a Garmin GPS set to this mode. The reason is that Garmin uses their own serial protocol. -

- -

-Receive input on this Port Greyed out here as it only applies to a network connection. see more below. -

- -

-Output on this port (as Autopilot or NMEA repeater ): Tick this box if the connection will be used for output. A common case is sending NMEA to an Autopilot. * Talker ID solves the problem where some “temperamental” devices, which should accept given sentences irrespective of the talker ID, in fact only accept for example GPRMC and not ECRMC -

- -

-APB bearing precision is greyed out unless “Output on this port” is checked. APB is the NMEA sentence “Autopilot Sentence 'B'”. The precision can be set to between 0 and 4 decimals, were 3 is the default. Some autopilots requires a different precision than the default, to work. Check your AP documentation. -

-
    -
  • Note: The APB bearing precision (or NMEAAPBPrecision in Opencpn.ini file) setting is set in the Options > Connections settings page for connections that have outgoing messages. The precision is applied in the src/nmea0183/ apb.cpp file and is applied to:
    -
      -
    • CrossTrackErrorMagnitude
      -
    • -
    • BearingOriginToDestination
      -
    • -
    • BearingPresentPositionToDestination
      -
    • -
    • HeadingToSteer
      -
    • -
    -
  • -
  • This change was made as some auto pilots are limited in the precision they can accept in the APB message. So all other messages and internally the precision is not changed. There is no change to the XTE message as that was not requested at the time. “XTE - Measured cross track error” NMEA message, that is a part of the APB message is not adjusted by the APB bearing precision setting.
    -
  • -
- -
- -

Add a Network Connection

-
- -

- -

- -
- -

Protocol : There are three choices of protocols **TCP**, **UDP** and **GPSD**.

-
- -

-TCP: is a “connection-oriented” protocol which provides a reliable link between two network endpoints. TCP ensures that any network packets lost in transit are re-transmitted. Internet AIS servers normally accept TCP connections as do many serial-to-network/wifi devices. -

- -

-To make a connection to a remote TCP server, enter its IP address or hostname in the “Address” box and the TCP port on which the server listens in the “DataPort” box. Many devices use a non-standard TCP port rather than OpenCPN's standard 10110, so do check the server's documentation. If “0.0.0.0” is entered in the Address box, OpenCPN will act as a TCP server accepting a connection from a remote TCP client. OpenCPN will listen on all its host computer's network interfaces for TCP connections to the port specified in the “DataPort” field. There should normally be no reason to select a “DataPort” value other than the standard 10110 unless multiple servers are required: -

-
    -
  • In the current implementation a single data connection can accept only one client.
    -
  • -
  • If multiple clients wish to connect to OpenCPN, a dedicated data connection must be provided for each and each data connection must have a different DataPort.
    -
  • -
- -

-UDP: is a method of transmitting data as simple “datagrams” without negotiating a connection between two endpoints. It involves no detection and retransmission of data lost in the network. Within a small home/boat network such data loss should not normally occur and in any case, NMEA data is generally updated by “talkers” on a regular basis. Unlike TCP which involves a connection between two endpoints, UDP data may be received by many “listeners”. -

- -

-An OpenCPN UDP data connection will listen for data destined for the specified DataPort on any system interface or the broadcast address of any connected network. If you don't need to receive multicast data or transmit any data, you may enter “0.0.0.0” in the “Address” box if you are unsure of what to enter there. Alternatively you may specify the address on which you intend to receive data. In both cases behavior will be the same. If you wish to receive multicast data you must enter the multicast address to which those data are being sent or the system will not see them. If you wish to transmit any data (“Output on this port” checked) you must put the address you wish to send data to in the “Address” box. In all cases (transmit, receive or both) the DataPort must be specified. For more information about broadcast and multicast, see Broadcast and Multicast below. -

- -

-GPSD: is a Unix/Linux gps server, which means that several different applications can share one gps receiver. Linux users have the choice between using serial or GPSD connections for their gps input. -

-
    -
  • Ubuntu users take note! If gpsd is installed - use it. If you prefer a serial connection, un-install gpsd. The reason is that gpsd starts automatically when,for example, an USB gps is connected. This will block the serial port that the gps communicates with( /dev/ttyUSB0 in many cases), hence no separate serial connection to the gps is possible. So it's an either or situation.
    -
  • -
  • OpenCPN also has support for Windows clients. So a windows computer should be able to connect to GPSD running somewhere on a network (testing), as an alternative to an UDP connection, described earlier. * Address: The network address to connect to. In the example above we used the broadcast address for convenience, but specifying host to send to, and host to receive from, works as well.
    -
  • -
- -

-Port: The port to connect to on the network address. The default port for UDP is 10110. Port 10110 is designated by IANA for “NMEA-0183 Navigational Data”. There should not be any reason to change this port, but it is possible. See below. The default port for GPSD is 2947. Do not change this! -

-
    -
  • For your own local connections use port-numbers greater than 1023 and avoid ports used by other applications. Ports in the range 49152 through 65535 are not assigned to other applications and should be OK. Make sure that no firewall is blocking the port you pick.
    -
  • -
- -
- -

Network GPSD connection

-
- -

- -

- -

-When connecting to GPSD, running on your local computer, use the settings shown above. -

- -
- -

Connections Filter

-
- -

-For each source line in the data connection windows, it's possible to specify exactly which NMEA sentences to receive, and which ones to drop. Similarly it's possible to control exactly which sentences to send out to, for example, an autopilot. -

- -

-The applied filters for each connection are stated in in the “Filters” column in the Data Connection window. The default for a connection is no filters at all. * The set filters applies to both the core program and the plugins. -

- -

-Filtering can be observed in real time, through color coding in the Debug Window. -

- -

- -

- -

-Accept only sentences: Either base your filtering on stating which sentences to accept or which to ignore. -

- -

-Ignore sentences: Same as above. To select filters press the button. The dialog below becomes available. -

- -

- -

- -

-A lot of NMEA sentences are listed. Just tick the box to select a sentence. “Select All” or “Clear All” are also available. For sentences not listed press “Add”, and enter a new NMEA sentence. -

- -

- -

- -

-Your entry must conform to these rules. -

- -

- -

- -

-When you are finished, press “OK”, your new entry will appear at the bottom of the list of NMEA sentences to filter. It will already be ticked, so just press “OK” until you are back in the original Connections tab. Now press “Apply”. The implemented filtering should now be visible on the connection line. For more, see below -

- -

-Receive input on this port: This box should be ticked if you want to receive receive data on this connection. If the connection will only be used to output to other devices it should not be ticked. If you wish to broadcast UDP data for consumption by other devices or programs, leaving this box unticked will save you having to worry setting the priority of the connection to avoid data loops. -

- -

-Output on this port (as Autopilot or NMEA repeater ): Tick this box if the connection will be used for output. A common case is sending NMEA to an Autopilot. * APB bearing precision is greyed out unless “Output on this port” is checked. APB is the NMEA sentence “Autopilot Sentence 'B'”. The precision can be set to between 0 and 4 decimals, were 3 is the default. Some autopilots requires a different precision than the default, to work. Check your AP documentation and see Note below. -

- -

-OpenCPN creates and sends the NMEA ECRMB and ECRMC sentences to the A/P output port when a route is activated. If variation is not otherwise present, OpenCPN includes variation, coming from the WMM plugin, if installed and enabled. -

- -

-Note: The “APB bearing precision” (or NMEAAPBPrecision in Opencpn.ini file) setting is set in the Connections settings page for connections that have outgoing messages. The precision is applied in the src/nmea0183/ apb.cpp file and is applied to: -

-
    -
  • CrossTrackErrorMagnitude
    -
  • -
  • BearingOriginToDestination
    -
  • -
  • BearingPresentPositionToDestination
    -
  • -
  • HeadingToSteer
    -
  • -
  • This change was made as some auto pilots are limited in the precision they can accept in the APB message. So all other messages and internally the precision is not changed. There is no change to the XTE message as that was not requested at the time. “XTE - Measured cross track error” NMEA message, that is a part of the APB message is not adjusted by the APB bearing precision setting.
    -
  • -
- -

-{{opencpn:manual:action-filter.jpg?nolink&28x30}} -

- -
- -

Input Filtering

-
- -

-Some examples to illustrate how things works. -

- -

- -

- -

-Accepting the filter above leads to this in the filter column on the connection line: -

- -

- -

- -

-
-If “Ignore sentences” is marked instead, the line looks like this:
- -

- -
- -

Output Filtering

-
- -

-Similar to input filtering above.
- - -

- -

-Transmitting three sentences.
- - -

- -

-Another Example of Output Filtering
- -
- -Feature: Can now select the NMEA talker ID of sentences output by OpenCPN on a given port. -

- -

-Situation: OpenCPN (correctly) outputs its NMEA sentences with the “EC” talker ID as is normal and expected behavior (see below). -

- -

-Problem : Some “temperamental” devices which should accept given sentences irrespective of the talker ID in fact only accept for example GPRMC and not ECRMC. -

- -

-Example: An Icom VHF is a such example. and because the multiplexer has been set to give precedence to nav info provided by OpenCPN, rather than the GPS, the result is that when OpenCPN is driving the autopilot, the VHF does not receive any position anymore for its DSC feature. Safety-wise, this is not desirable. -

- -

-Solution: Being able to either change the ECRMC sentences into GPRMC, or duplicate ECRMC on the output port should solve the issue. -

- -
- -

Send to GPS

-
- -

-
- -Dropping them instead. -

- -

- -

- -
- -

Connection Notes

-
- -

-If you already have an application connected to your gps, on a serial port, OpenCPN will not be able to connect to the same port. Two applications cannot use a port simultaneously . __On Linux use Gpsd in such a situation. Of course this only works if your “other application” supports the Gpsd. As an alternative on Linux you can use Kplex (also for Mac) or Muplex which can create pseudo terminals (“virtual serial ports”) to share NMEA data between applications. -

- -

-If a NMEA sentence is filtered on an input connection and “LegacyInputCOMPortFilterBehaviour=1” setting in opencpn.conf|ini, it will still enter the internal multiplexer. So, it will be available to output connections, unless it's filtered there as well. If “LegacyInputCOMPortFilterBehaviour=0” then the message will not be placed on the internal multiplexer. This will only work for serial connections. Echoing back a network connection, on the input port for output, will not work -

-
    -
  • NMEA data can also come from the VDR plugin. They will be labeled as such in the Debug Window and have “0” priority.
    -
  • -
- -

-No Flow Control on Serial Ports By nature NMEA doesn't do flow control. If a message gets lost, it gets lost… It will be repeated at some point, and buffering a delayed message that has lost it's meaning, when there is more current & accurate data available is not useful. f interfacing the NMEA-specified way, there is no path for hardware flow control. It's not compatible with NMEA in any way. -

- -
- -

Sending an Active Route to an Autopilot

-
- -

-Autopilot APB and XTE precision settings are harmonized to always be the same. -

- -

-On Route activation, OpenCPN sends the ECRMB, ECRMC and ECAPB NMEA sentences to an Auto Pilot, if it is connected to a port, with output activated. -

-
    -
  • Implement configurable NMEA Talker ID
    -
  • -
  • To test that the ECRMB, ECRMC & ECAPB sentences are being sent, simply set up a port with output activated and
    -
  • -
- -

-Right-click on the chart and select “Navigate to here”, then bring up the Options > Connections > Nmea Debug window and look at the Blue output sentences for ECRMB, ECRMC and ECAPB. Below is one example of output connection settings. -

- -

-output-test-sm.jpg -

- -

-In the example above we have used NavMonPC to read a previously recorded nmea file, and then set up a Virtual Com Port (Com14) which OpenCPN Options > Connections to a Serial Com14 port is then established to read the nmea data stream from NavMonPC. -

- -

-When you send to the autopilot you should see blue output sentences in the Nmea Debug window, once the Options Menu is closed (very important, because all data is frozen until this menu is closed.) * Another way to test for the EC sentences see “Send to GPS” below. -

- -
- -

Broadcast and Multicast

-
- -

-UDP data may be delivered to more than one system when sent to certain special addresses -

- -

-A “broadcast address” is listened to by all devices on a network. It is normally formed by taking the network address (the first part of the IP address common to all systems on your local network) and setting the last part (the number which is different for every computer) to a value represented by all “1”s in binary. If all your devices' addresses start with “192.168.1”, your network's broadcast address will likely be 192.168.1.255 (255 is “11111111” in binary. This is why IPv4 addresses written like this never contain numbers higher than 255. Except for in the movie “The Net” and we don't talk about that). If you specify an address ending with “255”, OpenCPN assumes you mean a broadcast address. This is not always true but will result in desired behaviour in almost all cases. -

- -

-The special broadcast address “255.255.255.255” is also listened to by all devices. It should not normally be used to transmit data from OpenCPN. Use your local network's broadcast address instead. -

- -

-A “multicast address” is listened to only by devices which wish to receive information on that address. IPv4 addresses in the range 224.0.0.0 - 239.255.255.255 are multicast addresses. If you specify a multicast address for a UDP data connection, OpenCPN will tell your computer to listen for datagrams on that address. * More than one system may send data to broadcast or multicast addresses, so this is a “many to many” communications medium. * You cannot use broadcast or multicast addresses with TCP. TCP is a “one to one” connection. -

- -

-Devices must to some extent process all broadcast packets on the network whether they are interested in them or not. Multicast packets are normally only seen by devices which have registered an interest in a particular multicast address. Consequently multicast is more efficient than broadcast although this is usually of little consequence in a small network. Despite being used by NMEA-over-IP protocols such as IEC 61162-4 and the forthcoming NMEA OneNet, NMEA-0183 over IP multicast is far less widely supported in marine applications than NMEA-0183 over IP broadcast. -

- -

-There is no multicast address mandated for NMEA-0183 data in this context although you should avoid those addresses used by other protocols. -

- -

-When using multicast with OpenCPN it is suggested that an address be used in the range 239.192.0.0/14 specified by RFC 2365 as the “Organization Local Scope”. If in doubt, try 239.194.4.4. -

- -

-There is no mechanism in OpenCPN to specify the network interface through which multicast packets are sent or received. This will be determined by your system. In some cases it may be necessary to manually adjust your system's routing table to ensure that the desired network interface is used. Refer to your system's documentation if this proves necessary. -

- -

-If you transmit UDP broadcast or multicast, then you should set the priority of the “real” NMEA input to something higher than the UDP stream. If not, prepare for problems. The reason is that if you are broadcasting, then you yourself will get the UDP message as well, which again will be retransmitted…… Obviously, it duplicates the “real” incoming data. Thus we get source priority flip-flop on each message, since they have the same priority. For example set the UDP priority to “0” and real incoming connection to “1” or higher. Multicast loopback is not disabled for consistency with broadcast behaviour. This means that priorities must be set as detailed above when transmitting over multicast, but multicast communication between multiple instances of OpenCPN on the same system remains possible. * The firewalls on some systems (e.g. OpenSuSE linux) may block broadcast and multicast data that you wish to receive. Refer to your system's documentation to determine how to allow such data to reach OpenCPN. -

- -

-Also read about the “Activating Routes and Active Route Console” in Marks and Routes towards the bottom. It is essential to have turned on an Active Route in order to send waypoints to the Autopilot. -

- -

-Also read about “Route to Autopilot” in Advanced Features for more details. -

- -
- -

Sending Routes and Waypoints to a GPS

-
- -

-The feature “Send to GPS”, which appears in the right click menus for waypoints and routes and in the Route Manager, is not linked to connections. The upload port does not even need to appear in the Datastream connections list. Its a completely separate concept. For this reason users must define a separate upload port, that is remembered by OpenCPN. The port can be changed by clicking the button in the Route Manager. -

- -

-NMEA provides no handshake protocol for Route and Waypoint upload. So, OpenCPN simply sends the Route/WP information out on the port, without having any way to know if there is actually a device connected to the port. -

- -

-The Garmin protocol does provide handshaking, so OpenCPN can be sure that the information is uploaded correctly. The Garmin protocol will fail if the device is not a Garmin. -

- -

-In the case of standard NMEA, the indication “Route successfully uploaded” is not very meaningful. You can say that it just means that a port was found, and writing to that port succeeded. -

- -

-In the case of “hockey puck” GPS receivers, they probably ignore Route and WP uploads, since there is nothing for them to do with this information anyway. -

- -

-The key to remember is that Route and Waypoint upload process is completely independent of normal running Datastream operation. They are two separate sub-systems. -

- -

-It does no harm to assign the Datastream GPS port as an output and input device together. Some users might reasonably expect that this would be required for Route and W/P uploads. Most GPS receivers would ignore input sentences other than Route and W/P uploads anyway. -

- -

-Then in the Chart window we hover over the temporary goto waypoint and right click, then select “Send to GPS (Serial Com 14)” and by quickly looking at the NMEA Debug window (Options > Connections > Check Nmea Debug Window, then be sure to CLOSE the Connections Menu leaving the Nmea Debug Window up, or nothing will happen!). Then you will see the sentences sent. See screenshot below. -

- -

-autopilot-output-sentences.jpg -

-
    -
  • Note the active route above was a 4 point route, but the active leg and active wp was the 3rd point for the above screen.
    -
  • -
- -

-activeroute-sent2gps-2.jpg -

-
    -
  • Note the screenshot above is for the same Active Route, but the active waypoint is the 2nd point.
    -
  • -
  • Note: There are many technigues for testing and simulation. Using NavMonPC to read a previously recorded file is one very good way. The other is to use OpenCPN's VDR_pi to read the nmea file, which is in some respects simpler for a new user.
    -
  • -
- -
- -

NOTES

-
- -
- -

Win 8.1 com ports stop working

- - -

UDP Protocol vs TCP Protocol

-
- -

-UDP is a method of transmitting data as simple “datagrams” without negotiating a connection between two endpoints. It involves no detection and retransmission of data lost in the network. Within a small home/boat network such data loss should not normally occur and in any case, NMEA data is generally updated by “talkers” on a regular basis. Unlike TCP which involves a connection between two endpoints, UDP data may be received by many “listeners”. -

- -

-UDP “For UDP mode the IP address 127.0.0.1 is also known as localhost and used when sending to a client on the same machine. The IP address of any other machine on the network may be given.” -

- -

-To reach all machines within a local network, like a wifi router, use the address 192.168.x.255 with the Protocol set at UDP. -

-
  Example for a local net where the router address is 192.168.1.0:
-  python VDRplayer.py Hakefjord.txt 192.168.1.255 10110 0.05 UDP
-  Any receiving machine can then use IP address 0.0.0.0 and port 10110 in the connection properties
- -

-TCP For TCP mode the IP address is the address of the machine running VDRplayer. It may be localhost or 127.0.0.1 if the client is running on the same machine. -

- -

-If VDRplayer is running on its own machine then give the IP address: of that machine that other clients can reach (e.g. 192.168.1.6 assuming that is the address of the machine running VDRplayer.py). -

- -

-The Port Number: 10110 is somewhat arbitrary but it is the “undocumented standard” for NMEA over IP and must match the client receiver port number. Any port number permitted by the local firewall will work. It is best not to use well known port numbers such as 80, 22, etc. -

- -

-The time delay of 0.05 (50mS) is the delay between each line in the file. -

- -

-UDP received When adding a network connection for UDP receive there is no need to specify the IP address. The port is required but not the IP address. The sending end needs to specify both IP address and port number. -

- -
- - -
- - diff --git a/data/doc/options_setting/display.html b/data/doc/options_setting/display.html deleted file mode 100644 index 90c4196400..0000000000 --- a/data/doc/options_setting/display.html +++ /dev/null @@ -1,539 +0,0 @@ - - - - - opencpn:opencpn_user_manual:options_setting:display - - - - - - - - - - - - - - - - - - - - - -
- - - -

The Display

-
- -
- -

General

-
- -

- -

- -
- - -
- -
- -

North Up /Course Up

-
- -

-North Up is the normal way charts are shown, with north at the top. Course Up rotates the chart so what you see in front of the boat in real life is above the Own Ship icon on the display. -

- -
- -

Lookahead Mode

-
- -

-The Own Ship icon will be offset from the center of the screen so that more of the chart is in front of Own Ship than behind. Read more in Auto Follow and Display Orientation -

- -
- -

Chart Display

-
- -
- -

Enable Chart Quilting

-
- -

-The screen shows several charts seamlessly stitched together. More in Chart Quilting . -

- -
- -

Preserve scale when switching charts

-
- -

-Normally when switching charts OpenCPN will open the new chart scaled close to it's natural scale, the zoom factor stays the same. With this box ticked OpenCPN will keep the scale from the last chart as close as possible when switching. The zoom-factor will increase as you switch to smaller scale charts. -

- -
- -

Controls

-
- -
- -

Smooth Panning/Zooming

-
- -

-This works best together with OpenGL. Test to see how it works with your graphic card. If you are using OpenGL, tick this box as well. -

- -
- -

Zoom to Cursor

-
- -

-With this box ticked the display is centered at the location of the mouse pointer when you zoom using the mouse wheel. When the box is not ticked the center of the display remains the same when you zoom with the mouse wheel just as it does when you zoom with the + and - keys or the zoom icons on the toolbar. In either case, if you click on the screen the point where you clicked will be moved to the center of the display. -

- -
- -

Zoom to Cursor Summary

-
-
    -
  1. Keyboard, Menubar, and Toolbar zooms always zoom to center screen.
    -
  2. -
  3. Wheel zoom behaviour changes depending on ZTC (Zoom to Cursor) and SmoothZoom settings.
    -
  4. -
  5. ZTC (Zoom to Cursor) applies only to wheel zooms.
    -
  6. -
- -
- -

Display Features

-
- -
- -

Show Grid

-
- -

-Activate a latitude and longitude layer on the display. This feature only works if the display is in North Up mode. The grid is handy on vector charts, that normally lack this feature. -

- -
- -

Show Chart Outlines

-
- -

-The borders of the available charts are shown. -

-
    -
  • Vector charts are green
    -
  • -
  • Raster charts are red
    -
  • -
  • CM93 available larger scale charts are purple.
    -
  • -
- -

-The CM93 chart outlines are not shown if using quilting mode. As a safety precaution, the outlines of isolated dangers with large scale charts available, are shown in CM93 even if “Show Chart Outlines” is off, provided that quilting is not used and the scale is large enough. At a scale of 1:200.000 or larger these isolated islands and dangers will be shown. Hence it is recommended not to use quilting with CM93 when on a longer offshore passage. Read more on Installing Charts -

- -

-Show Depth Units Shows the charts' depth units on the screen in embossed letters in the upper right corner. When in quilt mode, depth units are only shown if all charts in the quilt have the same depth unit. -

- -
- -

Units

-
- -

-Choose the units that suit your way of navigating. These settings apply to everything in the core program. The exception is Radar rings, where the unit for distance between rings is selected separately. -

- -

-Plugins have their own settings for units. -

- -

- -

- -
- -

Distance

-
- -

-The options are: Nautical miles, Statute miles, Kilometers, and Meters. Short distances are less than 0.1 mile or 0.1 kilometer. If nautical miles or kilometers are selected short distances are shown in meters. If statute miles are selected short distances are shown in feet. -

- -
- -

Speed

-
- -

-The options are: Knots, Mph, km/h, and m/s. -

- -
- -

Depth

-
- -

-The options are: Feet, Meters and Fathoms. -

- -
- -

Lat/Long

-
- -

-The options are: Degrees, Decimal Minutes; Decimal Degrees; and Degrees, Minutes, Seconds -

- -
- -

Bearings

-
- -

-If “Show Magnetic bearings and headings” is ticked OpenCPN will use magnetic courses and bearings. By default OpenCPN uses true courses and bearings etc. Note that OpenCPN knows nothing about deviation. All magnetic courses and bearings will have an (M) suffix to show they are magnetic. -

- -

- -

- -

-If BOTH “Show magnetic bearings and headings” and “Show true bearings and headings” are ticked you will get both values displayed. -

- -

- -

- -

-The following settings will be affected: Bearings and Courses in the Route Properties dialog, route leg rollovers, and Active Route console will show true and (M). COG displayed on the bottom status line will be true COG and COG(M). AIS target reports will show target true COG and COG(M). -

- -

-Variation will be calculated at Own Ship's position, if possible. AIS targets however, will use the targets position for variation, if possible. -

- -

-OpenCPN is looking for the variation in the the following order. -

-
    -
  1. If a GPS receiver that reports variation as part of HDG sentence is available, and if the HDG message also contains the E/W flags then O will use that.
    -
  2. -
  3. If a GPS receiver that reports variation as part of RMC sentence, is available, this value will be used.
    -
  4. -
  5. Otherwise, if the WMM plugin is activated, it will supply the variation, unless the user has selected the variation manually in options.
    -
    -
  6. -
  7. Lacking the above alternatives, the manually entered “Assumed Magnetic variation”, will be used for all calculations.
    -
  8. -
- -
- -

Assumed Magnetic variation

-
- -

-This value will be used if variation is not available through the GPS or the WMM plugin. The default value is 0°. Positive values denote easterly variation, negative values denote westerly variation. -

- -
- -

Advanced

-
- -

- -

- -
- -

Chart Display

-
- -
- -

Show skewed raster charts as North-up

-
- -

-Skewed chart are normally shown as intended by the cartographer, “Chart up”. If this option is selected they are rotated to show North-Up. If you are looking for speed, don't tick this box. It slows down the screen rendering. Skewed charts are a common along the US Inter-coastal Waterway. More here: Auto Follow and Display Orientation -

- -
- -

Disable Full Screen Quilting:

-
- -

-By default all visible charts of an appropriate scale are used in the quilt. With this box checked only charts that overlap the center of the screen are used in the quilt. Checking this box is easier on the system and may give a performance boost in certain circumstances. -

- -
- -

Suppress blur/fog effect on overzoom

-
- -

-Charts are commonly based on surveys that are twice the scale of the charts natural scale. For example a chart in 1:50,000 would be based in a survey in 1:25,000. Once a vector chart is zoomed in to a factor 2, the data do not support any more details. OpenCPN makes the navigator aware of this fact in a few different ways. -

- -

- -

- -

-This screen-shot shows an example how overzoom warnings are shown. -

- -

-At a zoom factor of 4 the embossed OverZoom warning will be displayed in the NW part of the screen. This applies to vector charts and raster charts using the Mercator projection. -

- -

-From a factor 10 to 30 a blur or gentle bluish fog will be overlaid on vector charts. Overzoom blurring is performed only for those systems with modern and fully capable OpenGL drivers/cards. Otherwise, a very gentle “fog” is applied to extreme overzoom displays, as a visual que to the user that the chart is highly overzoomed. From a factor 10, lines and depth numbers on vector charts will be scaled and appear bigger, to further indicate the imprecision of chart features at high overzoom. This imitates what happens with a raster chart, when the individual pixels gets bigger and bigger. -

- -

-If “Suppress blur/fog effects on overzoom” is selected the blurring or bluish fog, will be turned off. -

- -
- -

Suppress scaled vector charts on over-zoom

-
- -

-If this option is selected the scaling of lines and numbers on vector charts will be turned off. -

- -

-Note that the blurring effect and scaled vector charts does not apply to single chart mode, so these effects can be turned off temporarily by toggling the “Q” hotkey. -

- -

-Below is how it looks like with both the above options activated. -

- -

- -

- -
- -

Chart Rotation Averaging Time

-
- -

-Chart Rotation Smoothing. Course-Up Mode Display Update Period (old title) Controls how often the entire displayed chart is updated when Look Ahead and/or Course-Up mode are activated. The Own Ship and AIS icons are still updated every second. The default value is 15 seconds. A “zero” value is allowed! The default mode is North-up. It's easy to switch between the two modes through the right-click menu or Display Orientation Icon next to the GPS Status Icon located upper right corner. -

- -
- -

Chart Zoom/Scale Weighting

-
- -

-This option has a short description, on screen. Here are some further notes. The slider applies to zoom operation dynamics, not to static chart selection. The option really asks you this question. “On zooming in, when do we switch to a smaller scale chart if available?” Your answer may depend on your screen resolution and other preferences. The slider affects zoom-in operations most directly. Setting the slider to -5 delays switching to smaller scale to improve performance and visibility. Setting the slider to 0 restore the default behavior. Setting the slider to +5 switches sooner to a smaller scale chart to show more detail. It ias not intended that a user exercise this control very often. Maybe experiment, set it to your liking for average charts in your area, and leave it set. -

- -
- -

Controls

-
- -
- -

Lock Waypoints (Unless waypoint property dialog visible)

-
- -

-Locks waypoints and prevents accidentally moving them unless a waypoint property dialog is visible. Selecting this option reduces the risk of accidentally altering routes and waypoints but makes editing them more cumbersome. -

- -
- -

Confirm deletion of tracks and routes

-
- -

-If selected this option provides a safeguard against deleting important data by mistake. -

- -
- -

Physical Screen Width

-
- -

-If set to “Auto”, the default setting, OpenCPN will use the size that the operating system reports. Unfortunately this is not always correct, leading to an incorrect scale on screen for the charts. The OpenCPN log will state what your operating system thinks about your screen size. -

-
- - - -
19:03:44 CET: Detected display size: 338 mm
- -

-You can manually enter the width of your screen by selecting “Manual” and entering the width in millimeters. The value shown is from a sample 17“ screen. -

- -
- -

Graphics

-
- -
- -

Use Accelerated Graphics (OpenGL)

-
- -

-The net effect of full OpenGL optimization on raster charts with compatible hardware is nothing short of amazing, especially with low-spec, low-power systems. Unfortunately the support for OpenGL on Windows is sometimes problematic. Intel's OpenGL graphics drivers on Windows are very buggy, for example. Read more on the OpenGL page!If you have started OpenCPN without OpenGL support, this option will be greyed out. -

- -
- -

Options

-
- -

-The standard Option dialog looks like this -

- -

-> -

- -

-An expert version is available by adding a line to the opencpn.ini (opencpn.conf) file. -

-
[Settings]
-....
-OpenGLExpert=1
- -

-To turn the expert version off, change the value from “1” to “0”, or delete the line. -

- -

- -

- -
- -

Use Accelerated Panning

-
- -

-Works if your graphics card supports Frame Buffer Objects. -

- -
- -

Texture Compression

-
- -

-Greatly improves the speed of raster chart display. It works by treating raster charts as compressed textures instead of bitmaps, and these textures are loaded and displayed much more efficiently by the graphics hardware. They also consume much less GPU memory space. -

- -
- -

Texture Compression with Caching

-
- -

-A further improvement to raster chart display loading and panning. This option uses the system hard drive to store pre-calculated raster chart compressed images in a way that is optimized for direct loading into the graphics card. When enabled, the texture cache is created dynamically, as charts are visited in normal navigation. Depending on the OpenGL hardware capabilities, there may be some slight, but noticeable, delay as a chart is accessed the very first time while the textures are created, compressed, and written to disk. Once a particular chart section has been cached, subsequent accesses are very fast. If the OpenGL hardware texture buffer is capable, then rendering on-screen is virtually instantaneous. -

-
    -
  • The cache understands color scheme changes. Cache entries are automatically created for each of the 4 possible BSB color schemes, as they are encountered in normal operation.
    -
  • -
  • The cache understands chart Edition Dates. So, if one manually updates a chart (thus changing the chart's Edition Date), the old cache contents will be discarded, and a new cache will be built automatically as the new chart(s) are visited.
    -
  • -
  • Using compressed texture caching retains all the benefits described earlier. It is very much faster on low spec hardware, at the expense of more disk space usage.
    -
  • -
  • There is a command line option which will build/update your compressed texture cache. You may execute opencpn like this: opencpn /rebuild_gl_raster_cache (-rebuild_gl_raster_cache on linux)
    -
  • -
  • “Texture Compression” and “Texture compression caching” may actually slow down some machines, depending on the capabilities of the video system.
    -
  • -
  • If you are using OpenGL on a low-spec machine, you will have better performance if you
    -
      -
    1. disable texture caching, or
      -
    2. -
    3. Pre-build the texture cache in a region of interest. That is, move the boat to say Dover. Then do Options→openGLOptions→Build Texture Cache. You do not need to wait the entire time, which may be hours for a large chart set. “Skip” out when the distance reported is 100 miles or so. Eventually, after steady use, your texture cache will be filled automatically in the background, and performance Show FPS will increase steadily.
      -
    4. -
    -
  • -
- -
- -

The size of the current "Texture Cache"

-
- -

-Appears just to the right of the button “Clear Texture Cache”. In the picture above this value is 101.8 MB. -

- -

- -

-
    -
  • Show FPS FPS stands for Frames Per Second, and is one way measure OpenGL performance. The number appears in the lower right hand corner of the display, to the right of “Scale”. Above you see “26 fps”. If you report a graphical problem, expect the devolopers to ask you about this figure.
    -
  • -
  • Enable Transparent Toolbar. This option is grayed out in OpenGL mode, as the feature only works in traditional mode. On Linux it is necessary to activate a window manager compositing system, such as Compiz or GNOME Shell, to have a transparent toolbar.
    -
  • -
- -
- - -
- - diff --git a/data/doc/options_setting/plugins.html b/data/doc/options_setting/plugins.html deleted file mode 100644 index 78a22560e4..0000000000 --- a/data/doc/options_setting/plugins.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - opencpn:opencpn_user_manual:options_setting:plugins - - - - - - - - - - - - - - - - - - - - - -
- - - -

The Plugins

-
- -

- -

- -

-The Plugin tab is treated on these pages: -

- -

-Plugins
-Install and Enable Plugins
-Dashboard Plugin
-Grib Weather Plugin
-WMM Plugin
-Chart Downloader Plugin -

- -

-
- -

- -
- - -
- - diff --git a/data/doc/options_setting/ships.html b/data/doc/options_setting/ships.html deleted file mode 100644 index 20a7e11d3e..0000000000 --- a/data/doc/options_setting/ships.html +++ /dev/null @@ -1,536 +0,0 @@ - - - - - opencpn:opencpn_user_manual:options_setting:ships - - - - - - - - - - - - - - - - - - - - - -
- - - -

The Ships

-
- -
- -

Own Ship

-
- -

- -

- -
- -

Display Options

-
- -
- -

COG Predictor Length (min)

-
- -

-Shows a red dashed line in front of your own boat, with present COG and ends in a small square, which represents where you will be in the set number of minutes, with the present speed. 6 minutes is a good starting value for piloting. If your vessel has a SOG of 10 knots the dashed line will be 1 nautical mile long. 60 minutes makes sense on a coastal passage and 24 x 60=1440 minutes on longer blue water passages. -

- -
- -

Heading Predictor Length

-
- -

-If a heading sensor is available and outputs an nmea data stream, this is shown as a finer line with shorter dashes ending in an open small circle. The length is set in Nautical miles. -

- -

- -

- -

-The width of the COG Predictor can be adjusted in the opencpn.ini configuration file. Find the line below and adjust the value. -

- -

-OwnshipCOGPredictorWidth=3 -

- -

-Warning: Don't edit the opencpn.ini (opencpn.conf) file when OpenCPN is running. -

- -
- -

Ship Icon Type

-
- -

-The following options are available for Ownship: -

- -

- -

- -
- -

Default

-
- -

-This will use the icon that comes with OpenCPN, unless you have installed your own icon, “ownship.jpg”. More about installing your own icons in Marks and Routes . -

- -
- -

Real Scale Bitmap

-
- -

-This option will adjust the size of the default icon, depending on your settings. When using this setting, the dialog expands and five more options related to the size of “ownship” become available. See picture below -

- -

- -

- -
- -

Length Over All (m)

-
- -

-The overall length of Own Ship in meters -

- -
- -

Width Over All (m)

-
- -

-The overall width of Own Ship in meters -

- -
- -

GPS Offset from Bow (m)

-
- -

-The distance in meters from the bow of Own Ship to its GPS antenna -

- -
- -

GPS Offset from Midship (m)

-
- -

-The distance in meters from Own Ship's center line to its GPS antenna. Use a positive value for an offset to starboard and a negative value for an offset to port. -

- -
- -

Minimum Screen Size(mm)

-
- -

-The size of the Own Ship icon on the screen. Default is set to 1mm. -

- -
- -

Real Scale Vector

-
- -

-Works the same as the previous option with the exception that ownship is a somewhat boxy, computer rendered ship. It's currently not possible to change the vector-own-ship. -

- -

- -

- -

-The dot represents the set location of the GPS. -

- -
- -

Show radar rings

-
- -

-These show up as red rings centered on your gps position and can be useful in different circumstances, such as keeping clear of dangers. The settings are, hopefully, intuitive. -

- -

- -

- -

-Once the number of radar rings are selected, and not equal to “None” the dialog expands, and shows more settings. The Distance Unit for Radar rings is set here, and does not follow the the global settings in Options→Display→Units. The choices are Nautical Miles and Kilometers -

- -

- -

- -
- -

Tracks

-
- -
- -

Automatic Daily Tracks

-
- -

-Automatic Daily Tracking ensures that the track-points collected throughout a single day (midnight to midnight in local zone time) are stored and managed as a single (possibly multi-segment) track. -

- -

-If the Automatic Daily Tracking check-box is selected, the “Toggle Tracking” tool will turn tracking on and off. However, on turning it off, the accumulated track will be extended with the previous one if it does not extend into yesterday. Disjoint segments are kept separate, time-adjacent segments are merged into a single segment. Disjointed track segments can be joined through the right-click menu when they are selected in the Route Managers Tracks Tab. -

- -

-Every Midnight the tracking is turned off and on again automatically to ensure that the track does not span dates. If Automatic Daily Tracking is selected during the day, when some tracks have already been created, only the last one will be merged with future daily tracks. -

- -

-Assuming Automatic Daily Tracking is on, normally during tracking periods there will be two tracks visible in the Route Manager: the current track (red color track-points on the chart) and the previously accumulated track for the day. After toggling tracking off there will be just one track for this day. -

- -

-If the timezone needs to be changed, it is a good idea to close OpenCPN application before. -

- -

-With the manual capability of splitting and extending, the daily tracks can be easily managed at any time. -

- -

-The daily tracks will be automatically named with the date in the local Time Zone, but can of course be changed manually. -

- -

-The Automatic Daily Tracks follow the settings in Tracking Precision, see below. -

- -

-Without Automatic Daily Tracks selected, OpenCPN handles tracks as before. -

- -
- -

Highlight Tracks

-
- -

-Shows a 7 to 10m wide highlighting on either side of the track. This is not selectable for individual tracks. The idea of the highlighting is to remind us that following a previous track exposes us to the inherent inaccuracy of GPS, and that the real track followed is most likely within the highlight region, but not necessarily in the middle. And this says nothing about the accuracy of the underlying cartography. For many charts it is prudent to assume at least 1.5 mm inaccuracy using the nominal scale of the chart. For a chart in scale 1:20,000 this translates to 30m. -

- -

- -

- -
- -

Tracking Precision

-
- -

- -

- -

-With track button in the ToolBar activated this setting affects the size of the data saved. It also affects the “smoothness” of the track, though this is only visible when zoomed in to a very large scale. OpenCPN uses smart dynamic tracking, and only uses those track points that actually contributes anything to the track. A straight line track for example is only represented by it's endpoints. This is done by analyzing the track just behind the boat. The process is visible in real time, close to Own Ship. The end result is good track accuracy while keeping the size small. -

-
    -
  • Low: Good for offshore passages.
    -
  • -
  • Medium: Very good for all normal uses.
    -
  • -
  • High: Only necessary when very tight maneuvering needs documenting.
    -
  • -
- -
- -

Routes

-
- -
- -

Waypoint Arrival Circle Radius

-
- -

-Gives an answer to this question. When following a Route with the autopilot engaged at what distance from the upcoming waypoint should OpenCPN tell the autopilot to change to the next waypoint? The default is 0.05 nautical miles. This is equal to about 93 meters or 300 feet. The default setting does not fit all circumstances. A number of factors are involved, for example, -

-
    -
  • the type of navigation,
    -
  • -
  • the waypoint selected,
    -
  • -
  • Own Ship's turning radius and speed.
    -
  • -
- -

-Find what settings suit your boat by testing. -

- -

- -

- -

-The arrival radius can also be set individually for each waypoint in the Waypoint Properties dialog. -

- -
- -

Advance route waypoint on arrival only

-
- -

-Routes are explained in Marks and Routes . With an active route, the Dialog “This Leg” is visible near the upper right corner of the screen. This dialog contains “RNG”, the “actual range”, or distance to the next waypoint. The “normal range” is different. It is the distance from ownship to a line which passes through the destination waypoint and is at right angles to the current route segment. The actual range is always equal to or greater than the normal range. When the difference is greater than 10% both values are shown in “RNG” (Shown in the Active Route Console The “normal” range is the second number shown. 1.88 in this case. -When following a Route OpenCPN normally decides to advance to the next waypoint if at least one of the following two conditions apply. -

-
    -
  1. The “normal range” is less than the declared arrival radius.
    -
  2. -
  3. Own Ship is moving away from the target waypoint, and has been for more than two seconds.
    -
  4. -
- -

-With Advance route waypoint on arrival only activated, OpenCPN only advances the route to the next waypoint, if condition 1 above is true. Condition 2 is ignored. -

- -

-This feature is useful when sailing and you can't lay the next mark and are forced to tack a few times to reach it. It allows a ship to move away from waypoint without automatically advancing to next waypoint. This ensures that the next waypoint stays active until you either reach it, or you reach a line through it, which is perpendicular to the marked route. In the latter case you have a cross track error greater than the arrival radius. -

- -

-On the other hand…. Option 2 helps you if you really want to cut a corner by a large distance in such a way that the “normal range” will never be less than the arrival radius. We want to automatically advance the route in this case. -

- -
- -

AIS Targets

-
- -

- -

- -

- -

- -

-Read more about AIS . -

- -
- -

MMSI Properties

-
- -

-Maritime Mobile Service Identifier (MMSI) is a number identifying a ship in communication. MMSI consists of nine digits. All VHF units using Digital Selective Call (DSC), are programmed with the vessels MMSI. The same applies for AIS and EPIRBs. For more about MMSI from Miltech -

- -

-MMSI numbers, individual targets, can be handled in a few preset ways. Below we have set 970000099 as an MMSI that should be tracked as a MOB. The number could for example belong to a crew member's Personal Locator Beacon. -

- -

-Several MMSI IDs below are set to never show their tracks. This can be used on frequent targets in your neighborhood, like ferries etc. The MMSI 219000368 is set to never be shown. Be aware that neither this target nor its track will ever be seen on your screen. -

- -

-The MMSI 219010183 is set as “Follower”. This is a buddy and no AIS Alert is shown. The “MMSI Properties” popup becomes available when right-clicking. Doubleclicking on the MMSI bypasses the popup an takes you directly to the Properties edit dialog. -

- -

- -

- -
- -

Add a new target to track

-
- -

- -

- -
- -

MMSI:

-
- -

-Enter the MMSI number that the new action should apply to. -

- -

-Note: An MMSI Id used to be nine digits. A warning message will be shown if the entry is more or less. -

- -

- -

- -

-If you for some reason, wish to save a non-nine-digit number click “OK”, otherwise “Cancel” will take you back to edit the number. -

- -
- -

MMSI Tracking

-
- -
- -

Default tracking

-
- -

-This is the normal tracking controlled by Options→Ships “OwnShip” and “AIS Targets” tabs. -

- -
- -

Always track and Never track

-
- -

-The MMSI Properties dialog allows one to preset the tracking behavior of a particular MMSI target, even if the target is not presently visible. Always track a friend or a ship you are interested in. Ignore that ferry that just clutters your screen. Just a few examples. -

- -
- -

Ignore this MMSI

-
- -

-The target will not show at all on the screen. -

- -
- -

Handle this MMSI as SART/PLB MOB.

-
- -

-With this setting a MOB from your ownship will be signalled immediately. Special Search and Rescue Transponders, SARTs, are now available, using the AIS system. Personal Locator Beacons transmitting on the AIS frequencies are also available. These are sometimes called Personal AIS MOB Devices. Don't confuse these with the more common personal EPIRB, that cannot be tracked by OpenCPN. -

- -

-Entering the the MMSI number makes it possible to use these devices as an onboard emergency MOB tracking system. Setting off a device alarms all vessels that can receive the signal but it tells you that this emergency is directly related to your vessel. OpenCPN will now treat this MMSI as a standard MOB. Read more Man OverBoard . -

- -

-The alarm is entered in Options → Ships→ AIS Targets →“Play Sound on CPA/TCPA and DSC/SART emergencies.” Have a look at AIS SART to see how OpenCPN reacts to an alarm. -

- -
- -

Convert AIVDM to AIVDO for this MMSI

-
-
    -
  • AIVDM NMEA 0183 sentence → AIS position reports from other vessels
    -
  • -
  • AIVDO NMEA 0183 sentence → AIS position reports from own vessel
    -
  • -
- -

-The setting is intended for the following very specific scenario: -

-
    -
  1. You have an AIS transponder, not connected to your computer.
    -
  2. -
  3. You have a separate AIS receiver, used to monitor your own AIS signal, as well as all other traffic.
    -
  4. -
  5. You desire not to collide with yourself, virtually.
    -
  6. -
- -

-So you instruct O to convert the AIVDM for your MMSI coming in via your AIS receiver into AIVDO, or Own Ship. Thus, no collision. -

- -

-The option is also handy to clear a non-sense “ownship” AIS icon from the screen when the AIS transponder is misconfigured. -

- -

-Note that the option Ignore this MMSI can be used to achive the same result -

- -
- -

This MMSI is my follower – No CPA Alert

-
- -

-When this option is active no AIS Alert will be shown for that target. This can be used for a buddy sailing close to you and you don't wont a CPA alert message for that target but still for other ships coming too close. -

- -
- -

Ships name

-
- -

-The Ship name connected to a MMSI ID will be added to the list once the new ID is saved or edited. The ship name is automatically printed provided that the actual ship is present on screen or has previously been and was saved in the AIS ship name file. In either case the ship name will be added first time the boat is present in OpenCPN. -

- -
- - -
- - diff --git a/data/doc/options_setting/user_interface.html b/data/doc/options_setting/user_interface.html deleted file mode 100644 index be4fd42697..0000000000 --- a/data/doc/options_setting/user_interface.html +++ /dev/null @@ -1,370 +0,0 @@ - - - - - opencpn:opencpn_user_manual:options_setting:user_interface - - - - - - - - - - - - - - - - - - - - - -
- - - -

The User Interface

-
- -

- -

- -
- -

Languages:

-
- -

-The following languages are available in OpenCPN: -

-
    -
  • Brazilian Portuguese
    -
  • -
  • Catalan
    -
  • -
  • Chinese
    -
  • -
  • Traditional
    -
  • -
  • Czech
    -
  • -
  • Danish
    -
  • -
  • Dutch
    -
  • -
  • English
    -
  • -
  • Estonian
    -
  • -
  • Finnish
    -
  • -
  • French
    -
  • -
  • Galician
    -
  • -
  • German
    -
  • -
  • Greek
    -
  • -
  • Hungarian
    -
  • -
  • Italian
    -
  • -
  • Norwegian Bokmaal
    -
  • -
  • Polish
    -
  • -
  • Portuguese
    -
  • -
  • Russian
    -
  • -
  • Spanish
    -
  • -
  • Swedish
    -
  • -
  • Turkish
    -
  • -
- -

-Choose your language here. Make sure your selected language has the support files installed on your computer (Linux). Default language is US English. -

- -

-Remark: Changing the language will reset the font settings. -

- -

-Toolbar and Window Style Menubar. The alternatives are described in Toolbar Buttons and Windows/Mac style MenuBar -

- -
- -

Fonts

-
- -

-On a new installation OpenCPN uses the operating system's default fonts. This can be changed to suit the user through this dialog. Fonts can be selected for many elements on the display. Selecting the right size of font can have a dramatic impact on how values are presented. It's well worth playing around with these settings if you think that something is difficult to read for example. Note that even the text displayed on vector charts can be adjusted. -

- -
- -
Pick from the Dropdown List
-
-
    -
  • AIS Target Name - Target List font size
    -
  • -
  • AIS target List uses the “Dialog” font key.
    -
  • -
  • AISRollover - Yellow rollover font size
    -
  • -
  • AISTargetAlert - Popup alert font size
    -
  • -
  • AISTargetQuery -Query Popup
    -
  • -
  • ChartTexts -
    -
  • -
  • Console Legend - Active Route Console XTE, Bearing, etc (upper right black box, see below)
    -
  • -
  • Console Value - Active Route Console - Font Size of the data presented.
    -
  • -
  • CurrentValue -
    -
  • -
  • Dialog - AIS Target List
    -
  • -
  • ExtendedTideIcon -
    -
  • -
  • Marks - Properties font size
    -
  • -
  • Menu - Main menu font size
    -
  • -
  • ObjectQuery -Object Query font size
    -
  • -
  • OD_PathLegInfoRollover - OD Plugin Yellow Rollover font size
    -
  • -
  • OD_PointInfoRollover - OD Plugin Yellow Rollover font size
    -
  • -
  • RouteLegInfoRollever - Route Leg Yellow Rollover font size
    -
  • -
  • StatusBar - Status Font at bottom
    -
  • -
  • TideCurrentGraphRollover -
    -
  • -
  • ToolTips -
    -
  • -
- -

- -

- -

- -

- -

-The result of adjusting the “Console Value” font size. -

- -

-There is a side effect of the Font management module, which is worth noting. One must actually display something in a particular Font List category (ChartText, Console Legend, Console Value, etc.) in order for the item to appear in the list for the first time. Thereafter, the item should stay in the list and be available for editing. For Example: You may not see the Font List entry for “AIS Rollover” unless you have actually displayed an AIS Rollover message at least once. Of course, if you re-install OpenCPN or start with a new config file there may be limited entries in the FontList. -

- -
- -

Change Font Color

-
- -

-To suit your taste. -

- -
- -

Show Status Bar

-
- -

-The status bar at the bottom of the display contains a lot of navigation information. If you have this info available elsewhere turning this setting off increases the available space for the chart. -

- -
- -

Show Menu Bar

-
- -

-Show/Hide the Menu Bar. More about MenuBar
-Short Cut: “Alt” -

- -
- -

Show Chart Bar

-
- -

-Show/Hide the Chart Bar. More info available on the Chart Status Bar page.
-Short Cut: “Ctrl + B” -

- -
- -

Show Compass/GPS Status Window

-
- -

- Show/Hide the Compass/GPS Status Window. More info on the GPS Status page.
-Short Cut: “Ctrl + I” -

- -
- -

Enable Toolbar Auto Hide

-
- -

-Enter number of seconds for the Toolbar to automatically hide. -

- -
- -

Play ship bells

-
- -

-Every half-hour the traditional ship's bell will be heard. Refer to https://en.wikipedia.org/wiki/Ship%27s_bell if you are not familiar with them. -

- -
- -

Enable Touchscreen Interface

-
- -
- -

Touch Screen Tablets

-
- -

-Read more at Touch Screen Tablets -

- -
- -

Enable Graphical User Interface

-
- -

-Enable [Responsive] Graphical User Interface for Touchscreens and Tablets. -

- -

-Enlarges Toolbar Buttons & other elements for touch purposes. -

- -

-The option is intended for small (~8“) tablets with high definition displays. What it does is adjust the various graphic elements such as menus, icons, etc. so that they meet the best practice size standards for Win8/Android system displays. This makes them “big enough” to facilitate touching, dragging, etc with normal human fingers. You should not see much difference when selecting this option for normal desktop or laptop systems. -

- -
- -

Use settings for InlandECDIS 2.2

-
- -

-Use Settings for InlandECDIS 2.2 Switch to compliance mode for Europe Inland Waterways ECDIS in information mode. Read more at InlandECDIS -

- -

- -

- -

-If either of the Graphical User Interface boxes are checked, the slider “User Interface scale factor” changes the size of the Tool Bar, Chart Bar and the GPS status icon. -

- -

-If the “Enable Tablet Scaled Graphics interface” is checked, the slider “Chart Object scale factor” changes the size of chart objects including: Marks, Routes, Buoys, Daybeacons, Wrecks, Rocks, and Depths. -

- -

-Note: selecting “Use Settings for InlandECDIS Version 2.3” will have effect on your Toolbar Icons!
-Only 7 of the 17 available Toolbar Icons will be visible.
- -

- -

-You can select other Toolbar Icons, but your changes will not be saved when you exit OpenCPN.
- -
- -

- -
- -

Three Scale Factors

-
- -

-Three Scales -

- -
- -

User Interface Scale Factor

-
- -

-If either of the Graphical User Interface boxes are checked, the slider “User Interface scale factor” changes the size of the Tool Bar, Chart Bar and the GPS status icon. Useful to adjust the size of the UI. -

- -
- -

Chart Object Scale Factor

-
- -

-If the “Enable Tablet Scaled Graphics interface” is checked, the slider “Chart Object scale factor” changes the size of chart objects including: Depth Soundings, Marks, Routes, Buoys, Daybeacons, Wrecks and Rocks. -

- -
- -

Ship & AIS Scale Factor

-
- -

-If the “Enable Tablet Scaled Graphics interface” is checked, the slider “Ship scale factor” changes the size of chart objects including: Ship Icon, AIS & ATON Symbols. -

- -

-We do not reduce the ownship size below effective value of 0, so to be sure of always finding the ship on the screen. A user safety point. -

- -
- - -
- - diff --git a/data/doc/plugins.html b/data/doc/plugins.html deleted file mode 100644 index 3bb78e11af..0000000000 --- a/data/doc/plugins.html +++ /dev/null @@ -1,261 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins - - - - - - - - - - - - - - - - - - - - - -
- - - -

PLUGINS

-
- -

- -

- -
- -

Please select one of the following Pages:

-
- -

-Install and Enable Plugins General Information about plugins
- -Included Plugins in OpenCPN
- -Plugin Messaging between ODraw , Watchdog and Weather_routing.
- -Download Page for all version 4.2 & 4.4 plugins that are regarded as stable. (plugins online) -

- -

-Developers need your help testing! Developer Beta Plugins (view online) -

- -
- -

Plugin Categories

-
- -

-Included Plugins
- -Dashboard
- -World Magnetic
- -Grib Weather
- -Chart Downloader Tab -

- - -Charts (view online wiki)
- -S63 Vector Charts
- -oeSENC
- -NV Charts
- -BSB4 Charts
- -VentureFather Satellite Kap Charts (view online) -

- -

-Radar Overlay / AIS (view online)
- -BR24 Radar Overlay (view online)
- -

- - -

-Garmin Radar Overlay (view online)
- -AIS Radar Display (view online)
- -AIS RTLSDR USB (view online) -

- -

-Log, Data & Translate (view online wiki)
- -Logbook
- -Find-It
- -VDR
- -NMEA Converter
- -Debugger
- -oBabel BETA -

- -

-Navigation
- -Squiddio
-World Magnetic Model (Included Plugin)
- -Celestial Navigation
- -Route Great Circle
- -DR Dead Reckoning
- -oTCurrent
- -Odraw (Ocpn Draw)
- -TideFinder BETA (view online)
- -GE2KAP
- -Google Earth ** Charts -

- -

-Safety (view online wiki)
- -ODraw 1.4 (Ocpn Draw)
- -Watchdog
- -SAR -

- -

-Weather
-Weatherfax
- -IACfleet
- -Climatology
- -Weather Routing -

- -

-Sailing Tools (view online wiki)
- -Tactics
- -Sweep Plot
- -Polar -

- -

-Interface (view online wiki)
- -Chartscale
- -RotationCtrl
- -Projections
- -Statusbar -

- -

-Utility (view online wiki)
- -Calculator
- -Object Search
- -Launcher
- -Survey BETA
- -Debugger (online here) -

- -
- - -
- -
- -

Plugin Authors Credit

-
- -

-The diversity and range of the OpenCPN Plugins is quite remarkable. Users should appreciate the time these authors spent to create this resource. Plugins have been developed for some time now. There is a very healthy collaboration, so that at times it is truly impossible to determine “whose” plugin it is, and since this is one of the major strengths of Open Source we will not attribute. However it should be noted that there are a number of authors who are quite prolific. As the authors come to mind they will be noted below. If you are one of the authors and your name does not appear, please advise. -

- -
- -

Programmers

-
- -

-Sean Depagnier, Dave Register, Jean Pierre Pitzef, Dave Cowell, Dirk Smits, Jon Gough, Mike Rossiter, Salty Paws, Transmitter Dan, Peter Tulp, Konni, Hakan, Wally Schulpen, Kees Verruijt, Douwe Fokkema, Dave Deller and there are more. -

- -
- -

Testers

-
- -

-Many thanks to those who spent many hours helping the authors of these plugins test and debug. -

- -
- - -
- - diff --git a/data/doc/plugins/charts.html b/data/doc/plugins/charts.html deleted file mode 100644 index dcfc28009b..0000000000 --- a/data/doc/plugins/charts.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:charts - - - - - - - - - - - - - - - - - - - - - -
- - - -

Charts

-
- -

-Chart Downloader (Plugin Included in Program download)
- -Download, install and keep up to date the navigational charts provided by various free governmental sources worldwide directly from within OpenCPN's Toolbox. Supports both the raster and vector charts for the US waters provided by the NOAA, official raster navigational charts published by Argentina, Brasil and New Zealand (covering also huge areas of the Pacific ocean) as well as electronic charts of the inland waterways of the USA and more than a dozen European Union countries.
- -
- -S63 Vector Charts (O Charts)
- -A plugin that makes it possible to display standard commercial charts.
- -This plugin has a totally different display format and is integrated in the main program.
- -See O-Charts S-63 Vector charts for OpenCPN which has a link to VAR Chartworld for ENC charts.
- -
- -oeSENC (O Charts)
- -A Plugin for Vector charts licensed from official bodies for OpenCPN, especially for users in Europe. This is an encrypted format with its own plug-in, the oeSENC plug-in. Special and exclusive for OCPN -Derived from S-57, but already in an easy to digest format for OCPN (ocpn encrypted SENC). These charts will be distributedd through o-Charts very soon at very good prices for vector charts this up to date. Germany, Belgium, the Netherlands and the British Isles will be first with France, Iceland and Crotia will follow soon after.
- -
- -NV Charts
- -The NVC charts are purchased only from the German publisher NV Verlag This plugin runs NVC Charts.
- -
- -BSB4 Charts
- -A plugin which makes it possible to use MAPTEC encrypted BSB4 charts for which encryption certificates have been purchased and registered on the computer running OpenCPN.
- -
- -VentureFather Satellite Kap Charts
- -A plugin which makes it easy to create google earth, bing and nokia kap files. In some areas of the world a satellite chart is more accurate than even the official chart. This plugin allows satellite charts from Google, Bing or Nokia to be downloaded via the VentureFarther server.
- -
- -VisitMyHarbor
- -Has charts for UK, Ireland, Near Contenant, Iberia. VisitmyHarbor
- -
- -Other Sources
- -See OpenCPN User Manual for other Chart Sources. -

- -
- - -
- - diff --git a/data/doc/plugins/included_plugins.html b/data/doc/plugins/included_plugins.html deleted file mode 100644 index 7475e7a2b1..0000000000 --- a/data/doc/plugins/included_plugins.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:included_plugins - - - - - - - - - - - - - - - - - - - - - -
- - - -

Included Plugins

-
- -

-These are the Plugins included with the standard download. -

- -

-Install and Enable Plugins
- -General Information about plugins. -

- -
- -

Plugins included in OpenCPN

-
- -

-Dashboard Plugin
- -Plugin to display navigation data. Included in the OpenCPN installation. -

- -

-Grib Weather Plugin
- -Plugin to display Grib weather data files. Included in the OpenCPN installation. -

- -

-WMM Plugin
- -A plugin to display the magnetic variation, based on the World Magnetic Model. -

- -

-Chart Downloader
- -Manager for chart downloads. -

- -
- - -
- - diff --git a/data/doc/plugins/included_plugins/chart_downloader.html b/data/doc/plugins/included_plugins/chart_downloader.html deleted file mode 100644 index 8bd8f3dff3..0000000000 --- a/data/doc/plugins/included_plugins/chart_downloader.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:included_plugins:chart_downloader - - - - - - - - - - - - - - - - - - - - - -
- - - -

Chart Downloader

-
- -

-go to the Chart Downloader documentation on this page: -Chart Downloader Tab -

- -

-Click on the link above.
- -Please do not put any content on this page. Put it on the -

- -
- - -
- - diff --git a/data/doc/plugins/included_plugins/dashboard.html b/data/doc/plugins/included_plugins/dashboard.html deleted file mode 100644 index 5ab69eb314..0000000000 --- a/data/doc/plugins/included_plugins/dashboard.html +++ /dev/null @@ -1,503 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:included_plugins:dashboard - - - - - - - - - - - - - - - - - - - - - -
- - - -

Dashboard

-
- -

-The Dashboard plugin is able to show quite a few instruments. -The Dashboard plugin is always distributed with OpenCPN, no separate download is required. -

- -

-If the data is available to OpenCPN in the NMEA0183 data stream the different instruments will display relevant data; but the plugin won't tell what is available. It is assumed that the user knows what is connected. It is of course possible to activate all instruments and see what works. -

- -
- -

The Dashboard in action

-
- -

-There are two Dashboards, one vertical and one horizontal. -

- -

-Grab the top Caption bar with the cursor and drag the Dashboard as far as possible to the right or left. Let go the cursor, and the Dashboard will dock, the chart display will adjust, no part of the chart will be hidden. Horizontal Dashboards can in a similar way be docked top or bottom. -This process is reversible. Just grab the Dashboard dialog bar with the cursor, an pull towards the middle of the screen, and the Dashboard will become floating. -

- -

- -

- -

-The same Dashboards docked left and bottom. -

- -

- -

- -

-There is a grab handle in the SE corner of each Dashboard. Use it to resize each dialog. -The graphics will change size, but not the text, which is handled separately. See further down. -

- -

- -

- -
- -

The Dashboard Tab

-
- -

-Once the Dashboard plugin is activated in the plugin tab, the Dashboard Icon will be available in the ToolBar and will work as an on/off toggle. The Preference button works exactly the same as described under “Dashboard Settings” below. -

- -

- -

- -

-The “Enable” Button activates the plugin and shows the icon in the ToolBar. -Once enabled, the “Disable” Button is displayed, as show above. -If you press the “Preference” Button the Dashboard preferences dialog becomes available. -

- -
- -

Dashboard settings

-
- -

- -

- -

-Right click anywhere in a Dashboard and a few options are displayed, in a small dialog. -Above we have clicked on the vertical Dashboard. Make this Dashboard horizontal by clicking the “Horizontal” radio button. Stop displaying it by un-ticking the box in front of the first “Dashboard” line. Get it back by right clicking on the other Dashboard and tick the same box again. -

- -
- -

Preferences

-
- -

- -

- -
- -

The Dashboard Tab

-
- -

-The Icons in the narrow pane to the left, represents the available instances. Click on an instance and the configured instruments shows in the “Instruments” pane. -

- -

-“+” and “-“ Add or delete a Dashboard instance. Note, that an active Dashboard can not be deleted as the ”-” will be grayed out. Configure a new instance by “Add”-ing instruments in the “Instrument” pane. -

- -

-Show this Dashboard If ticked just that Dashboard is shown. Toggling the icon displays all Dashboards. -

- -

-Caption changes the name of the DashBoard from the default “Dashboard” to the Caption value. -Due to a wxWidgets bug, this change is not instant, and requires docking the Dashboard or restarting OpenCPN, to work. -

- -

-Orientation A dash board can be either Vertical or Horizontal. -Vertical can be docked left or right, Horizontal can be docked top or bottom. -

- -

-The “Instruments” pane. Shows the Instruments that are “active”, that will show up in that particular Dashboard .The instruments are selected with the buttons to the right. -

- -

-Add. This button brings up the “Add Instrument” dialog where the available instruments can be highlighted and added to the Instruments Window. -

- -

- -

- -
- -

40 Instruments Available

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Position (text)
SOG (text) -Speed Over Ground
Speedometer (dial)
COG(text) - Course Over Ground
GPS Compass(dial)
STW(text) Speed Through Water
True HDG(text) Heading
Apparent WindAngle & Speed(dial) See MWV
App. Wind speed(text)
App. Wind speed(dial)
True Wind Angle & Speed(dial)
Depth(text)1
Depth(dial)1
Water Temp(text)
VMG(text)- Velocity Made Good to a waypoint
VMG(dial)
Rudder Angle(text)
Rudder Angle(dial)
GPS in view(text)- the number of satellites detected2
GPS status(dial)2
Cursor, shows the position of the cursor.
Clock, showing UTC from the NMEA stream, in most cases this is the gps time.
Sunrise/Sunset
Moon phase
Air Temp
App. Wind angle
True Wind angle
True Wind direction
True Wind Speed
True Wind Direction and speed
Magnetic Hdg
True Compass
Wind History
Trip Log
Sum Log
Barometric Pressure (dial)
Barometric Pressure (text)
Barometric History
From Ownship. Shows the vector from Ownship to the cursor.
Magnetic COG2
-
- -

-1. The DPT sentence is used, and transducer offset will be added to depth value, if available.
- -2. Linux note: GPS satellite info is not available if using gpsd. -The same informations is however available through the “xgps” command. -

- -
- -

Delete

-
- -

-Highlight an entry in the Instrument Window to delete it. -

- -
- -

Up / Down

-
- -

-Highlight an entry in the Instrument Window and change the order between the selected instruments. This order will also be the order between the instruments in the Dashboard dialog. -

- -
- -

The Appearance Tab

-
- -

-dashboard-preferences-appearance.jpg -

- -

-Use this tab to set fonts. -

- -
- -

Dampen SOG and COG (IR Filter)

-
- -

-There are 2 parameters in the Dashboard→Preferences→Appearance dialog for damping of SOG and COG. -A value of 1 means no filtering. Higher values mean ever slower response of the instrument. -The max filter value is 100 which is pretty slow. This filter works almost exactly like a mechanical filter that uses an oil damped indicator dial. It will respond gradually to a change in course or speed. A typical filter value of 10 seems to work pretty well. -

- -
- -

Units Selection

-
- -

-Select these parameters as suits your use. These controls together enable the user to adjust the view of the dashboard to suit individual needs. -

- -

- -

- -

-Units Ranges and Formats -Set the units to use, and the range of the speed dial. -

- -

-
- -

- -
- -

Wind History

-
- -

-The Wind History Instrument needs some further explanations. -

- -

-The “wind history” instrument is meant to be run as a standalone (vertical) instrument.
- -Just define a separate dashboard and add it as the only instrument. -

- -

- -

- -

-You can resize the Instrument with the mouse. -

- -

- -

- -

-In real conditions, it monitors around 40 min of wind direction (red), as well as wind speed (blue), showing a vertical time line every 5 min (the example screen shot is a full-speed VDR replay). -

- -

-The text on the top shows the current values, as it is displayed in the standard instruments (blue = wind speed data, TWS=True Wind Speed, red = direction, TWD = True Wind Direction). -

- -

-Here is an explanation of the text line, left side (see screen shot):
- -TWS 7.5: true Wind Speed currently 7.5 kts
- -Max 22.3 kts since 18:50: this is the max Wind speed in the visible graphs, i.e. the last ~40 mins
- -Overall 22.3: the max wind speed since OpenCPN was started. -

- -

-Right side above: -TWD 357 degrees: True wind direction currently 357 degrees -

- -

-The thin red/blue curves are the real direction/speed values, the thicker curves are smoothed values. Makes it easier to see trends. -

- -

-There is some logic included : -The instruments zooms automatically as much as possible, always trying to show the whole visible curve;
- -Wind speed curve:
- -if your max (visible) wind speed is 10 kts, then your scale is from 0…11 kts (rounded upwards to the next full knot).
- -In the screen shot we had a mx of 22.3kts –> scale is 0…23 kts.
- -Wind direction:
- -The instrument scale shows +/- 90 degrees of the currently visible data values, but is limited to a total of 360 degrees.
- -If the wind is shifting through North (from 350, 355, 359, 002, 010, …) we're shifting the curve as well, meaning that there is NO vertical jump in the data from 360 degrees –> 0 degrees, and we do NOT loose all the continuity in the smoothed curves ! -

- -

-If you should happen to have more than a full 360 degrees cycle of wind direction in the recorded data (if you sail through a couple of dust devils ), I limited the max scale to 360 degrees, meaning that the curve will run out of the visible area on bottom or on top of the instrument. -

- -

-Please note that you don&#39;t have to have the instrument “open” all the time. -Once activated as initially described, you can close it, and simply reopen it on demand. You don't loose the curves, the instrument continues to collect the data. -To make it visible again simply right click on an existing standard-dashboard, and click the “Wind History” Dashboard. -

- -

- -

- -
- -

Night time Mode

-
- -

-In Windows, Night, F5, mode. The title bar on the floating dashboard window is a bit glaring (this mode is controlled by windows by way of a theme and is not possible to change from an application) . Dock the Dashboard into “docked mode” it will be less glaring. The best solution is to simply “dock” the dashboard window at night, either left or right. This brings the window decorations back under OCPN control, and we recently added logic to dim it in this mode. -

- -
- -

Dashboard Time

-
- -

- -

-
    -
  1. GPS clock - same as old Clock
    -
  2. -
  3. Local GPS clock - GPS clock with offset (see more below)
    -
  4. -
  5. Local CPU clock - Local CPU clock obtained from operating system
    -
  6. -
- -

-Local GPS clock has 2 options for time zone. On the appearance tab of the Dashboard preferences there is a new setting for “Local offset from UTC”. The default is 00:00. When the 00:00 is selected then Local GPS clock will display time in the time zone of the computer running OpenCPN. If that is not what you want then you can selected any other offset in 30 minute increments up to +/- 12 hours. That offset will be added to the GPS UTC time and the local computer time zone will be ignored. -

- -
- -

Sunrise - Sunset

-
- -

-Sunrise/sunset are computed based on the date and lat/long from the GPS NMEA input data. They are not computed from the CPU clock or the ship's position. So unless you have a GPS connected then the times of sunrise/sunset are probably not going to be right. It has always been thus. -

- -
- - -
- - diff --git a/data/doc/plugins/included_plugins/grib_weather.html b/data/doc/plugins/included_plugins/grib_weather.html deleted file mode 100644 index bc92ebf2ce..0000000000 --- a/data/doc/plugins/included_plugins/grib_weather.html +++ /dev/null @@ -1,823 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:included_plugins:grib_weather - - - - - - - - - - - - - - - - - - - - - -
- - - -

Grib Weather

-
- -

-OpenCPN has a grib weather file viewer plugin, aimed at being useful while under way.
- -The grib plugin is always distributed with OpenCPN, no separate download is required. -

- -
- -

What is a grib file?

-
- -

-If you are not familiar with grib weather files, make sure you understand the basics, before you start to use them. It is essential to understand the limitations of weather forecasts that are distributed in the grib format.
- -It is also worth pointing out that gribs are not reliable near tropical systems.
- -Send a blank mail to GribWarning@saildocs.com. Read the mail you get back carefully.
- -To get started with gribs and to find sources for downloads, check Franks-Weather.
- -A very good, up to date book, is “Modern Marine Weather, second edition” by David Burch, with a thorough treatment of the subject.
- -A few files including lectures on tropical weather and gribs are available here. -

- -
- -

Types of Grib files.

-
- -

-OpenCPN can read both the original gribfile format, known as Grib1, as well as the new Grib2 format, with the .grb2 or .grib2 file-extension. -

- -
- -

Get started

-
- -

-To display grib files as an overlay on your normal charts you have to first activate the grib icon
- -Go to find the plugin tab. Click on the Grib plugin, then the “Enable” button. The “Preferences” Button brings up a small dialog. The settings in this dialog rarely needs changing after the initial setup.
- -

- -

- -

- -
- -

Grib Preference

-
- -

-Use High Definition Graphics. The setting only concerns the barbed wind arrows.Tick the “Use High Definition Graphics” box, unless you are on old hardware. Not ticking the “High Definition Graphics” box can help to speed up the grib display on a slow computer.
- -Use Gradual Colors. This setting applies to all colored overlay maps. On many installations the difference in rendering is very small. The overlay maps built in color variation plays a part.
- -Copy First Cumulative Missing Record. This is about rainfall and cloud cover records .
- -As these records are “cumulative” the first one does not exist in files from zyGrib and Saildocs. With this parameter unchecked, there will be neither rainfall and nor cloud cover displayed for the first date/time of the file. Ticking the box fixes the problem.
- -Copy Missing Wave Records. This only concerns wave records from zyGrib delivers files from two models ; FNMOC (WW3-…) for waves and GFS for all other parameters. These two forecast models does not have the same time spacing. For some dates/times, the wave data do not exist.This parameter allows this missing data to be reconstructed and avoiding the overlay (if set) to flicker.
- -

- -
- -

Load File Options

-
- -

-Load the More Recent File in Directory. Loads the newest file in the grib directory on start.
- -Load the Last Open File. Loads the grib file used last time.
- -

- -
- -

Start options

-
- -

-Start at the first forecast in GRIB file
- -Start at the nearest forecast to current time
- -Authorize interpolation to start at current time.
- -

- -
- -

Time Options

-
- -

-Local Time
- -UTC
- -

- -
- -

The Grib Display Controls

-
- -
- -

The Standard Display Control

-
- -

-To start the Grib plugin press the button in the tool-bar. The “GRIB Display Control” then pops up. -

- -

- -

- -

-Hide Data at Cursor -

- -

- -

- -

-This is a smart and compact dialog. For a quick start press the “Open File” button and navigate to your grib file directory and press the file to be displayed.
- -Previous/Next Go to the previous or the next record in the gribfile. This corresponds to the time “interval” chosen when the grib file was downloaded.
- -Data valid at The time of validity for all grib data on screen.
- -Open Grib file The name of the grib file in use.
- -Now Displays the record, nearest in time to “now” according to the Start option you have selected: (“Start at the nearest forecast to current time” or “Authorize interpolation to start at current time”).
- -Select Geopotential Height If grib data for geopotential height is available, selection will be between Std, 500.
- -Zoom to Center This button will home in on the loaded area that the loaded grib file covers.
- -Play Goes through all records in turn, with the animation speed controlled in the “Grib Settings” dialog.
- -Hide Cursor Data Hides Grib which normally appears in the data windows. Data windows are hidden.
- -Progress Slider Just to the right of the “Play” button is a slider that is just another way of going through the grip records.
- -Open File Activates the operating systems standard file selector dialog to select a grib file. The plugin remembers the directory of this grib. This is used next time you start OpenCPN and activates the Grib plugin. See settings in the “Grib Preferences” dialog above.
- -Settings is where to control how the different grib data will be displayed. See more below.
- -Request Download grib files via email. More below.
- -GRIB Data at Cursor. This is where the “smart” part kicks in.
- -Only entries for the data contained in the active grib file will be displayed. For example, if there is no wave data in the current grib file, there will be no signs of wave data at all. In the case above, where the the wave data is N/A, the grib file includes wave data, but not for the area where the cursor is. Compare with the picture below, where the grib only contains current data.
- -The tick boxes next to each data entry, are used to activate the data-display on the screen.
- -Exactly what will be shown is controlled in the “Grib Settings” dialog, which is reached by pressing the “Settings” button.
- -Don't activate to many display features at the same time. The display quickly becomes very cluttered. -

- -

-
- -

- -

-The “GRIB Display Control” loaded with a grib file only containing current data. -

- -

-Advanced GRIB Data at Cursor. The display options for all the data shown, can be reached by right.clicking on the little squares where the “ticks” are shown. For the meaning of all these options, read on. -

- -

-
- -

- -

-Right-clicking the “Air Temp” option square. -

- -
- -

The Advanced Display Control

-
- -

-The plugin has an advanced mode were altitude data can be displayed. This mode requires some more knowledge than plain gribs.
- -A good start is to read "Mariner's Guide to the 500--Millibar Chart".
- -If a grib file includes altitude data, the control will automatically include more options. See below. -

- -

-
- -

- -

-If the dialog looks normal except for an extra selection box under “GRIB Data at Cursor”, like this, -

- -

- -

- -

-then the grib file contains altitude data. Selecting one of the altitudes, for example 500, changes the dialog to what you see above.
- -The advanced data are displayed against a yellow background.
- -Wind. These are the wind data valid for the selected altitude level.
- -Grib Data at 500 hPa. The values at the selected level. -

- -
- -

Weather Tables

-
- -

-Once a grib file is loaded in the current session, the “Weather table” appears in the right click menu. -

- -

- -

- -

-Click the entry, and a Weather Table, valid at the cursor point, pops up. All available data in the current grib file, for the whole time span, are shown. -

- -

-Grib Table Arrows
- -

- -

-NOTE: To change the Wind & Wave Arrows to Degrees, just hit the Dir switch. -

- -

-Grib Table Degrees
- -

- -
- -

Settings

-
- -

-…controls how the grib files are displayed on the screen, and units used in the Grib Display control. Things like overlay colors, animation time interval and speed and much more. -The basic dialog looks like this. -

- -

-Typical DATA TAB
- -
- -Note the Fixed or Minimum Spacing (pixels) selection. This is a typical setting. -

- -

-Typical GUI TAB
- - -

- -

-Typical PLAYBACK TAB
- -
- - -

- -
- -

Playback

-
- -

-The Loop Mode controls what happens when “Play” is pressed in the Grib Display Control. -

- -

-Loop Mode. Sets the “Play” function into a loop mode. Otherwise, playback will stop when reaching the end of the file.
- -Loop Start. Were to start the loop. The option “Current time forecast” makes sure that only data now or in the future are shown
- -Updates per Second. Controls the speed of “play”.
- -Loop Start. The loop can start either at the start of the grib file or from the current time forecast.
- -Interpolate between gribs. If you select this option, you will be able to choose your own time interval, but you have to consider that it can decrease data accuracy. To remind you, this info will pop up.
- -

- -

-
- -Time Interval. This is the time interval used for interpolation. The entry is only visible if “Interpolate between gribs” is ticked. This is connected tho the chosen time interval when requesting a grib file.
- -

- -
- -

Display

-
- -

-The lower part of the Grib Settings Dialog, under the Display heading is really 10 different controls. The controls are activated by the choosing one of the items in the selection menu below. -

- -

- -

- -

-Many of the entries are repeated, so let&#39;s first have a closer look at the the most important one, the Wind. Entries on the same line are connected. -

- -

- -
- - -
- -

- -

-Units refers to the choice of units for the selected record. -
- -For wind speed the choices are. -

- -

-
- -Barbed Arrows Display the traditional barbed arrows, showing wind direction and wind speed.
- -Range refers to the distance between displayed arrows (not working 3.3.1117).
- -Default Color/Controlled Colors Default is dark brown while “Controlled” varies from blue for very light winds to red for very strong winds. -
- -

- -

- -
- -Always visible This option only exists for “Wind” and “Pressure”. When ticked the object is shown regardless of what is ticked in the “Settings Control”. The idea is to be able to Show wind and/or pressure at the same time as other options. Use with Rainfall, for example, to help identifying fronts. -
- -Display Isotachs shows contour lines connecting points with the same wind speed. -
- -Spacing controls which wind speed Isotachs will be shown. Use knots for units and 10 for spacing and isotach contours will be shown at 10 kts, 20kts and so on. -
- -OverlayMap Depending on your system capability,if you use “Accelerated Graphics (OpenGL)” (see General Options/Display/Advanced), the overlay will be visible at all scales. But if you don't, the overlay will only be visible at small scales. A small yellow pop up at the bottom left of the screen will inform you. Zoom out to a scale of 1:13 millions, or smaller to see them. -
- -Colors is another selection menu containing pre-set color schemes. The idea is to use the scheme with the same name as the control, but this is just a hint, nothing more. -
- -

- -

- -

- -

-Numbers shows the wind speed in small square boxes. Minimum Spacing refers to the spacing between these boxes.
- -Particle Map is a kind of animation of the wind field. It is created by letting “particles”, or dots, move in the wind direction and leave a trail. The trail is colored after the wind strength, and each particle has a limited “life span”.
- -The Density slider creates particle trails that are shorter but closer together with increased value, which is the same as further to the right. The particle Map below clearly shows a convergence zone with stronger winds (red). This is probably a cold front.
-Performance Warning: Note that high density Particle Maps on Low Powered Machines and Large Files may slow your machine to a crawl. First test on small files.
- -

- -

- -

- -

-Overlay Transparency works as expected.
- -

- -

-All the controls for Wind Gust, Rainfall and Cloud Cover, have similar entries; only the units differ. -

- -

- -
- - -

- -

-The pressure display has no overlays, only the options of isobars and numbers. -Overlay Transparency is redundant. -

- -

- -
- - -

- -

-Waves and Current have a more or less similar display. A Particle Map is available for currents. See the descripion above for wind Particle Maps. Once again different units.
- -There is a choice between three different display arrows shown in two sizes.
- -If wave height, direction and wave period is present in the grib file it will be displayed in the Display Control like this: -
- - -
- - -
- - -

- -

-Air Temperature and Sea Temperature looks the same. -

- -

- -
- - -

- -

-Convective Available Potential Energy (CAPE) has these settings -

- -

- -
- - -
- -Altitude and Relative Humidity have a simple one choice entry. -

- -
- -

The Grib-file Request Button

-
-
    -
  • Grib files can be requested directly from the plugin. The request is in the form of an email to SailDocs or ZyGrib. The requested grib file is also delivered via email as an attachment.
    -
  • -
  • The area for which data is requested defaults to the area visible on the screen, but the request area can be selected by other means as well. See more below.
    -
  • -
  • It's possible to request gribs from 4 different Grib prediction models when using Saildocs GFS, COAMPS, RTOFS and indirectly WW3. When you request “Waves” in GFS, Saildocs merge wavedata from WW3 into the delivered grib.
    -
  • -
  • The ZyGrib option can only deliver GFS gribs, which is the “standard” model for gribs.
    -
  • -
  • RTOFS gribs only contains current and water temperature data.
    -
  • -
  • COAMPS delivers wind and pressure with a higher resolution than GFS
    -
  • -
  • The minimum times between grib records are 3h for GFS and 6h for COAMPS & RTOFS.
    -
  • -
  • GFS can be requested for 8 days ahead. An extended GFS request up to 16 days ahead is possible. This warning will pop up.
    -
  • -
- -

- -
- -The same value for COAMPS is 3 days and RTOFS 6 days. -
- -

- -

-There are two layouts of this dialog, depending on whether it is a request to SaiDocs or to ZyGrib. Some alternatives are only available from SailDocs, and some are only available from zyGrib. Alternatives not available are grayed out. -
- -
- -

- -
- -

SailDocs Request Form

-
- -

-
- - -

- -

-Compose the request by picking parameters and data. Not all data are available for all choices of parameters.
- -For example, in the picture above “Wind Gusts” and “Current” are grayed out, as the are not available with GFS from SailDocs. -
- -When selecting “Moving Grib” the dialog expands and makes it possible to choose a speed and course. The selected grib forecast area will move, using these values, for each grib interval. The idea behind this is to minimize the download while still covering a longer passage.
- -Moving grib files are incompatible with interpolation, so if a “moving file” is detected a warning is displayed. Interpolation, if set is deactivated, but only for moving file, the settings as such, are not modified. -
- -Resolution The choices are 0.5, 1.0 or 2.0. A recent upgrade to gribs makes it possible to download even 0.25&deg; resolution. This is not yet an alternative in the plugin and requires editing the email manually before sending. In the picture above …|0.5,0.5|… should instead look like …|0.25,0.25|… -
- -The default geographical coverage of the requested grib file is the area you can see on the screen. A manual Selection Mode is also available.
- -When the Area Selection → Manual Selection box is ticked the dialog expands -
- -

- -

- -

- -

-Choose the limiting Latitude and Longitude for the grib-file manually or press “Start graphic Sel.” button. -
- -

- -

- -

- -

-Press the left mouse-button and draw a rectangle around the required area. -

- -

-When selecting “Pressure Altitude” and the GFS forecast model, the dialog expands and makes it possible to choose forecasts for different altitude levels. The SailDocs dialog only supports the 500 mb altitude, while zyGrib suports all options. -
- -When you are ready press “Send”. -
- -This message will show in the “Mail” window instead of the “send” request: -
- -

-
   Your request is ready. An email is prepared in your email environment.
-   You have just to verify and send it...
-   Save or Cancel to finish...or Continue...
- -

-
- -As stated, a mail is composed for you and ready to send with your normal mailing program. -
- -This is the standard way of getting a new grib in Windows and Linux. (Mac ??) -
- -

- -

-To get a grib, just press “Send”, and wait for a return mail. -
- -
- -

- -
- -

zyGrib Request Form

-
- -

-
- -Note that the Login is longer the first page of the website. The URL for the login is http://www.zygrib.org/index.php?page=gribauto This is where you login to recieve the special code that allows download for two months. -
- - -
- -

- -
- -

Configuration of Default Email Server

-
- -

-If after hitting “Send”, the “Mail” window shows this message, instead of the “send” request: -

-
 Request can't be sent. Please verify your email system parameters.
- You should also have a look at your log file.
- Save or Cancel to finish...
- -

-Configuration of the user's default Mail Server for the particular Operating System is required. -

- -

-There is an advanced alternative for Mac OSX, Linux (and BSD). Install and configure a mail server. Instructions are on the Grib Weather Mail Servers Page. Following these instructions to enable the mail server will enable automatic transmission of a grib request to SailDocs. -

- -

-After installing and configuring a mail server, there is one more step. Open “opencpn.conf” and add the line below. As always, do not run OpenCPN when editing opencpn.conf. -

-
   [PlugIns/GRIB]\\
-   SendMailMethod=1
- -

-Setting “SendMailMethod” to “0” restores the default. -
- -

- -
- -

ZyGrib Server Registration

-
- -

-When ZyGrib is selected as the download server, there are User and Code fields that can be completed. This requires subscription or registration to the ZyGrib Forum. -

- -

-ZyGrib allows registration to the zyGrib forum and permits use of the user/password to obtain a two month code for registered zyGrib downloads. Limitations: Maximum 16 emails per user and per 24 hours. Maximum size of 4 MB per grib file. -

- - -
- -

Load two Grib Files Concurrently (Wind + Current)

-
- -

-Combine separate Saildocs GFS Wind + RTOFS Current grib files. -(Note: Only applies to OpenCPN v4.2.x and forward) -
- -Using Windows, Click on the “Open a File” to browse grib file. -

-
    -
  1. Highlight two grib files (Ctrl and pick the two files with a mouse left click.)
    -
  2. -
  3. The pick Open and the two grib files will be opened.
    -
  4. -
  5. Both grib files will be used by Weather_routing.
    -
  6. -
  7. In grib_pi settings I always use the “Current” “Proportional Arrow”
    -
  8. -
- -

- -
- -

- -
- -

More to know

-
- -

-There are many aspects to the use of grib files which lead to the use of other companion programs or plugins. -
- -

-
    -
  • ZyGrib is a free and open-source software (FOSS) dedicated grib viewer. Grib files can be downloaded by ZyGrib and then opened in OpenCPN.
    -
  • -
  • QtVlm, is another FOSS weather routing program, combines a grib file with boat polar data, and produces an optimized route.
    -
  • -
- -

-
- -These are very good tools to use in routing decisions, but they all have the same limitations as all grib-data. -
- -

- -
- -

Grib File Notes & WARNINGS

-
- -

-(These notes are from the SailDocs Grib Server) -

- -

-This grib file is extracted from a computer forecast model. While such computer data can provide useful guidance for general wind flow, there are limitations which must be understood. -

- -

-What you are receiving is a weather prediction generated by a computer run by NOAA/NCEP (GFS, WW3 models) or the US Navy (comaps, nogaps) and downloaded and processed by Saildocs (a service of Sailmail). -

- -

-The network is complex, and any computer network is subject to hardware and software failures or human error -which can effect accuracy or availability of data. -

-
    -
  1. In particular, if our servers were not able to download a current data file then the grib-file may be based on old data. The file information is shown above and also contained in the file itself. Also remember that grib data is not reviewed by forecasters before being made available.
    -
  2. -
  3. You are getting a small part of the raw model data that the forecasters themselves use when writing a forecast, and it is your responsibility to make sure that the data is consistent with your local conditions and with the professionally-generated forecasts (e.g. text bulletins and weather-fax charts).
    -
  4. -
  5. Grib data also has limitations along shore, where local effects often dominate and may not be adequately modeled.
    -
  6. -
  7. In addition these models cannot provide adequate prediction for
    -
      -
    • tropical systems,
      -
    • -
    • frontal activity or convergence zones.
      -
    • -
    • For example, while global models can provide useful data on the likely track of hurricanes, they grossly underestimate the strength of hurricanes because of their small size compared to the model grid.
      -
    • -
    -
  8. -
  9. For hurricane/cyclone forecasts, carefully monitor the appropriate warning messages and do not rely on grib data from any source.
    -
  10. -
- -

-Grib data can provide useful guidance not available elsewhere. Understand the limitations and use the data carefully. Grib data should be considered supplemental to other forecasts, and not be relied upon in lieu of professionally-generated charts or forecasts. -

- -
- - -
- - diff --git a/data/doc/plugins/included_plugins/grib_weather/mail_servers.html b/data/doc/plugins/included_plugins/grib_weather/mail_servers.html deleted file mode 100644 index 7cdb34bd0e..0000000000 --- a/data/doc/plugins/included_plugins/grib_weather/mail_servers.html +++ /dev/null @@ -1,556 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:included_plugins:grib_weather:mail_servers - - - - - - - - - - - - - - - - - - - - - -
- -

Mail Servers

-
- -
- -

Warning!

-
- -

-This is an Advanced subject, that is not necessary for running the grib plugin.
- -Do not try these setups unless you are familiar with your operating system, comfortable with handling the command line interface and editing configuration files.
- -Do not expect these instructions to work without some customization.
-

- -

-This page contains detailed instructions on how to set up mailservers to automatically send grib request mails to Sail Docs.
- -“Ptizef” & “rgleason” have compiled the instructions for Windows/Thunderbird
- -“Ptizef” has compiled the instructions for Linux/SSMTP.
- -“Cagney” has compiled the instructions for Linux/Exim4.
- -“CarCode” has compiled the instructions for Mac OS X/PostFix . -

- -
- -

Windows MAPI Mail Server Setup

-
- -

-The plugin's email request depends on the user's selection of the default MAPI email program which is dependent on the Operating System conventions. Linux, Windows and Mac are all different. If the plugin does not find a default MAPI program, an appropriate message will show in the plugin menu: -

-
 Request can't be sent. Please verify your email system parameters.
- You should also have a look at your log file.
- Save or Cancel to finish...
- -

-and there will be an error message in the opencpn.log similar to: -

-
 10:55:47 PM: MAIL Error: Failed to logon to MAPI using a shared session, Error:3
- -

-To fix this problem use a google search, and find links such as Fix CLS Send, MAPI or Runtime Error in Email -

- -
- -

Windows 10 or 8.1 and Thunderbird

-
- -

-For example, if you use Thunderbird exclusively with Win10 or Win8.1, this should fix the problem -

-
 Start > Control Panel > Default Programs > Set your Default Programs,  Then pick Thunderbird.
- -
- -

Windows Vista or XP and Thunderbird

-
- -

-- Outside OpenCPN there is nothing more to do except to ensure that there is a mail system (mine is thunderbird) correctly configured and set as “main” on the device.
- -also verify if the mapi32.dll is present in c:/windows/system32 (or equivalent for 64b) (otherwise an error message will be the result). -

- -

-- Inside OpenCPN, there is nothing to do; the sender mail address can be entered, but will not be used. Just don't forget to enter the zyGRIB login and password. -

- -

-When clicking on “send” button :
- -if the “main” mail system is not open, OpenCPN opens it and the waiting messages are received.
- -remark : if there are many waiting messages, it could take a while. That is why it would be better to create a specific address for this purpose.
- -Then a new mail page is opened with all mail elements already written thus ready to be sent. -

- -
- -

Linux

-
- -
- -

Using SSMTP

-
- -

-How to install and configure sSMTP: -

- -

-- 1) Install the ssmtp package.
- -If another MTA is already installed, you may be asked to uninstall it before installing ssmtp. -

- -

-Once it's done you can test it by typing this command:
- -“whereis sendmail” -

- -

-The answer should be something like “/usr/sbin/sendmail”. -

- -

-Use that answer in the next command:
- -“ls -la /usr/sbin/sendmail” -

- -

-If everything is OK you should get this answer:
- -“/usr/sbin/sendmail → ssmtp”
- -showing that Sendmail function is now connected to ssmtp. -

- -

-- 2) Now there are two files to set: -

- -

-the first file : /etc/ssmtp/ssmtp.conf ( with root rights )
- -
- -The typical setting should be:
- -root=postmaster
- -AuthUser=yourlogin to your ISP access
- -AuthPass=yourpasseword to your ISP access
- -mailhub=yourISPserveurname.yourdomain (for example smtp.orange.fr)
- -rewriteDomain=yourdomain
- -FromLineOverride=YES
- -hostname= the full host-name ( normally automatically entered, but if not you can type the command : “hostname” to get it)
- -
- -For ISP requiring a TLS connection , it could be necessary to add the line UseTLS=YES or UseSTARTTLS=YES
- -
- -the second file : /etc/ssmtp/revaliases (with root rights)
- -
- -Enter this line.
- -root:yourlogin@yourdomain:yourISPserveurname.yourdomain - -
- -the default port was 25 but now many ISP refuse it and use 587. If you have a mail system, you will find the right value in it.sudo dpkg-reconfigure exim4-config
- -Sendmail/Postfix install for Mac
- -- Inside OpenCPN :You must enter the sender address : your entire mail address, the one you will use to send mails and receive answers
- -
- -When you click on the “send” button, the mail is directly sent. You can find the log here : /var/log/mail.log
- -

- -
- -

Using Exim4

-
- -

-First install Exim4
- -$sudo apt-get install exim4
- -then configure it (again).
- -$sudo dpkg-reconfigure exim4-config
- -This is a very simple setup where exim is just used to forward mail to the ISP:s smtp server. Local system mail is also available. -

- -

-
- -It's important to use the choice above. -

- -

-
- -I just use “localhost”. -

- -

-
- -We have no incoming connections. -

- -

-
- -We are not using this. -

- -

-
- -We are not using this. -

- -

-
- -This is important. It must point to your Internet Service Providers SMTP server. -

- -

-
- -Your choice! -

- -

-
- -RTFM and make up your mind. Not a big deal for this simple setup. -

- -

-
- -RTFM. -

- -

-
- -Your Choice, but no point in splitting this simple setup. -

- -

-Edit /etc/exim4/passwd.client so it contains your username and password to your ISP:s mail server. -

-
- - - -
# password file used when the local exim is authenticating to a remote_PARATABLE_INS_# host as a client._PARATABLE_INS_#_PARATABLE_INS_# see exim4_passwd_client(5) for more documentation_PARATABLE_INS_#_PARATABLE_INS_# Example:_PARATABLE_INS_### target.mail.server.example:login:password_PARATABLE_INS_# for OpenCPN you can use *:login:password_PARATABLE_INS_*:fakexyz123:madeupXYZ123
- -

-(Re)start Exim4
- -$ /etc/init.d/exim4 {start|stop|restart|reload|status|what|force-stop}
- -Start testing
- -
- -
- -
- -

- -
- -

Mac OS X

-
- -
- -

Using Sendmail/Postfix

-
- -

-
- -It is not so easy to install this on a Mac since you will need some experience with terminal using. The example below uses an googlemail account and nano as editor:
- -
- -Step 1
- -Type in terminal these 6 lines one after another with return:
- -sudo mkdir -p /Library/Server/Mail/Data/spool
- -
- -sudo gzip /usr/share/man/man1/{postalias.1,postcat.1,postconf.1,postdrop.1,postf ix.1,postkick.1,postlock.1,postlog.1,postmap.1,pos tmulti.1,postqueue.1,postsuper.1,sendmail.1}
- -
- -sudo gzip /usr/share/man/man5/{access.5,aliases.5,bounce.5,canonical.5,cidr_tabl e.5,generic.5,header_checks.5,ldap_table.5,master. 5,mysql_table.5,nisplus_table.5,pcre_table.5,pgsql _table.5,postconf.5,postfix-wrapper.5,regexp_table.5,relocated.5,tcp_table.5,t ransport.5,virtual.5}
- -
- -sudo gzip /usr/share/man/man8/{anvil.8,bounce.8,cleanup.8,discard.8,error.8,flus h.8,local.8,master.8,oqmgr.8,pickup.8,pipe.8,proxy map.8,qmgr.8,qmqpd.8,scache.8,showq.8,smtp.8,smtpd .8,spawn.8,tlsmgr.8,trivial-rewrite.8,verify.8,virtual.8}
- -
- -sudo /usr/sbin/postfix set-permissions
- -
- -sudo chmod 700 /Library/Server/Mail/Data/mta
- -
- -Step 2
- -Type in terminal another command to start the nano editor with this file:
- -sudo nano /etc/postfix/sasl_passwd
- -
- -Type into the nano editor:
- -smtp.googlemail.com:587 YourAccountname@googlemail.com:YourPassword
- -
- -Substitute YourAccountname and YourPassword with your data.
- -Save the file in nano with Ctrl-O and exit with Ctrl-X.
- -
- -Step 3
- -Publicate the new file in terminal with this command:
- -sudo postmap /etc/postfix/sasl_passwd
- -
- -Step 4
- -You have to edit the main config file and add at the end the following lines with
- -this command in Terminal:
- -sudo nano /etc/postfix/main.cf
- -
- -This to add:
- -# Minimum Postfix-specific configurations.
- -mydomain_fallback = localhost
- -mail_owner = _postfix
- -setgid_group = _postdrop
- -relayhost=smtp.googlemail.com:587
- -
- -# Enable SASL authentication in the Postfix SMTP client.
- -smtp_sasl_auth_enable=yes
- -smtp_sasl_password_maps=hash:/etc/postfix/sasl_passwd
- -smtp_sasl_security_options=
- -
- -# Enable Transport Layer Security (TLS), i.e. SSL.
- -smtp_use_tls=yes
- -smtp_tls_security_level=encrypt
- -tls_random_source=dev:/dev/urandom
- -
- -Save the file and exit nano as in step 2.
- -
- -Step 5
- -Now you can start postfix in terminal with:
- -sudo postfix start
- -
- -If an error occurs correct main.cf and start again with:
- -sudo postfix reload
- -
- -Step 6
- -Now you can test your work in terminal with:
- -date | mail -s test YourAccountname@googlemail.com
- -
- -
- -Done.
- -Supplemental
- -If you want to have started sendmail/postfix each time you start you start
- -your machine you can add these lines to the launch daemon:
- -<key>RunAtLoad</key>
- -<true/>
- -
- -Do this with this command in terminal:
- -sudo nano /System/Library/LaunchDaemons/org.postfix.master.plist
- -
- -After that this file should look like this:
- -<?xml version=“1.0” encoding=“UTF-8”?>
- -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
- -<plist version=“1.0”>
- -<dict>
- -<key>Label«/key>
- -<string>org.postfix.master</string>
- -<key>Program</key>
- -<string>/usr/libexec/postfix/master</string>
- -<key>ProgramArguments</key>
- -<array>
- -<string>master</string>
- -<string>-e</string>
- -<string>60</string>
- -</array>
- -<key>QueueDirectories</key>
- -<array>
- -<string>/var/spool/postfix/maildrop</string>
- -</array>
- -<key>AbandonProcessGroup</key>
- -<true/>
- -<key>OnDemand/lt;/key>
- -<true/>
- -<key>RunAtLoad</key>
- -<true/>
- -</dict>
- -</plist>
- -

- -

-Instead of googlemail in this example you may use any other mail server. -

- -
- - -
- - diff --git a/data/doc/plugins/included_plugins/wmm.html b/data/doc/plugins/included_plugins/wmm.html deleted file mode 100644 index b1a5025fc6..0000000000 --- a/data/doc/plugins/included_plugins/wmm.html +++ /dev/null @@ -1,198 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:included_plugins:wmm - - - - - - - - - - - - - - - - - - - - - -
- - - -

WMM

-
- -

-The “World Magnetic Model PlugIn for OpenCPN” implements the NOAA World Magnetic Model.
- -More information:
- -http://www.ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml -

- -

-The bundled WMM2010 model expires on December 31, 2014.
- -After then, if a new version of the plugin is not released in time, you will have to get a new WMM.COF from NOAA and place it in the location you can find in the OpenCPN logfile. -

- -
- -

A Quick-Start Guide.

-
- -

-This plugin is all about the value of the magnetic variation. The value at your boat position, at the position of the cursor, and the rest of the world. -

- -

-Download and install the plugin. Go to Options–>Plugins. Press the “Enable” button. -

- -

- -

- -

-Then press the Preference button, and copy the settings below. -

- -

- -

- -

-Press OK twice. -The WMM icon will now be found in your ToolBar. The numbers in the button is the variation at your position. -

- -

- -

- -

-Press the Toolbar Button and the small dialog below will appear on the screen. -The first value is the same as in the button, the variation at your boat (gps) position. -The second value is the variation at the position of the cursor. -

- -

- -

- -

-That is all you need to know to get started, and for most of your daily use. -Need more details? Read on! -

- -
- -

The Details

-
- -

-World Magnetic Model Plotting allows users to cross reference the magnetic deviation values printed on many raster charts. -

- -

-Variation is the angle between true and magnetic north.
- -Inclination is the vertical angle of the magnetic field.
- -A compass is adjusted for the inclination in the intended sales region. -If you buy a compass in Europe; it will not be level in Australia, for example.
- -Field Strength is the magnetic field in nano tesla from 20000 to 66000.
- -Currently the total field strength is shown, with no immediate practical use. Hopefully this will change to show the horizontal component in the future, that has an impact on whether the compass works or not, near the magnetical poles. -

- -

-The plotted lines are similar to a topographic map. The space between them can be adjusted; more space takes less time to calculate. -

- -

-The Step size and Pole accuracy sliders allow a trade off for speed vs computation time. -

- -

- -

- -

-With the extended Radio-button, this dialog will show on the screen -

- -

- -

- -

-F - Total Intensity of the geomagnetic field
- -H - Horizontal Intensity of the geomagnetic field
- -X - North Component of the geomagnetic field
- -Y - East Component of the geomagnetic field
- -Z - Vertical Component of the geomagnetic field
- -I (DIP) - Geomagnetic Inclination
- -D (DEC) - Geomagnetic Declination (Magnetic Variation)
- -

- -

-Click “Settings” and adjust the display of the graphical plot. -

- -

-
- -Show variation only. -

- -

- -

- -

-Or all options together. -

- -

- -

- -
- - -
- - diff --git a/data/doc/plugins/install_and_enable.html b/data/doc/plugins/install_and_enable.html deleted file mode 100644 index f7c2fcc149..0000000000 --- a/data/doc/plugins/install_and_enable.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:install_and_enable - - - - - - - - - - - - - - - - - - - - - -
- - - -

Install and Enable

-
- -

-The core OpenCPN tries to keep features to a minimum so that it is lean, mean and easy to use. Features can still be added through the plugin infrastructure. -

- -

-The release of OpenCPN 4.2 upgrades the user framework for Plugins to a newer version, which means it is not binary compatible with the previous releases and all Plugins for Windows and Linux must be rebuilt for compatibility. -

- -

-These newly rebuilt plugins will not work with older versions of OpenCPN. -

- -

- -

- -
- -

OpenCPN has four default plugins pre-installed:

- - -

Download Plugins

-
- -

-Many more plugins are available. See below.
- -Go to the dedicated page for downloading plugins: PlugIns
- -Currently there are about 20 different plugins available for download.
- -For a complete list of plugins read the recent posts in this forum thread. -

- -
- -

Plugin Versions

-
- -

-The release of OpenCPN 4.2 upgrades the user frameworks for Plugins to a newer version, which means it is not binary compatible with the previous releases and all Plugins for Windows and Linux must be rebuilt for compatibility. It is expected that this Plugin interface will remain stable for some time so Plugins will work across different (future) versions of OpenCPN. -

- -
- -

Blacklisted Plugins

-
- -

-Plugins or versions of plugins known to be problematic can be Blacklisted. -

- -

- -

- -

-A dialog pops up for 5 seconds when starting OpenCPN, if a blacklisted plugin is detected. This will happen even if the plugin is not enabled. A number of plugins are blacklisted. They are, mainly, old problematic versions of plugins. There is always a newer version of a blacklisted plugin, or, in worst case scenario, one will soon be released. -

- -
- -

Installing a Plugin

-
- -

-For Linux, place the downloaded “pluginxx.so” in {prefix}/lib/opencpn, which means /usr/lib/opencpn for a standard installation, using the provided packages. If you are compiling yourself {prefix} may be “/usr/local” instead of “/usr”. Check “opencpn.log” if necessary. -

- -

-For Windows the downloaded file is usually an executable “.exe” installation file. Click on the file and follow the instructions. If the file is a “_.dll” place the downloaded “pluginxx.dll” in a “plugins” sub folder of your OpenCPN installation folder. A common location is C:\Program Files\OpenCPN\plugins. -

- -

-Once the plugin is in the right directory, restart OpenCPN and proceed to enabling the plugin. -

- -

-For Mac the plugin will come as a pkg file. Double-click the pkg file and follow the install instructions. -

- -

-This will place the plugin files in the proper locations. -

- -
- -

Enabling a Plugin

-
- -

-Plugins are made available by clicking on the plugin in the Options→Plugins Tab. Once this is done, an “Enable” button appears. Pressing this button activates the plugin icon in the ToolBar and changes the the default “grayed out” text to black in the list. Not all plugins have an icon when active. For most plugins there is a “Preferences” Button for configuration. -

- -

-When a plugin is disabled in the Options→Plugin tab, the plugin Icon disappears from the ToolBar. -

- -

-The Plugin Icon works as a toggle switch for the plugin. Pressing the Grib Icon, for example, activates the Grib plugin. Pressing one more time deactivates it. -

- -

-The WMM Icon uses a new feature, by displaying the magnetic variation, at the position of OwnShip in the button itself. -

- -
- -

Re-Enable a Plugin after a Plugin Update

-
- -

-Version 4.2 has implemented automatic reload of updated PlugIns by visiting the Options→Plugins screen. -

- -

-Presumably the plugins are rescanned and loaded. -

- -

-Previously, after a plugin was Disabled, the program had to be shut down and reopened for the full change of Opencpn status to occur. This is no longer necessary, simply go to the Option→Plugins screen and all plugins will be reloaded. -

- -

- -

- -
- -

Problems with Plugins

-
- -

-If you run into problems with plugins, first check what the opencpn.log file says. -

- -

-For each plugin you will find lines similar to: -

-
    08:59:25 CEST: PlugInManager searching for PlugIns in location /usr/lib/opencpn\\
-08:59:25 CEST: PlugInManager: Loading PlugIn: /usr/lib/opencpn/libweather_routing_pi.so\\
-08:59:25 CEST: /usr/lib/opencpn/libweather_routing_pi.so\\
-API Version detected: 110\\
-PlugIn Version detected: 101
- -

-This example is from Linux. -

- -

-On Windows systems the location of the log file will be displayed when you click “Help” (the ? mark icon) on the toolbar. Alternatively, to find the “opencpn.log” on your system read OpenCPN Installation. -

- -
- - -
- - diff --git a/data/doc/plugins/install_linux_plugins.html b/data/doc/plugins/install_linux_plugins.html deleted file mode 100644 index 8899f8e7da..0000000000 --- a/data/doc/plugins/install_linux_plugins.html +++ /dev/null @@ -1,116 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:install_linux_plugins - - - - - - - - - - - - - - - - - - - - - -
- - - -

Install Linux Plugins

-
- -

-After releasing OpenCPN 4.0, the plugins are being migrated to the official OpenCPN PPA repository. -

- -
- -

Ubuntu / Debian

-
- -

-To configure the your system to use the official repository, follow the instructions at Ubuntu PPA -

- -

-After adding the repository, you can use the Software Center to install the OpenCPN plugins as any other software package or use the command line tools -

- -

-sudo apt-get update
- -sudo apt-get install opencpn-plugin<PLUGIN_NAME>
-

- -

-where <PLUGIN_NAME> is the name of the plugin. For example, to install the WMM plugin, the complete commad will be: -

- -

-sudo apt-get install opencpn-plugin-wmm -

- -
- -

Note for the users who previously installed the plugin packages manually

-
- -

-Unfortunately, the new packages conflict with the plugins downloaded originally from opencpn.org. To resolve the conflict, either uninstall the plugin before using the version from the PPA or open the Terminal and use the following command to install a plugin: -

- -

-sudo apt-get -o Dpkg::Options::=“–force-overwrite” install opencpn-plugin-<PLUGIN_NAME>
- -

- -

-where <PLUGIN_NAME> is the name of the plugin, for example to install the WMM plugin, the complete command will be: -

- -

-sudo apt-get -o Dpkg::Options::=“–force-overwrite” install www-plugin-wmm -

- -
- -

Fedora / CentOS

-
- -

-yum install opencpn-plugin-<PLUGIN_NAME> -

- -
- - -
- - diff --git a/data/doc/plugins/navigation.html b/data/doc/plugins/navigation.html deleted file mode 100644 index e744df99bc..0000000000 --- a/data/doc/plugins/navigation.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:navigation - - - - - - - - - - - - - - - - - - - - - -
- - - -

Navigation

-
- -

-World Magnetic Model (Included Plugin)
- -A plugin to display the magnetic variation, based on the World Magnetic Model. -

- -

-Celestial Navigation (view online)
- -Plugin to record Sextant Sights and show Circles of Position to obtain a Fix -

- -

-Route Great Circle (view online)
- -A short introduction to to the Great Circle part of the Route Plugin. Route Plotting, Great Circle routes, Limited Circle Routes and Rhumb lines. -

- -

-DR Dead Reckoning (view online)
- -Add DR positions to a GPX file exported from OpenCPN -

- -

-sQuiddio (view online)
- -Global user-sourced and user-maintained repository of sailing destinations (marinas, anchorages, yacht clubs, docks, fuel stations etc.) available as waypoints in OpenCPN through a plugin. -

- -

-Google Earth**
- -Links a Google Earth satellite image to the area of chart being explored. -

- -

-GE2KAP (view online)
- -(a companion piece of software, not a plugin)
- -Use GE2Kap to create Kap files which can be overlaid on Charts -

- -

-ODraw 1.4 (Ocpn Draw) (view online)
- -Drawing tools, Boundaries, EBL & VRM, link to Watchdog for keep in & out alarms. -

- -

-oTCurrent (view online)
- -Display tidal current arrows for times other than the present -

- -
- - -
- - diff --git a/data/doc/plugins/navigation/googleearth.html b/data/doc/plugins/navigation/googleearth.html deleted file mode 100644 index 3cc8b15f62..0000000000 --- a/data/doc/plugins/navigation/googleearth.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:navigation:googleearth - - - - - - - - - - - - - - - - - - - - - -
- - - -

GoogleEarth

-
- -
- -

**Windows ONLY**

-
- -
- -

Installation

-
- -

-Windows: Use the latest installer here. -

- -
- -

Source Code

- - -

Cruisers Forum

- - -

Documentation

-
- -
- - -
- - diff --git a/data/doc/plugins/plugin_messaging.html b/data/doc/plugins/plugin_messaging.html deleted file mode 100644 index 0ed779e033..0000000000 --- a/data/doc/plugins/plugin_messaging.html +++ /dev/null @@ -1,228 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:plugin_messaging - - - - - - - - - - - - - - - - - - - - - -
- - - -

Plugin Messaging

-
- -

-Between ODraw, Watchdog and Weather_routing. -

- -

-OpenCPn Draw and Watchdog -

- -

-User aspects -

- -

-First of all, we should see OD and WD as separate plugins. In OD you can draw geo-referenced objects (lines, points, straight lined areas and circles). WD knows when and how to sound alarms. -

- -

-In OD, a graphical indication (crosshatching or shading) may be added to areas, to indicate whether these are intended to avoid (crosshatched inside) or to stay within (crosshatched outside), or whatever other meaning you want to give to those graphical indications. -

- -

-In WD you can select whether (certain types of) alarms should react only for areas that are flagged (in OD) as to avoid or to stay within, or for all areas. On top of that, in WD you can indicate whether this should be done only for areas labeled in OD as active, or inactive, or both. -

- -

-The WD Boundary Alarm has 4 different types: -

- -

-1. Alarm when approaching an area from outside (based on distance);
- -2. Alarm when approaching an area from outside (based on time);
- -3. Alarm to indicate whether your boat is inside or outside an area (Inclusion Alarm, another type of anchor alarm);
- -4. Alarm to indicate whether AIS objects are present in an area. -

- -

-For the first two alarms the WD uses the same terms for the boundary that OD does as well as allowing a check for the state of the boundary. The third alarm only looks at a specific boundary which is identified by the boundaries GUID. The fourth alarm specifies a boundary to check if an AIS target is inside it. -

- -

-Beside the 4 types of Boundary Alarms mentioned above, WD has the following alarm functionality: -

- -

-1. Alarm when approaching coastlines (Landfall Alarm; 2 types: time and distance)
- -2. Alarm when NMEA-data stream stops (NMEA Alarm)
- -3. Deadman Alarm
- -4. Alarm when distance to reference position exceeds a set value (Anchor Alarm)
- -5. Alarm when course over ground deviates more than set (Course Alarm; 3 types: only port deviation, only starboard deviation or a general deviation);
- -6. Alarms when speed deviates more then set (Speed Alarm; two types: overspeed for more than set maximum, and underspeed for less than set minimum). -

- -

-In total there are 14 different types of alarms. -

- -

-Technical aspects -

- -

-WD and OD are independent plugins. OD knows about drawing geo-referenced objects, WD knows how to sound alarms. Now the two can work together by passing and receiving messages, in this case JSON messages (basically a text string of elements and values). -

- -

-For the alarms, when WD needs boundary information, WD asks OD, via a message, whether a Lat/Lon is inside a boundary. WD can add further requirements asking for boundaries in a particular state and a particular type. Both the state and type are the same as what OD uses, i.e. Active/Inactive and Exclusion/Inclusion/Neither, or the inclusive “Any” (meaning any type and/or any state, not being as selective). -

- -

-In OD the boundaries checked are both an OD Boundary and an OD Boundary Point with range rings showing. Boundaries and Boundary Point Range Rings are both considered boundaries. The type of boundary applies to both, but the state (active/inactive) currently only applies to Boundaries, not Boundary Points. This is because there is currently no state for a Boundary Point. This may change in future updates to the plugins for consistency. -

- -

-When OD completes its check of Lat/Lon inside boundaries it replies with a single message containing the first boundary that the Lat/Lon is inside AND which matches the type and state requested. The response message contains the Name, Description, GUID, Type and State of the boundary found. -

- -

-WD uses the returned message to decide whether to sound the alarm and uses some of the information in the messages that are then displayed to the user, i.e. a change in text in the watchdog window and a message box, if requested. -

- -

-Messaging in OCPN is synchronous, broadcast such that every plugin that registers for messages and the main program, OpenCPN, will receive every message sent. All processing of messages is synchronous, i.e. each plugin has to process each message completely and return to OCPN (the controller) before the next plugin can process the message. For the WD/OD message stream WD sends a message to OD, OD processes the message and sends a response message to WD, WD mainline processes the response message and stores the information, then returns control to OD which then returns control to WD at the point that WD created the first message. Now WD can process the saved information from OD, and the controller, OpenCPN can process the next message. -

- -

-OD messages can be used by any plugin and OCPN itself to obtain information. For the OD messaging there is a “structure” for the content of the message, specifying the source requester, the type of message (Request/Response), the message i.e. FindPointInAnyBoundary, the message id (may contain an identifier for the source requester) and then the message contents, i.e. Lat, Lon, Type, etc. -

- -

-So a request looks like: -

- -

-Source: “WATCHDOG_PI”
- -Type: “Request”
- -Msg: “FindPointInAnyBoundary”
- -MsgId: “distance”
- -lat: 54.0001
- -lon: -30.1001
- -BoundaryType: “Exclusion”
- -BoundaryState: “Active” -

- -

-This message is then given a “destination”, in this case “OCPN_DRAW_PI”, when the call to the OCPN messaging process is made. -

- -

-The response will look like: -

- -

-Source: “OCPN_DRAW_PI”
- -Type: “Response”
- -Msg: “FindPointInAnyBoundary”
- -MsgId: “distance”
- -GUID: “62ec7520-b58f-4087-b077-ae1c581dfec1”
- -lat: 54.0001
- -lon: -30.1001
- -Name: “Rocks”
- -Description: “Good fishing”
- -Found: false
- -BoundaryObjectType: “Boundary”
- -BoundaryType: “Exclusion” -

- -

-This message is then given a destination of the originator, in the case above “WATCHDOG_PI”, when the call to the OCPN messaging process is made. -The “destination” is used so that each recipient of the broadcast message can easily check if the message is meant for it. There is no filtering provided by OCPN messaging on this value. -

- -

-Using this construct there are validation checks to make sure messages are valid to process. If they are not valid there will be error messages entered into the opencpn.log file with relevant information. -

- -

-Currently this message construct is used by OD, WD, WR and the AIS processing in OCPN when it broadcasts AIS information to OCPN and the plugins. In some cases there is no response message expected, i.e. AIS just sends messages, but in others the response is important. -

- -

-OD is not concerned where the message came from or why, it will just respond to message requests with what is found from inspection of OD objects. WD just wants to know if it should sound an alarm or not, so it sends message requests to OD to determine certain conditions. WR just wants to know if the current Lat/Lon is valid for further processing or not, so it sends message requests to OD to determine certain conditions. AIS just provides information on each target it is dealing with. -

- -

-Now the check frequency in the WD alarm screen determines how often to check for a Lat/Lon being in a boundary. One other item which should be mentioned, is that for each boundary check based on time there are up to 11 Lat/Lon messages sent to OD, for each distance check there are up to 163 Lat/Lon messages to OD. Therefore the amount of this message traffic is something to watch. -Please note that a JSON message does not have a “structure” per se, the message consists of element/value pairs written as delimited strings. The elements can occur in any order. So “structure” in the sense used in this document really refers to required elements. -

- -
- - -
- - diff --git a/data/doc/plugins/weather.html b/data/doc/plugins/weather.html deleted file mode 100644 index e6b125e510..0000000000 --- a/data/doc/plugins/weather.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - opencpn:opencpn_user_manual:plugins:weather - - - - - - - - - - - - - - - - - - - - - -
- - - -

Weather

-
- -

-Grib Weather (Included Plugin)
- -Plugin to display Grib weather data files. Included in the OpenCPN installation. -

- -

-Weatherfax (view online)
- -Read weather fax encoded data as audio or image and Overlay on top of charts. -

- -

-IACfleet (view online)
- -IAC Fleet Code visualizes the encoded data issued as part of the weather bulletins. The IAC Fleet Code provides size effective encoded synoptic charts for several areas of the world, especially useful with slow and limited connection to the Internet. Coverage areas: -

-
    -
  • South Pacific weather issued by Fiji Meteorologica Service in Nadi and available from Saildocs
    -
  • -
  • Weather over Brazil and adjacent parts of Pacific and Atlantic oceans, including direct download of the data from the Internet
    -
  • -
  • Weather analysis and 24 hour forecast for North Atlantic and Europe issued by NOAA, including direct download of the data from the Internet.
    -
  • -
- -

-Climatology (view online)
- -Manage and view monthly gridded climate data. -

- -

-Weather Routing (view online)
- -Establish an estimate of optimal weather routing using Grib Plugin and Climatology. For additional information about weather routing see the QtVLM page (view online) -

- -
- - -
- - diff --git a/data/doc/terminology.html b/data/doc/terminology.html deleted file mode 100644 index 3da333e81a..0000000000 --- a/data/doc/terminology.html +++ /dev/null @@ -1,366 +0,0 @@ - - - - - opencpn:opencpn_user_manual:terminology - - - - - - - - - - - - - - - - - - - - - -
- - - -

Terminology

-
- -
- -

List of Definitions and Terminology

-
- -
- - -
- -

-Vector, n. Any quantity, such as a force, velocity, or acceleration, which has both magnitude and direction, as opposed to a SCALAR which has magnitude only. Such a quantity may be represented geometrically by an arrow of length proportional to its magnitude, pointing in the given direction. [Dutch: vector] -

- -

-Velocity, n. A vector quantity equal to speed in a given direction. [Dutch: snelheid (in een bepaalde richting)] -

- -

-North, n. The primary reference direction relative to the earth; the direction indicated by 000° in any system other than relative. True north is the direction of the north geographical pole; magnetic north the direction north as determined by the earth’s magnetic compass; grid north an arbitrary reference direction used with grid navigation. [Dutch: noord, noorden, N] -

- -

-True North, The direction of the north geographical pole; the reference direction for measurement of true directions. [Dutch: ware noorden, Nw] -

- -

-Variation, n. 1. The angle between the magnetic and geographic meridians at any place, expressed in degrees and minutes east or west to indicate the direction of magnetic north from true north. The angle between magnetic and grid meridians is called GRID MAGNETIC ANGLE, GRID VARIATION, or GRIVATION. Called MAGNETIC VARIATION when a distinction is needed to prevent possible ambiguity. [Dutch: variatie, var] -

- -

-Magnetic North. The direction indicated by the north seeking pole of a freely suspended magnetic needle, influenced only by the earth’s magnetic field. [Dutch: magnetische noorden, Nm] -

- -

-Deviation. , n. 1. The angle between the magnetic meridian and the axis of a compass card, expressed in degrees east or west to indicate the direction in which the northern end of the compass card is offset from magnetic north. Deviation is caused by disturbing magnetic influences in the immediate vicinity of the compass. Semicircular deviation changes sign (E or W) approximately each 180° change of heading; quadrantal deviation changes sign approximately each 90° change of heading; constant deviation is the same on any heading. Deviation of a magnetic compass after adjustment or compensation is RESIDUAL DEVIATION. Called MAGNETIC DEVIATION when a distinction is needed to prevent possible ambiguity. [Dutch: deviatie, dev] -

- -

-Compass North. The direction north as indicated by a magnetic compass; the reference direction for measurement of compass directions. [Dutch: kompasnoorden, Nk] -

- -

-NOTE:
- -Variation is the same as Declination See NOAA Geomagnetism and
- -“Declination” (magnetic affects of the world) should not be confused with “Deviation” (magnetic effects of the ship). That is the reason we are using the word Variation exclusively, as Bowditch does, for clarity and lack of confusion. -

- -
- -

Nautical Acronyms

-
- -

-Definitions
- -The definitions below are for those terms commonly used in instrument systems and navigation. The abbreviations shown are those more commonly used and may vary from one manufacturer to another. The definitions likewise may vary.
- -
- -Route (RT)- A route is a predefined path or passage from one point to another. Routes generally use a series of Marks or Waypoints at each course change. Waypoiints are Location Markers with specific Longitude and Latitude. The Route Legs between the Waypoints each have a specific Course and Distance.
- -
- -Waypoint (WPT) - A waypoint marks a specific location, coordinates, or Latitude and Longitude, often determined by GPS. A Waypoint could be considered the ending point of a Leg.
- -
- -Isochrones - While calculating a Weather Routing the plugin will calculate the location of the boat for a given time interval (eg: 1 hr, 4hr, 6 hr or 12hr ) and an isochrone represents how far the boat willl sail in a given direction, based on the weather and boat conditions, for each successive time interval. Isochrones are like contour lines around the starting point. Think of them as showing an intermediate destination, and the calculated distancee traveled.
- -
- -Apparent Wind (AW) – Apparent wind is the wind as it would be perceived if one were standing on the deck of a boat that was subject to movement by; a) The movement of the boat within a body of water. (caused by some form of propulsion; sails, engine etc) and b) The movement of the body of water itself (caused by currents, tides etc.). Apparent Wind is relative to the boat.
- -
- -Apparent Wind Angle (AWA) – Wind angle relative to the bow in degrees to port or starboard of the Heading, as measured by the onboard wind instrument. -
- -Apparent Wind Speed (AWS) – Wind speed relative to the boat as measured by the onboard wind instrument
- -
- -Average Speed (AVS) – Average Boat Speed through the water. (Trip Log / Trip Time)
- -
- -Bearing to Waypoint (BTW) – Compass bearing to active waypoint measured from the current position.
- -
- -Bearing Waypoint to Waypoint – Compass bearing to a waypoint measured from the previous waypoint.
- -
- -Boat Position (POS) – Latitude and Longitude of the boat
- -
- -Boat Speed (BSP or STW) – Sometimes called Speedo Speed of the boat through the water as measured by the onboard speed transducer.
- -
- -Compass Course (CC) - The course steered from the magnetic compass using adjustments for True, Variation and Magnetic Deviation values. True-Variation-Magnetic-Deviation-Compass (TVMDC) values. -
- -Course (CRS) – Compass direction that the boat is moving through the water (HDG + Leeway). Note that the difference between CRS and COG is Current. CRS does not include the effect of current.
- -
- -Course to Steer (CTS) - The course to steer to offset the effect of currents, wind and other factors.
- -Speed to go (STG) -
- -
- -Course Over Ground (COG) – Actual Compass direction that the boat is moving over the surface of the earth. (HDG + Leeway + Current) “The actual course you are moving along at the moment relative to the fixed land, meaning actual direction you travel regardless of the course steered and temporary variations in heading around this course. Things that cause COG to differ from heading include: current, leeway, poor helmsmanship, or compass errors.” Often derived from GPS.
- -
- -Speed Over Ground (SOG) - The speed actually achieved which includes the effect or current set (direction) & drift (speed), wind and leeway and helmsman errrors. Same as SMG. Often derived from GPS.
- -
- -Course Made Good (CMG) - Is the course actually steered which includes the effect of current set (direction) & drift (speed), wind and leeway and helmsman errrors. Note we distinguish COG (course over ground) from cmg (course made good), as one being present dynamic value, and the other being past. The phrase “course made good,” can be used to refer to a single track line or to the combination of several course changes between two points. If i sailed 1 mile north and 1 mile east, i made good a course of 045. Or, if i tried to sail course 200 but was being set between 10 and 20°, then i might end up “making good a course” of say 214. The distinctions between terms is not often critical, but may help to clarify some communications.
- -
- -Speed made good (SMG) - The speed actually achieved which includes the effect or current set (direction) & drift (speed), wind and leeway and helmsman errrors.
- -
- -Cross Track Error (XTE) – The perpendicular distance from the direct route (rhumb line or great circle) between two waypoints to the current position of the boat (POS)
- -
- -Dead Reckoning, also Ded Reckoning (DR) - Dead reckoning is the process of determining one’s present position by projecting known or estimated course(s) and speed(s) from a known past position, or predicting a future position by projecting known or estimated course(s) and speed(s) from a known present position. The DR position is only an approximate position.
- -
- -Drift (DFT) – Speed that the water is moving. This movement may be caused by a number of factors, including; tide, ocean currents, river flows etc.
- -
- -Electronic Chart Display & Information System (ECDIS) – An ECDIS is a computer-based navigation information system that complies with International Maritime Organization (IMO) regulations and can be used as an alternative to paper nautical charts. IMO refers to similar systems not meeting the regulations as Electronic Chart Systems (ECS)
- -
- -Electronic Navigational Chart (ENC) - An ENC is an official database created by a national hydrographic office for use with an ECDIS. An ENC must conform to standards stated in the International Hydrographic Organization (IHO) Special Publication S-57 before it can be certified as an ENC. Only ENCs can be used within ECDIS to meet the International Maritime Organisation (IMO) performance standard for ECDIS. -
- -Ground Wind - (GW) Ground Wind the wind as it would be perceived if one were standing on land. For those on the water, it might be considered as the wind that is perceived when anchored or moored. Ground Wind readings assume that there is no movement of the boat in relation to the earth. Ground Wind is used in weather forecasts and reports.
- -
- -Ground Wind Direction (GWD ) or (TWD)- Compass direction from which the wind is coming over the surface of the earth. Commonly known as True Wind Direction in the US.
- -
- -Ground Wind Speed (GWS) or (TWS) - Wind speed over the surface of the earth. Commonly known as True Wind Speed in the US.
- -
- -Heading (HDG, HDT, HDM) - Compass direction in which the boat is pointed. The abbreviations HDT and HDM are typically used to distinguish between heading degrees true and heading degrees magnetic, whereas HDG does not infer either a true or a magnetic heading. Whether HDG displays true or magnetic values, will depend on sensor selection and system setup.
- -
- -Heel (HEL)– Heeling Angle in degrees of the port/starboard inclination of the boat. Heeling angle is associated with the boat's lateral movement, or Leeway
- -
- -Layline – Theoretical COG that will be achieved if the current conditions (TWD, TWS, TWA, SET, DFT, BSP, HEL etc), remain constant. There are port and starboard laylines that represent port and starboard tacks (or gybes). There are boat laylines, which emanate from the boat, and waypoint laylines, which emanate from the active waypoint. They are used to indicate when it is beneficial to tack or gybe.
- -
- -Leeway – Leeway is the angle between the HDG and the CRS and results from the lateral movement experienced by the boat as she moves forward through the water.. The empirical formula is that
- -Leeway = -1 * k * Heel / BSP^2. The formula itself is often called into question, especially with planning hulls. The k value, which is boat specific, will vary according to crew numbers and boat loading.
- -
- -Log (LOG) – Record of distance travelled
- -
- -NMEA National Marine Electronics Association has several standards NMEA0183 and NMEA2000. Nmea2000 uses manufacturer PGN's. Two Links for Nmea 0183 NMEA0183 Sentencesand NMEA0183 Revealed
- -
- -Set (SET) - Compass direction of moving water (In the direction of the moving water). This movement may be caused by a number of factors, including; tide, ocean currents, river flows etc.
- -
- -Speed Over Ground (SOG) - Speed that the boat is moving over the surface of the earth or ground.
- -
- -Speed Polars – Theoretical values for maximum BSP for a range of given TWSs and TWAs.
- -
- -Target (Boat Speed) – (BSP) Theoretical values for TWA and BSP for a range of given TWSs that result in the highest VMG. It is derived from the Speed Polars.
- -
- -Track (TRK) – A record of the ships position as it proceeds on its voyage.
- -
- -True Wind (TW) - True Wind is the wind that would be perceived if there was no movement of the boat through the water. It represents the wind perceived by an object stationary in the water, but moving with the tide or current. The wind felt by a stick floating down a river for example.
- -
- -True Wind Direction (TWD) - Compass direction from which the wind is coming over the surface of the water. Sometimes called “Ground” Wind, not relative to the boat.
- -
- -True Wind Angle (TWA) - Wind angle relative to the bow in degrees to port or starboard of CRS
- -(some instrument systems do not consider leeway in the calculation of TWA and in this case TWA is the wind angle relative to the bow in degrees to port or starboard of HDG).
- -
- -True Wind Speed (TWS) - Wind speed over the surface of the water.
- -
- -Velocity Made on Course (VMC) – Speed achieved directly toward the active waypoint. The value of VMC changes the longer the tack. VMC decreases the greater the angle to the mark, until on the layline where it turns to “0” and then starts getting negative because the distance from the mark is increasing.
- -
- -Velocity Made Good (VMG) – Speed achieved directly towards, or away from, the TWD. The average value of VMG is an indicator of optimum sailing angle, and should be used as a general indicator, however the skipper should be using Target Boat speed to sail at the optimum tacking angel.
- -
- -Estimated Time of Arrival (ETA)
- -
- -Time to go (TTG)
- -
- -Tacking Time to Destination (TTD) Calculates in advance how long it will take to tack (or jibe) a sailboat to a particular destination in particular wind conditions, including factors such as wind changes, currents, waves, boat polars, sail and boat bottom conditions. An approximation of performance. [From Sailtimer documents].
- -
- -[Editor's Note: ETA is not an accurate way to judge progress or performance in a tacking sailboat because it does not account for the greater distance sailed between waypoints. VMC (to Waypoint or Course) changes the longer the tack is (VMG decreases dramatically as the boat gets to the 'layline' for the mark, because of the increased angle from the mark) and VMG (to Wind) has similar problems because it is not relative to a destination. So these terms are not effective. Tacking performance is commonly judged by using Target boat speeds now. TTD Tacking Time to Destination may also provide a better measure of performance than ETA and VMG.]
- -
- -

-
- -

-
- -AWA Apparent Wind Angle
- -AWD Apparent Wind Direction
- -AWS Apparent Wind Speed
- -TWA or GWA True Wind Angle or Ground Wind Angle (same value)
- -TWD or GWD True Wind Direction or Ground Wind Direction (same value)
- -TWS or GWS True Wind Speed or Ground Wind Speed (same value)
- -VMC Velocity Made Good (to Waypoint, course)
- -VMG Velocity Made Good (to Wind)
- -POS Boat Position
- -SPD Boat speed thru the water
- -SOG Speed over ground -Gps
- -COG Course over ground (Includes the effect of HDG + Leeway + Current) -Gps
- -CRS Course - Compass direction that the boat is moving through the water (Includes effect of HDG + Leeway).
- -Track
- -HDG Heading Compass direction in which the boat is pointed.
- -HDT Heading Compass True direction in which the boat is pointed.
- -HDM Heading Compass Magnetic direction in which the boat is pointed.
- -DFT Drift -Speed that the water is moving.
- -SET Compass -Direction water is moving towards
- -Leeway Angle between the HDG and the CRS
- -LOG Record of distance travelled
- -XTE Cross track error
- -ETA Estimated time of Arrival
- -TTG Time to Go
- -BSP or Target Boat Speed for various points of sail in various winds for optimal performance.
- -TTD Tacking time to Destination -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons.html b/data/doc/toolbar_buttons.html deleted file mode 100644 index ed30d07a9a..0000000000 --- a/data/doc/toolbar_buttons.html +++ /dev/null @@ -1,282 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons - - - - - - - - - - - - - - - - - - - - - -
- - - -

TOOLBAR Buttons

-
- -

- -

- -

-The Toolbar is floating and can be placed anywhere on the screen, vertical or horizontal. Note the “grabber” symbol at the far right side of the toolbar. Use this handle to drag the toolbar wherever you want it. The default position is horizontal and docked top left. It snaps to the edges. Right click on the grabber and a cross will appear. Left click on the cross and the toolbar shifts its orientation, to vertical or horizontal format. Right click on the cross to return to the grabber. On Windows (at least), unless in OpenGL display mode, the toolbar dims down transparently until you roll over it. -

- -

-There are three different styles of Toolbars to choose from. Go to the ToolBox?“User interface”? “Toolbar and Window Style” and select one of the following styles: -

- -

-Traditional -

- -

- -

- -

-Journeyman -

- -

- -

- -

-Journeyman Flat -

- -

- -

- -

-There are a lot of buttons available in the standard Toolbar, even more, counting the many plugins. To control exactly which buttons to display, hold the cursor over any button and right-click. This dialog pops up. -

- -

- -

- -

-Only the buttons with a ticked box will be displayed. The available shortcuts are also shown in parenthesis to the right of the button description. -

- -

-The MOB button is special. If unticked, you will get these choices: -

- -

- -

- -

-#1: The MOB button will still be there, but anyone (crew?) may later hide it. -

- -

-#2: If OpenCPN is used to handle a MOB situation, choose this option. The MOB button will always be there. It is not possible to change the state as long as OpenCPN is running. The MOB button option will not even appear in the right-click menu. To reset this option open the opencpn.ini(config) file and change the value below from “1” to “0”. Restart and all the options are once again available. -

-
[Settings]...PermanentMOBIcon=1
- -

-#3: Use this option if a MOB situation is handled by other means, and OpenCPN is not a part of the standard operational MOB procedure. -

- -

-If the MOB button is visible, it will always be the button furthest to the right. This way it's always easy to find in bad light etc. -

- -

-The visibility of the plugin buttons is controlled in the ToolBox?Plugins Tab, by pressing the Enable/Disable toggle button. -

- -

-Note that the Toolbar must have at least one active button. -

- -

- -

- -

-When a toggle button is pressed, it changes and becomes darker, Traditional style also adds a stronger outer frame. For example, tracking off , tracking on . -

- -

-A brief explanation of the use of each button is available by just hovering with the cursor over a button. -

- -

-Traditional Style (from left to right) : (For translation to other styles, check the buttons just below the Traditional in the above pictures.) -

- -

-Zoom In (Zooming ) -

- -

-Zoom Out (Zooming) -

- -

-Scale Next Chart Down (Scaling Charts)1 -

- -

-Scale Next Chart Up (Scaling Charts)1 -

- -

-Create Route (Create Route) -

- -

-Find/Follow Boat. Toggles on/off. (Auto Follow and Display Orientation) -

- -

-Launch Toolbox (Options Setting) -

- -

-Show/Hide Text Labels on Vector Chart. (Vector Display) -

- -

-Show/(Attenuate less critical Targets3 )/Hide AIS Targets2 (AIS) -

- -

-Show/Hide Currents On Chart (Tides and Currents) -

- -

-Show/Hide Tides On Chart (Tides and Currents) -

- -

-Print. Prints your current view, using a simple dialog. -

- -

-Route/Track/Waypoints/Layer- Manager. (Route & Mark Manager) -

- -

-Toggle Track On/Off (Ship Track) -

- -

-About OpenCPN and Help File (Helpand Getting Started) -

- -

-Adjust Screen Brightness for Dawn/Dusk and Night viewing. (Night Navigation) -

- -

-Show/Hide the Dashboard Plugin (Dashboard//) -

- -

-Show/Hide the Grib Overlay Plugin (Grib Weather//) -

- -

-World Magnetic Model (WMM) -

- -

-Drop Man Over Board marker (Man OverBoard) Always the far right Button. -

- -

-More Buttons may be present if certain Plugins are activated. See the Documentation for Install and Enable Plugins -

- -

- -

- -

-A separate GPS status and Chart Orientation Status is normally in the upper right corner of the display, unless the floating ToolBar covers this position. Then the “Status-bar” will be moved to the lower left corner, were it will stay, unless the main ToolBar is moved to cover this position, in which case the “Status Bar” goes back to the default position. -

- -

-Course Up/North Up2 (Display Orientation) -

- -

-GPS status2 (GPS Status) -

- -

- No GPS data or position not available. -

- -

- GPS fix, GPS position known and good for navigation. Sat count not available. -

- -

- Active/Valid GPS data + GPS reporting 1 - 4 satellites. -

- -

- Active/Valid GPS data + GPS reporting 5 - 9 satellites. -

- -

- Active/Valid GPS data + GPS reporting 10+ satellites. -

-
- -

-1. These icons are grayed out when only CM93 vector charts are available, as the feature is not applicable to that format.
- -2. These icons change, depending on status. -

- -

-3. Option available if activated in AIS settings. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ais.html b/data/doc/toolbar_buttons/ais.html deleted file mode 100644 index 9dcd915d0d..0000000000 --- a/data/doc/toolbar_buttons/ais.html +++ /dev/null @@ -1,1060 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ais - - - - - - - - - - - - - - - - - - - - - -
- - - -

AIS

-
- -

- - - - - - -

- -

-For a general introduction to AIS, Automatic Identification System is a good place to start, also AIVDM/AIVDO protocol decoding by Eric S. Raymond -

- -

-AIS Operating Controls
- -

- - -

-AIS Target Query
- -Aids to Navigation AtoN
- -AIS Update Rate
- -AIS Target List
- -AIS Transponder and Ownship
- -AIS data port
- -ToolBox AIS Tab
- -CPA Calculation
- -Lost Targets
- -Display
- -Attenuation of less critical targets
- -Rollover
- -To track or not to track
- -Treat WPL Sentences as APRS Postion Reports
- -Toolbox MMSI Tab
- -When exactly is an alarm activated
- -AIS Target Quick Graphic References
- -

- -

-The screen-dump below gives you a first feel for how AIS targets are presented and used in OpenCPN. -

- -

- -

- -

-The Look ahead mode is activated here and our own vessel is proceeding 352 deg at 13.8 kts, leaving an activated track behind, and projecting a dashed line ahead representing the course. This ends in a dot, that represents where we will be in 6 minutes, or 1.38 nautical miles ahead. -

- -

-We are meeting a vessel, steaming in the opposite direction following the traffic separation. This target also has a line and a dot in-front of it representing course and where it will be in 6 minutes(user configurable), and a track behind it. The red/yellow line terminated with two blue dots represents where the vessels will be at CPA –closest point of approach– or when the are nearest each other, with present courses and speeds. The meeting vessel is red, as it is a potential danger to us. An AIS target alert dialog has just popped up. -

- -

-There is a lot of information about the vessels that transmit AIS signals. -

- -

- -

- -

-The cursor is on top of the the meeting vessel on a SW course. As we have not yet received full information, which can take a while, we don't get the name but an id number, called the MMSI number, instead. Exactly what is shown in the yellow pop-up is configured in the AIS tabs Rollover heading. -

- -

- -

- -

-This vessel is identified by name, and has a green color, as it does not represent any danger to our navigation. -

- -
- -

AIS Operating Controls

-
- -

-The Menubar-AIS and Toolbar-AIS provide useful operating controls of key AIS parameters which may need to be adjusted during use. -

- -

-MenuBar> AIS Dropdown -

- -

- -

- -

- To turn on the Menubar use Options> User Interface> Show Menubar \ -

- - -

-These Menubar > AIS Dropdown controls work together for quick access: -

-
    -
  • Show AIS Targets=Options > Ships > AIS Targets > Display: Show AIS
    -
  • -
  • Hide Moored AIS Targets=Options > Ships > AIS Targets > Display: Suppress Anchored/Moored Targets…
    -
  • -
  • Attenuate Less Critical AIS Targets.. [Exception, see below]
    -
  • -
  • Show AIS Target tracks=Options > Ships > AIS Targets > Display: Show Target Tracks Length (min)
    -
  • -
  • Show CPA Alerts=Options > Ships > AIS Targets > CPA/TCPA Alerts: Show CPA/TCPA Alert Dialogs
    -
  • -
  • Sound CPA Alarms=Options > Ships > AIS Targets > CPA/TCPA Alerts: Play sound to CPA/TCPA Alerts…
    -
  • -
- -

-NOTE: Options > Ships > AIS Targets > Display: Check Attenuate Less Critical AIS Targets to enable it. Also when “Attenuate..” is unavailable, the Toolbar AIS Icon click rotation drops the selection for Attenuate all AIS targets. -

- -

-Toolbar > AIS -

- -

- -Toolbar AIS Icon Message (Clickable Rotation to change settings. Read the pause message.) -

-
    -
  • Attenuate Less Critical AIS Targets (if enabled under Options > Ships > AIS)
    -
  • -
  • Hide AIS Targets
    -
  • -
  • Show all AIS Targets
    -
  • -
  • Attenuate all AIS Targets (dropped in rotation if unchecked under Options > Ships > AIS Targets)
    -
  • -
- -
- -

AIS Target Query

-
- -

-What is an MMSI number? Maritime Mobile Service Identifier (MMSI) is a number identifying a ship in communication. MMSI consists of nine digits. All VHF units using Digital Selective Call (DSC), are programmed with the vessels MMSI. The same applies for AIS and EPIRBs. -

- -

-What is an IMO Number?International Maritime Organization (IMO) numbers are a unique reference for ships and for registered ship owners and management companies. -

- -

-They were introduced under the SOLAS Convention to improve maritime safety and security and to reduce maritime fraud. For ships, the IMO number remains linked to the hull for its lifetime, regardless of a change in name, flag, or owner.” From Wikipedia -

- -

- -

- -

-Instead of just hovering the cursor on an AIS object, double click, and the dialog above pops up. A lot of relevant information is displayed. CPA, Closest Point of Approach, to Ownship is 12.7 miles in 12 min 57s. More information about the target itself, is available on Internet address: -MarineTraffic -http://www.marinetraffic.com/ais/shipdetails.aspx?mmsi="MMSI number here", -

- -

-in this case: http://www.marinetraffic.com/ais/shipdetails.aspx?mmsi=233150000 -

- -
- -

Buttons in the Target Query Dialog

-
- -

-Create Waypoint drops a mark at the targets current position. -

- -

-Record Track/ Stop Recording Pressing the Record Track button brings up a new dialog. -

- -

- -

- -

-The recently recorded track of the “Poseidon Leader” will appear in the Route & Mark managers track tab on a line starting with “AIS Poseidon Leader…”. -

- -

-If the Yes button is pressed, the Target Query Dialog button Record Track changes to Stop Recording. All tracks recorded will behave just like any other track. -

- -

- -

- -

-Right-clicking an AIS target brings up a dialog focused on AIS. -

- -
- -

Aids to Navigation AtoN

-
- -

-More and more aids to navigation are equipped with an AIS transmitter, and show up as a target in OpenCPN like this -

- -

- -

- -

-Note the word “Real”, that says that this is an object that exists in reality. -

- -

- -

- -

-Here we have an AIS transmitter on a floating W Cardinal Mark. This is of course real and the buoy is on position. If the buoy is off position, for some reason, the Aton icon becomes red. -

- -

- -

- -

-There are also Virtual AtoNs marked with their own icon. -

- -

- -

- -

-Virtual AtoNs are used to quickly make mariners aware of things like new wrecks, uncharted hazards and floating debris. They are normally used for a short duration until replaced by real aids or charted, removed or dispersed. Virtual AtoNs are also used for information. For example, the position of the Italian Maritime Rescue Coordinating Center. Note the word “Virtual” in the dialog. -

- -

- -

- -

-Note: OpenCPN handles the situation where MMSI is set to 0 (zero). This can occur with an incorrectly configured AtoN. Nevertheless, all available information is shown. -

- -
- -

AIS Update Rate

-
- -

-How often is the AIS information updated from each target? The required update rates from an AIS target transmitter is shown below. -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Class A Class B
Static Data 6min6min
Dynamic Data < 3kn moored3min
upto 2kn10s3min
> 2kn 30s
< 14kn (turning)10s (3.33s)
< 23kn (turning)6s (2s)
> 23kn2s
- -
- -

AIS Target List

-
- -

- -

- -

-Another way to present the AIS information. The AIS target list is available through the right click menu. -

- -

-Sorting targets -

- -

-Click on the header in a column to sort according to this criteria. For example, clicking “Range” sorts the targets with the nearest target on top. Click one more time to get the target, furthest away on top. There is an “autosort” checkbox. When checked, auto sort is on. May be unchecked/rechecked any time. The autosort checkbox is automatically unchecked when target count exceeds 1000. However, it may be rechecked directly by the user, even if the target count is exceeded, and will stay checked. -

- -

-Active Search And Rescue Target (SART) and Digital Selective Calling (DSC) distress targets, will always stay at the top of the list, even when sorting. -

- -

-AIS targets with Lat > +/-85 deg will show brg “unavailable”. OpenCPN is not suited for Polar Navigation. * Target Info button: Click on a target to highlight it and then click the button to display the information dialog. -

-
    -
  • Center View button: Highlight a target an click this button and the screen will center on the target.
    -
  • -
  • Create WPT. Drop a waypoint at the current position of the target.
    -
  • -
  • Hide All Tracks If tracking is on in Options→Ships→Ais Targets, all tracks will disappear from the screen. Read more furher down this page.
    -
  • -
  • Show All Tracks Will reverse the previous option, and show all available tracks. If Options→Ships→Ais Targets is off, tracking will start for all targets.
    -
  • -
  • Toggle Track Reverse the tracking status.
    -
  • -
- -

-The Trk column in the list indicates current tracking status for each target. -

-
    -
  • AutoSort See “Sorting Targets” above, for an explanation of this box.
    -
  • -
  • Limit Range: The list will only show targets with a range less than, or equal to this value.
    -
  • -
  • Target Count: Total number of AIS targets.
    -
  • -
- -
- -

MMSIname.csv File

-
- -

-This file is a simple list with two columns, MMSI Number and Vessel Name. It is saved in your User file (Windows: C:\ProgramData\Opencpn\ ) near the opencpn.ini file. It is used to provide Vessel names that frequent your area because the vessel name is not sent or available all the time. -

- -

-Static data including vessel name, call sign, dimensions, etc., are sent once every six minutes. The MMSINAME.CSV exists to provide names for vessels sending AIS messages while your system has yet to receive the static data. -

- -

-MMSI numbers and names are added at the end of the file and not updated. Multiple entries can happen and may be caused by confusing configuration of the AIS transponders. Users experiencing performance issues can delete the MMSINAME.CSV file, when it had become too large. A new csv file will be created on receipt of the next MMSI. -

- -
- -

AIS Transponder and Ownship

-
- -

-OpenCPN does NOT show Ownship (i.e. AIVDO message) as an AIS target or in the target list. AIVDO is processed only in the main navigation thread. The only true way to monitor the output of a transponder, is with a separate AIS receiver. Earlier releases did show ownship, but this was a bug, simply an illusion. The earlier presence of AIVDO (ownship) information in the data stream, really only indicated that the transponder was turned on and received GPS signals. -

- -
- -

AIS data port

-
- -

-Select your AIS input port in the Connection Tab. The AIS button in the ToolBar, appears different according to the following conditions. -

- -

-The AIS toolbar tool cycles -with each mouse click as follows: (hover for next control action) -

-
    -
  • AIS show all targets (normal, default)
    -
  • -
  • AIS Scale non-critical targets. (Provided it has been enabled under Options > Ships > AIS Tab)
    -
  • -
  • AIS Hide all targets
    -
  • -
  • and back to AIS Show All targets.
    -
  • -
- -

-Also please refer to AIS Operating Controls above, under Toolbar > AIS Icon which shows how to change key AIS settings by pausing the mouse on the AIS Icon to view the popup message indicating how the AIS controls will change with the next click on the icon. These controls rotate or cycle with each click. -

- -

- AIS Alive. The default AIS button. This icon appears as soon as an AIS port is active in the tool-box. It is also the normal state with an AIS receiver working and with no targets of interest. -

- -

- AIS Alive and Activity, a small green circle will illuminate in the lower right corner of the Ais buton. If there is at least one AIS message every 4 seconds, the light will remain illuminated. -

- -

- AIS Suppressed. This icon indicates only that target suppression is activated in the AIS tab in the ToolBox. Referring to the picture above there are two sort of suppression: -

-
    -
  • Suppress display of all moored/anchored targets, max speed specified in dialog.
    -
  • -
  • Suppress Alerts for moored/anchored targets.
    -
  • -
- -

-This icon will be over-ridden with the AIS alarm button if an alarm is, or becomes, active according to the AIS tab alarms settings in the toolbox. -

- -

- AIS Alarm. A target exist that raises the alarm as defined in the AIS tab in the ToolBox. It is the three settings “CPA Calculations”, that rules if and when an alarm is raised. -

- -

- AIS Disabled. No targets, if available, are shown on the screen. This button toggles with the other buttons. For example, if the AIS alarm button is visible, click the button and it will change to the “AIS Disabled” button, and all targets, alarms etc, disappears from the display. Click again and the original button and AIS display comes back. -

- -

- Attenuate less critical Targets -

- -
- -

ToolBox AIS Tab

-
- -

- -

- -

- -

- -

-This tab controls the behavior of many things in the AIS display. There are no “best” settings. It all depend on where you are, what kind of navigation you are into and what kind of vessel you are on. It is your responsibility to evaluate this. -

- -
- -

CPA calculation

-
- -

-Rules for when the Closest Point of Approach- CPA (when two vessels are nearest each other) and the Time For Closest Point of Approach (TCPA) is calculated, and when warnings are activated. There are three tick boxes, which can be activated with user set values. -

- -
- -

No CPA Calculation if target range is greater than (NMi)

-
- -

- If the vessel is far away it is less interesting to calculate CPA. In a busy waterway this could cut down on clutter and processing speed if a reasonable value is set. -

- -
- -

Warn if CPA is less than(NMI)

-
- -

- Similar arguments to No 1. This controls when a warning for minimum CPA distance is given. A warning can be both on the screen and a sound. The CPA is shown on the screen when a warning is active. -

- -
- -

..and TCPA is less than (min)

-
- -

- This Box can only be activated if the previous box is active. If the minimum CPA is far in the future, it's not so interesting. If it's hours away, both vessels have probably changed speed and course in the meantime. Set TCPA to a reasonable value value depending on circumstances. A lower value if negotiating a busy waterway. A higher value when offshore. Many factors plays a role here. If you need to get off watch crew up on deck for a manuver, take this into account, for example. Do you find that you get to many useless alarms? Consider lowering this value and/or the CPA value. If a target is within the distance set in #1 and without an active warning, theCPA can be shown anyway through right-clicking on the target. -

- -

- -

- -
- -

Show Target CPA

-
- -

-Show Target CPA toggles with Hide Target CPA -

- -

-In Target CPA Details, a few more tricks are available. -

- -
- -

Lost Targets

-
- -

-Rules for how lost targets should be handled on the display. -

- -
- -

Mark Target as lost after (min)

-
- -

-Target is regarded as lost if no transmission are received for the number of minutes set here, the target will change on the display and have a black bar across. -

- -

- -

- -
- -

Remove lost targets after (min)

-
- -

-The lost target will be removed from the display after the number of minutes set here. -

- -
- -

Display

-
- -

-If and how a vessels course and speed should be displayed and if stationary vessels should be on the screen. -

- -
- -

Show target COG predictor arrow, length (min)

-
- -

-An arrow will be shown in front of the vessel representing it's COG (Course Over Ground). The length of this arrow and the dot at the end of it represents the calculated position in the number of minutes set here. Set easily calculated values. If a vessel approaches you doing 15 kts and the time is set to 6 minutes, the dot will be 1.5 nautical miles ahead of the vessel. -

- -

-The width of the “Target COG predictor arrow” can be adjusted in the opencpn.ini configuration file. Find the line below and adjust the value. -

-
AISCOGPredictorWidth=3
-Warning: Don't edit to the opencpn.ini (opencpn.conf) file when OpenCPN is running.
- -
- -

To track or not to track?

-
- -

-This choice below boils down to two basic scenarios. -

-
    -
  • All targets will be tracked, with the option of turning off tracks for selected targets.
    -
  • -
  • No targets will be tracked, with the option of starting to track selected targets
    -
  • -
- -

-The Target List Trk column indicates current tracking status of each target. -There is more about tracks in the section “AIS Target List” above. -

- -
- -

Show target tracks, length (min)

-
- -

-This is the basic setting that can be refined in the “AIS Target list”. With this box ticked targets are tracked even if they are not displayed. Start out with this option ticked, if you hesitate. Come back and fine tune the settings later on, if necessary. -

- -

-A track will be shown behind a target. This helps to judge the target vessels intentions. -

- -

- -

- -

-When “Show target tracks” is ticked, the context sensitive AIS menu changes to include the toggle option “Hide Target Track - Show Target Track”. -

- -

- -

- -

-When “Show target tracks” is NOT ticked, the context sensitive AIS menu changes to include the toggle option “Show Target Track - Hide Target Track”. A big difference, in this case, is that OpenCPN has no record of the track. The tracking will start from the moment “Show Target Track” is clicked. -

- -
- -

Suppress anchored/moored targets

-
- -

-“Suppress anchored/moored targets, speed max (kn)” A target will not be displayed if the speed is less than the value set. There are two exceptions to this rule, “Aids to Navigation (AtoN)” and “Vessels Not Under Command”. The rule is aimed at catching anchored or moored vessels. The “Navigational Status” is set by the ships and may not be correct. Be aware that the COG arrow will not be shown for any target with a COG less than this value, hence it's important to enter a very low value. -

- -
- -

Attenuation of less critical targets

-
- -

-“Allow attenuation of less critical targets if more than …targets [number]” If checked AND selected under “Menubar-AIS” or “Toolbar-AIS” then at least [number] of targets will be displayed normally. If unchecked then all AIS targets are displayed normally and this option is greyed out and unavailable. -

- -

- -

- -

-Note smaller attenuated green ship on lower left. -

- -

-“Attenuation of Less Critical Targets” will declutter the display without removing AIS targets from the display by reducing the size of less critical targets. Less critical targets are determined with a weighted rules filter. The important targets remain unchanged, including display of the ships name. Less critical targets are reduced in size and do not display ship name, to reduce clutter on the chart. -

- -
- -

Details for Attenuation of Less Critical Targets

-
- -

-The “importance” of a target depends on: -

-
    -
  • Speed of the target. Faster targets are more important (max speed acknowledged is hard coded at 12 knots).
    -
  • -
  • CPA. The closer a target will come the more important it is.
    -
  • -
  • TCPA. If the time to 'collision' is small the target is more important.
    -
  • -
  • Distance to the target. Far away is less important.
    -
  • -
  • Size of target. Larger targets are more important.
    -
  • -
  • Class B targets don't transmit ships size and is set to 0(zero).
    -
  • -
- -

-For each parameter above a factor is calculated. The highest value of this factor depends on the value in the config file. All these values are then added, which gives each target a 'weight'. -

- -

-From all AIS targets the top [number, say 10] targets which are most important, are displayed at full scale. Only [number, say 10] important targets are displayed, depending of the value in Options > Ships > AIS > Display: “Allow attenuation of less critical targets if more than …targets [number]“. The weighted importance is frequently calculated and as long as a target remains in the top [number, say 10], it will be displayed normally. -

- -

-The less critical targets are still displayed, but at reduced size. The size of the less critical targets can be adjusted with the -

-
[AISScaledSizeMinimal=50] 
- -

-setting in the config file, where 50 stands for 50%. Scaled down targets don't have names, no nav status symbols, and no heading line. -

- -
- -

Show Area Notices(from AIS binary messages).

-
- -

-More about Area Messages here. -

- -
- -

Show AIS targets real size

-
- -

-Zooming in on a target will eventually show a rectangle using the real size , if available. The picture below also shows how differences in course and heading are treated. -

- -

- -

- -
- -

Show names with AIS targets at scale greater than 1:

-
- -

-[select value] With this box activated…..this is what you get! -

- -

- -

- -

-Note that this setting also controls if a numerical value will be displayed alongside a tidal current arrow. -

- -
- -

Treat WPL sentences as APRS position reports

-
- -

-APRS (Automatic Packet Reporting System) is utilized by HAM radio operators around the world.The NMEA WPL sentence is shorthand for for “waypoint location”. If the box is checked,a WPL sentence will be assumed to be an AIS-like APRS target. Enable it on the AIS tab in the Toolbox if you have it disabled. WPL Sentences have the same functionality as AIS or radar targets (track recording, creating a permanent waypoint on current position etc.) -

- -
- -

Rollover

-
- -

-Tick the boxes for the kind of information shown when hovering with the cursor over a target. This is what you get with all the settings ticked. -

- -

- -

- -
- -

CPA/TCPA Alerts and DSC/SART Emergencies

-
- -

-When an alert is triggered, a jagged circle in red is drawn around the target that set off the alarm. Additional events can be set here, drawing more attention to the alarm. For practical navigation, make sure your alarm sound is set. -

- -
- -

Show CPA/TCPA Alert Dialog

-
- -

-Shows an alert dialog on the screen with target information when an alarm is triggered. This setting only applies to AIS CPA/TCPA alerts. A DSC/SART emergency will always generate a dialog. -

- -
- -

Play Sound on CPA/TCPA Alert Dialog

-
- -

-and DSC/SART emergencies. Sounds an alarm when an alarm is triggered. -

- -
- -

Supress alerts for anchored/moored targets

-
- -

-Don't show alarms for anchored and moored targets. -

- -
- -

Select Alert Sound

-
- -

-Select an alarm that suits you, instead of the installed default sound. This alarm will also be used if an anchor watch is set. Due to copyright issues, only a few sound files are included. The default location for these files are ”/usr/share/opencpn/sounds/” on Linux and typically C:\Program Files\OpenCPN\sounds on Windows XP. Users can add their own generic “.wav” sound files. These files can be in any suitable place in the file-system. -

- -
- -

Test Alert Sound

-
- -

-Test the selected sound and make sure this important feature is working. -

- -
- -

Enable Target Alert Acknowledge timeout

-
- -

-Once a target alert is acknowledged, wait the set number of minutes before the alert comes up again (if still applicable). -

- -
- -

Toolbox MMSI Tab

-
- -

- -

- -

-Read all about this tab here MMSI Properties -

- -
- -

When exactly is an alarm activated?

-
- -

-An alert is set off if your boat is approaching the CPA, the blue dot on the extension of the course line, and the previously discussed set of conditions are met. Once the distance to the CPA increases, this happens when the involved vessels has passed each other, the alarm stops, even if the other conditions still apply. -

- -

-One user noticed an alert every few seconds, yet the target was still green. The explanation is: Variation between alert status and ship icon color is due to rapid changes in target course/speed. The target color can change from red to green while the alert dialog is showing. This may happen so fast that the red icon is not actually seen. OpenCPN does not automatically cancel the alert dialog in this case, in order to not mask information. -

- -

-Types of Transponders recognized by OpenCPN -

-
    -
  • Class A
    -
  • -
  • Class B
    -
  • -
  • APRS Automatic Packet Reporting System Targets
    -
  • -
  • -
  • -
  • ATON Aid to Navigation, both “Virtual” and “Real”.
    -
  • -
  • BASE Base Station
    -
  • -
  • DSC Digital Selective Calling Targets
    -
  • -
  • GPSG_BUDDY GpsGate Buddy Targets
    -
  • -
  • SAR Aircraft Aircraft participating in Search and Rescue.
    -
  • -
  • SART Search and Rescue Transponder Targets
    -
  • -
- -
- -

MMSIname File

-
- -

-OpenCPN Remembers the names of seen and fully identified target. The names are cached internally and help identify targets quicker on next start. Targets not yet fully identified, where the name comes from the cache, are displayed in lime green. See example below. The AIS name caching can be turned off in the opencpn.ini/opencpn.config file by adding a line like this. -

-
[Settings]
-EnableAISNameCache=0
- -

-The name of the file where the list of previous MMSI and ship names are stored is “mmsitoname.csv” in case you would like to clear it. This file is in the same folder as your configuration file (Click the ? icon in the toolbar to see the location, it is platform dependent). -

- -
- -

MOB SART Alerts

-
- -

-|MOB SART Alert -

- -

-For MOB SART information see SART -

- -
- -

AIS Target Quick Graphic References

-
- -

-Note that AIS targets reporting position unavailable will be rendered in grey colour. -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Ais_Icon Informaton Ais_Icon Information
An active AIS SART and is a distress call equal to a “Mayday”transmission. More about AIS SART. ..The V-shape stern indicates a Class B target. Tugboats and pilot boats very often carry Class B transponders. These are often designed specifically for small commercial boats, fishing boats and pleasure crafts.
Icon displayed when testing an AIS-SART device.Targets is complying with the Euro AIS Inland specification.
Aircraft participating in Search and Rescue.This vessel has the “Inland Blue Flag” set, it's a part of the European, Inland AIS standard. The “Blue Flag” signal, commonly seen on inland waters, indicates that the vessel requests a “stbd-stbd” passage or crossing. This Blue Signal is manually switched on/off, by the target.
Potential Danger.Aton, Aid to Navigation, for example a Lighthouse or a Buoy with an AIS transmitter.
No Danger. Not Identified (Voyage data not received)Aton, Aid to Navigation, that is off it's suposed position. For example a buoy equiped with AIS that has come adrift.
No Danger. Not Identified (Name from cached data)Virtual Aton, Virtual Aid to Navigation, not a real marker. Can be useful for a range of situations. A new wreck, is one example.
No Danger. IdentifiedVirtual Aton, off position. Actually seen in the wild, but may be a user config error.
Lost TargetAIS Base Station
Ship which has lost fix - position unavailable. Displayed at the last known position. The following tagets only displays if DSC messages, GpsGate mesages, Radar or APRS messages are mixed in to the incomming AIS stream, by using, for example a multiplexer. More on the following pages.
Vessel not under command.DSC Station. Only the DSC message received. The position contains only degrees and minutes of Latitude and Longitude.
Vessel restricted in ability to manoeuvre.DSC Station. DSC and DSE messages received. The DSE message contains the missing decimals of minutes of Latitude and Longitude. The result is a much more accurate position.
Vessel constrained by draft.DSC Station transmitting a distress signal. Treat this as a “Mayday” call.
Vessel aground.GpsGate Buddy target.
Vessel engaged in fishing.ARPA Target
High Speed- and Wing In Ground- crafts. This includes Hydrofoils, Hovercrafts and low flying crafts utilising the ground effect.APRS Target
Anchored or moored. Displayed when the transmitted “Navigation status” is “at anchor” or “Moored”. There is no guarantee that this status is correct, as it is set manually on the transmitting ship……illustrated by this ship. Note the black line on the yellow circle. This indicates that the vessel is turning to port (left), also illustrated by the lag in the display update. ROT - Rate Of Turn is available in the “Ais Target Query” dialog, through the right click menu.
- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ais/area_messages.html b/data/doc/toolbar_buttons/ais/area_messages.html deleted file mode 100644 index 189abe6374..0000000000 --- a/data/doc/toolbar_buttons/ais/area_messages.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ais:area_messages - - - - - - - - - - - - - - - - - - - - - -
- - - -

Area Messages

-
- -

-To display the messages, tick the Options→Ships→AIS Targets→Show area notices(from AIS binary messages). -

- -

-Many countries around the maritime world are testing the AIS binary messages. Expect a lot of development in this area. -

- -

-In OpenCPN, this is very much a work in progress, the areas were only added April 2012 and the messages in December 2012. -

- -

-Areas and the messages included for each area, are available. -In the US, Cape Cod is transmitting experimental Right Whale information. For testing, copy vislab-ccom.unh.edu/ais/notices.aivdm into a text file and point the VDR (Voyage Data Recording) plugin to this file. -These messages are updated quite often. -

- -

- -

- -

-The area messages are found as the first entries in a normal object query for vectorcharts. The easiest way to display this dialog is to just double click in an area. The screen picture above shows that this works for RNC:s (raster charts) as well as ENC:s (vector charts). The first notice above is for the yellow tinted rectangular area while he second notice is for one of the circles outlined in green. -

- -

-An overview of available massages compiled by IALA. -IALA has agreed to maintain a collection of regional applications for the AIS Application Specific Messages that are in use. The intent is to provide an overview to all interested parties of what currently exists. -The overview of available messages is available here**. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ais/aton.html b/data/doc/toolbar_buttons/ais/aton.html deleted file mode 100644 index 74193e0260..0000000000 --- a/data/doc/toolbar_buttons/ais/aton.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ais:aton - - - - - - - - - - - - - - - - - - - - - -
- - - -

AtoN

-
- -
- -

Aids to Navigation

-
- -

-Shows all possible AtoN's. From top, Real or Synthetic and Virtual -

- -
- -

Real or Synthetic AtoN

-
- -

-iec_ais_aton_sym-real.jpg -

- -
- -

Virtual AtoN

-
- -

-iec_ais_aton_sym-virtual.jpg -

- -
- -

AtoN in Practice

-
- -

- -

- -
- -

Chart with Aton

-
- -

- -

- -
- -

AtoN Safewater

-
- -

->AtoN Safewater -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ais/dsc_buddy_via_ais.html b/data/doc/toolbar_buttons/ais/dsc_buddy_via_ais.html deleted file mode 100644 index ef4ebbcc60..0000000000 --- a/data/doc/toolbar_buttons/ais/dsc_buddy_via_ais.html +++ /dev/null @@ -1,148 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ais:dsc_buddy_via_ais - - - - - - - - - - - - - - - - - - - - - -
- - - -

DSC or Buddy via AIS.

-
- -

-If DSC or GPSGate Buddy-messages are available in an incoming NMEA 0183 data stream, OpenCPN will show them with their own icons, and they will show in the “AIS Target list”. They are not a part of AIS, but are displayed the same way, for convenience. -

- -

-DSC is used on all new VHF set (or should be!). More on Wikipedia. To use this feature, check that your VHF set outputs NMEA 0183, in a way that can be connected to OpenCPN. -

- -

-GPSGate is a commercial GPS tracking and sharing service. GPSGate Buddy Tracking is part of that service**. -

- -

-Make sure that Options–> AIS Targets –>“Play Sound on CPA/TCPA Alerts” box is ticked, otherwise the alarm sound (see below) will not be heard. -

- -

-If OpenCPN receives a DSC Distress call, an alarm will be triggered, both visually and by sound. -

- -

- -

- -

-A VHF/DSC distress call is treated in the same way as an AIS/SART call. Both should be treated as MAYDAY calls. -

- -

-Two different types of alerts. -DSC Distress alert, coming from a specific vessel, presumably by crew activating a switch on the transponder. These are occasionally seen as false alerts, for testing. For the second type look under AIS SART section. SART, which is a SearchAndRescueTransponder. The MMSI starts with 97….. and will have Class: SART. This might be from a -PLB (and PLB-AIS) on man overboard, for instance. PLB AIS devices are under the AIS SART type. -

- -

-Quick Reference -

- -

-DSC Station. Only the DSC message received. The position contains only degrees and minutes of Latitude and Longitude. -

- -

-DSC Station. DSC and DSE messages received. The DSE message contains the missing decimals of minutes of Latitude and Longitude. The result is a much more accurate position. -

- -

-DSC Station transmitting a distress signal. This is a “Mayday”. -

- -

-GpsGate Buddy target. -

- -

-A normal DSC target, is someone using a dsc-capable VHF -

- -

- -

- -

-Distress message via DSC, Digital selective Calling, from an unidentified AIS target. -

- -

-dsc_distress.jpg -

- -

-A green Buddy target on an island. -

- -

-gpsg_buddy.jpg -

- -

-The AIS Target List View -

- -

- -

- -

-Seven Green DSC Position Report Instances, Position displayed in yellow hover box -

- -

-dsc-7-instances.jpg -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ais/radar_targets.html b/data/doc/toolbar_buttons/ais/radar_targets.html deleted file mode 100644 index 7acb9e4f9d..0000000000 --- a/data/doc/toolbar_buttons/ais/radar_targets.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ais:radar_targets - - - - - - - - - - - - - - - - - - - - - -
- - - -

Radar Targets

-
- -

-3.3 Beta feature.
- -Some radars are able to create NMEA radar sentences from observed targets.
- -The ARPA targets, except for the way the data is acquired, are treated exactly as if they were AIS, including timeouts. -

- -

-Arpa Target -

- -

-Arpa Target -

- -

-Arpa Target -

- -

-Arpa Target -

- -

-Implementation details: https://github.com/nohal/OpenCPN/wiki/ARPA-targets-tracking-implementation
- -Discussion: http://www.cruisersforum.com/forums/f134/radar-nmea-messages-104048.html#post1239386 -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ais/sart.html b/data/doc/toolbar_buttons/ais/sart.html deleted file mode 100644 index c1f28210ae..0000000000 --- a/data/doc/toolbar_buttons/ais/sart.html +++ /dev/null @@ -1,346 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ais:sart - - - - - - - - - - - - - - - - - - - - - -
- - - -

SART

-
- -

-The US FCC has recently approved transmissions by AIS SART devices. These devices were originally designed for SOLAS class ships as an alternative to radar SARTs for carriage on life boats, but the efficiency of design has encouraged applications down to man-over-board devices. -

- -

-Search And Rescue Transponders (SART) or PLB transmitting AIS messages are now available on the market. In an emergency situation the position will be displayed as an AIS target in OpenCPN. AIS SART can be a device on a vessel, in a life raft or a personal Man Over Board (MOB) device. MMSI always begins with 97. -

- -
- -

Any AIS SART Activation

-
- -
- -

Note: Unknown SART. When the MMSI Number is not entered into the MMSI List

-
- -

-This section includes “Unknown” SART, SART Alerts which Do NOT have MMSI numbers entered into the MMSI List as MOB. Listed MMSI SART Alerts also have this type of alert. The common notice or alert is that the icon below marks an emergency. -

- -

-SART icon, distress target display. This is a “Mayday”. -

- -

-In OpenCPN a distress signal sent by a SART, triggers a visual alert (red explosion bubble) and a warning sound (if activated in the ToolBox–>AIS Tab). -

- -

-SART Alarm -

- -
- -

Jump to Target

-
- -

-Then Manually Create & Activate Route. -

- -

-There is no Automatic creation of a Route to the SART for MMSI numbers not entered into the MMSI List. -

- -

-Currently the easiest way to create a Route from Ship to SART is to pick Jump to Target from Target Info and then Right Click on the SART Alert Icon and pick Navigate to this which will create and set the Route Active. -

- -

-AIS-Sart-Mob Manually Navigate to this -

- -

-We would like to see “Navigate to this” as a Right Click in the AIS Target List. -

- -
- -

Alert is Acknowledged

-
- -

-Once the alert is Acknowledged, the target behaves as any other AIS target. In the picture below the cursor is over the target. The SART target will persist on screen for 18 minutes after the last transmission irrespective of other settings for AIS. -SART alerts always have priority over DSC and CPA alerts. -

- -

- -

- -

-And here is an AIS target query. -

- -

- -

- -

-AIS SART messages and DSC distress calls are always found at the top of the AIS target list. -

- -

- - - -

- -
- -

Automatic SART-MOB Activation for your Crew

-
- -
- -

Note: Enter Crew Member AIS-SART-PLB MMSI Numbers into the MMSI List

-
- -

-If you and your crew have AIS Sart PLB personal locator beacons, transmitting AIS emergency messages, and the MMSI number of each device is entered in Options→Ships→MMSI Properties→New, OpenCPN (from version 4.0) will automatically work as a man overboard tracking device. -

- -

-Read more in Man OverBoard. -

- -

-In particular, each Crew Member's MMSI must be properly recorded and set up for "Automatic MOB Activation" in Options > Charts > Ship > MMSI list. -

- -

-AIS-MMSI-properties-new -

- -
- -

AIS Sart for MMSI Crew "Temporary MOB Route" Shows

-
- -

-AIS-Sart-Mob-Route -

- -

-When the AIS-Sart occurs and becomes “Active” (showing up at the top of the AIS Target List), there is a new heavy blue “Temporary MOB Route” created from the Ship to the SART, that is not “Activated” yet. Also the Active SART has a red explosion bubble around it and the heavy blue “temporary MOB route” is automatically inserted into the Route Manager along with a MOB waypoint. -

- -
- -

AIS Sart "Temporary MOB Route" is Activated

-
- -

-When the automatically created “Temporary MOB Route” (shown as a heavy blue line), is activated by a Right Click, or in Route Manager, the “Active Route Console” Window appears on the right side of the screen and the route is from Ship to MOB. -

- -

-Ais-sart-mob Route Active with Normal AIS Settings -

- -

-This is an intense situation with heavy AIS traffic, shown with normal AIS settings. There are ways to reduce the clutter: -

- -

-From from Menubar > AIS > Dropdown -

-
    -
  • Turn on “Attenuate less critical targets”
    -
  • -
  • Uncheck “Show AIS Target Tracks”
    -
  • -
  • Uncheck “Show CPA Alert Dialogues”
    -
  • -
- -

-From Options > Ships > AIS Targets -

-
    -
  • Under “Display” Uncheck “Show Target COG predictor arrow”
    -
  • -
  • Under “CPA Calculation” to Uncheck “Warn if CPA is less than (NMi)”
    -
  • -
- -

-Ais-sart-mob Route Active with CPA &TCPA -

- -

-The final step, “Show Targets” set to Off from Menubar > AIS > Show Targets: -

- -

-Ais-sart-mob Route Active with Show Targets Off -

- -
- -

After MMSI Crew member SART is deactivated

-
- -

-After any Crew member SART MOB (MMSI entered into MMSI List) has occurred and is completed, there is an 18 minute period during which the MOB continues to show (typical). Then after that there will be continue to be artifacts left in the “Route Manager” which is very good, because they provide a backup to continue the search. Each screen shows a different artifact. -

- -

-Temporary MOB Route -

- -

-Temporary MOB-Route -

- -

-MOB Track -

- -

-MOB Track -

- -

-MOB Waypoints - Most recent MOB Waypoint (the earlier ones are disabled automatically). -

- -

-MOB Waypoint -

- -
- -

Disable or ignore a SART Alarm

-
- -

-When Alert is active, find the Alert's MMSI number in the AIS Target List. Then Add a “New” MMSI number in Options→Ships→MMSI. Then Edit the Options→Ships→MMSI Properties to “ignore” this target. Then close the Options Dialog. Then “Acknowledge” the SART alert one more time, and no further alerts will be seen. If you restart OCPN, you will never get alerts for this target again. To simulate a SART Alarm run this Sart Alarm Nmea File in VDR player. -

- -
- -

Testing AIS-Sart-Mob without AIS-PLB Device (dry test using VDR files)

-
- -

-The two lines representing the SART going off are: -

-
- !AIVDM,1,1,,A,»O2TSdlt:1@E=@,2*51
- !AIVDM,1,1,,A,1>O2TSf000OquoPM3AG000000000,2*3B
- -

- -

- -

-First set up the AIS-MOB MMSI in the Options > Ship > MMSI Tab as if it were a Crew Member's MOB device, as shown below: -

-
    -
  • MMSI# 972072078
    -
  • -
  • Always Track
    -
  • -
  • Persistant
    -
  • -
  • Handle this MMSI as SART/PLB(AIS) MOB
    -
  • -
- - -
- -

Testing Ais-Sart-Mob with a Real SART event recording

-
- -

- -

- -

-Some of the screenshot illustrations above were done with this file. -

- -

-For a discussion and testing of these features see Cruiser's Forum Thread AIS Man Overboard Behavior -

- -
- -

Testing connection of a AIS-SART-MOB-PLB device in OpenCPN

-
- -

-It is possible to test a SART, to make sure it works. If the AIS-MOB-PLB has a testing function that can be activated, there is a test mode which uses a different icon. (We would very much like a VDR recording of this to provide an download dry test.) -

- -

- -

- -

- -

- -

-Icon displayed when testing an AIS-SART device. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ais/target_cpa_details.html b/data/doc/toolbar_buttons/ais/target_cpa_details.html deleted file mode 100644 index 888806308e..0000000000 --- a/data/doc/toolbar_buttons/ais/target_cpa_details.html +++ /dev/null @@ -1,170 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ais:target_cpa_details - - - - - - - - - - - - - - - - - - - - - -
- - - -

Target CPA Details

-
- -

-OpenCPN displays warnings about targets CPA & TCPA according to the setup in the AIS tab. But it's also possible to show CPA & TCPA for any target, that is no immediate danger, but where internal CPA calculation is still done, to assist in the decision making. -

- -

-The AIS rollover window shows the CPA and TCPA of a target : -

- -

- -

- -

-But it doesn't tell us where we and the target are at CPA, and if the target passes in front of us or behind us (i.e. should we speed up or slow down ?). -

- -

-See the following (real) example: -We are sailing hard on the wind, while a vessel is approaching us, more or less from the wind direction. A CPA of 0.78 miles is normally safe, but there is this island in our way, meaning we had to tack towards the vessel, and it is still 14 minutes to go … -

- -

- -

- -

-What will happen with our CPA after the tack ? -Have we already passed each other or do we get closer when tacking just in front of the island ? -The answer to these questions is a context sensitive menu for AIS targets. Move the -mouse over the target, and when you see the CPA / TCPA info in the rollover window, -

- -

- -

- -

-you can right click and select “Show AIS Target CPA”. -

- -

- -

- -

-The function is only available when we have a “valid CPA”, i.e. when the rollover shows -CPA and TCPA (it uses the internal CPA calculation). -

- -

-It simply shows the “CPA line” which is used in case of a CPA alert : -

- -

- -

- -

-Showing the CPA-line as in the screen-shot above, makes life much easier. Nothing to worry about … -

- -

-At CPA … -• we will be just in front of the island, exactly at our tacking position and -• she'll already be behind us (CPA line points backwards from our CPA position) -The CPA line is constantly updated, so you can follow the situation. -

- -

-This is, what it looked like directly after our tack -

- -

- -

- -

-To get rid of the CPA line for a specific target, right-click on the target and select “Hide AIS Target CPA”. -

- -

- -

- -

-As already mentioned, the CPA line is shown only, when there is a valid CPA. -A minute later, we don't have a CPA anymore for the target –> the CPA line isn't drawn anymore !. -

- -

- -

- -

-Another example : -

- -

- -

- -

-He'll pass behind us, so “full steam ahead !” -

- -

-Monitoring several targets -You can also monitor more than one target in parallel. Simply right-click on a second target and “Show AIS target CPA line” -Situation could be : -What happens to a second target if I get out of the way of the first one ? -

- -

- -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/auto_follow.html b/data/doc/toolbar_buttons/auto_follow.html deleted file mode 100644 index 228f565fdf..0000000000 --- a/data/doc/toolbar_buttons/auto_follow.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:auto_follow - - - - - - - - - - - - - - - - - - - - - -
- - - -

Auto Follow

-
- -

- -

- -

-Clicking the Auto Follow button will center the chart directly on your vessel's current location. This is a toggle button that looks like this when on, unless the cursor is over the icon. If the the GPS is working the “Own Ship” icon is red otherwise the icon is gray. . It's also possible that a yellow own ship icon will appear. Read more: GPS Setup and Status. If zoomed out to a scale that is smaller than 1:300.000 the icon changes to , when receiving gps signals and otherwise. More about the Own Ship icon is available in Marks and Routes -

-
    -
  1. The default Own Ship icon can be replaced by putting a file ownship.jpg in the User Icons shared data directory. There is more about this shared directory here: Marks and Routes
    -
  2. -
  3. The Auto Follow button is useful for two different situations:
    -
      -
    1. When you have panned the map away from your current location and want to quickly move back to your vessel.
      -
    2. -
    3. When underway, this will keep the display on the chart around your vessel, with the boat at the center of the chart, unless Look Ahead Mode is on.
      -
    4. -
    -
  4. -
  5. Panning the chart will disableAuto Follow mode. Simply click again to turn Auto Follow mode back on. Zooming in/out with the scrollwheel is OK as no panning takes place unless Options→Display→“Zoom-to Cursor” is ticked.
    -
  6. -
  7. If the option “Show skewed raster charts as North-up” in the Options→Display→Advanced tab, is not ticked, the right-click toggle option “Course Up Mode/North Up Mode” will be replaced by “Course Up Mode /Chart Up Mode”, for skewed charts.
    -
  8. -
  9. If an electronic compass is available in the NMEA stream the own ship icon will be oriented to this heading. The difference can be seen on the chart if there is a cross current, for example. The boat below is heading WNW but is being set SW. An AIS CPA, Closest Point of Approach is also visible.
    -
  10. -
- -

- -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/create_route.html b/data/doc/toolbar_buttons/create_route.html deleted file mode 100644 index 8aeb10e804..0000000000 --- a/data/doc/toolbar_buttons/create_route.html +++ /dev/null @@ -1,509 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:create_route - - - - - - - - - - - - - - - - - - - - - -
- - - -

Create Route

- - -

Route Concepts

-
- -

-Understanding how OpenCPN handles waypoints, routes, and route points will help you manage those objects efficiently. -

-
    -
  1. A route is a set of two or more points you want to visit in a given order.
    -
  2. -
  3. Route points may be defined automatically as the route is created or a route may link existing waypoints or route points.
    -
  4. -
  5. A waypoint is an independently defined point while a route point exists only as part of a route definition.
    -
  6. -
  7. Multiple routes may share common route points.
    -
  8. -
  9. When all the routes which pass through a shared route point are deleted that route point will be deleted.
    -
  10. -
  11. When all the routes which share a waypoint are deleted the waypoint will persist independently.
    -
  12. -
- -
- -

Create A Route

-
- -

-Press the button or use the short cut “Ctrl-R” to start the creation of a route. “Esc” ends the route. The cursor changes to a pencil (). Left click to create sequential numbered route points. The numbers will not be visible, but are available in the Route Properties Dialog, accessible through the right click menu or the Route Manager. The running total distance of the whole route will be shown along the “pencil” together with the course and distance from the last marked route point. When creating routes, OpenCPN will ask if it should use a nearby mark, when a route point is added that is close to an already existing mark. -

- -

- -

- -

-If you click “Yes”, the existing mark is copied to the route. -

- -

- -

- -

-For longer distances, especially on east-west courses in higher latitudes, the Create Route tool seamlessly switches to also offer a Great Circle alternative to Mercator rhumb-line route legs. -

- -

-Read more Great-circle Sailing. -

- -

- -

- -

-Hovering the cursor over the route brings up a yellow roll-over rectangle. It shows the name of the route (if it is set in the properties dialog), the total length of the route, the course and distance for the leg under the cursor and distance run so far along the route to the first waypoint in the current leg. Looking at the four legged route above. The total distance is 8.8 NMi. The third leg is 1.89 NMi in true direction 160° and the accumulated distance in the first two legs is 4.76 NMi. -

- -

-If your desired route extends off the currently displayed chart, move the route cursor in the desired direction and the display will automatically pan to show the area. You can zoom in and out with the mouse scroll wheel or keyboard +/- keys during route creating. You can also right click and select 'MAX DETAIL HERE' or 'Scale Out' during route creation. When finished right click and choose end route from the context menu or press the “Esc” key. -

- -

-The new route will be shown in blue to indicate it is an Inactive Route. Active routes are red. -

- -

-Right-clicking on a Route brings up a focused menu -

- -

- -

- -

-To Activate the Route, select Activate. -

- -

-To prevent deleting a route by mistake, a confirmation dialog is activated when pressing Delete from the popup menu, if the box Confirm deletion of tracks and routes is ticked in Options > User Interface. If a Waypoint is deleted, the right click menu will have “Undo Delete Waypoint” in the right click menu, with a hotkey Ctrl + Z. -

- -
- -

Modify a Route

-
- -

-To modify, add to, insert waypoints, remove or delete waypoints in a Route, Right Click on the Route Segment or at the Waypoint dependent on intent, and select the appropriate command. -

- -

-Insert a waypoint into a Route -

- -

-Insert a Waypoint into a Route.(Click on the image to activate the gif recording) -or Append a waypoint to the end. -

- -

-Right clicking on a Waypoint in a route brings up a few options, otherwise not available. -

- -

-* -

-
    -
  • Properties. The dialog is the same as for an individual mark.
    -
  • -
  • Activate - Gives the direction to the chosen waypoint instead of the first waypoint in the route, which is the default. Useful when joining, for example, an imported route, at an arbitrary waypoint.
    -
  • -
  • Remove from Route, but don't delete it.
    -
  • -
  • Copy as kml, for use with Qtvlm or Google Earth.
    -
  • -
  • Delete Waypoint from Route.
    -
  • -
  • Send to GPS is seen in the rightclick menus for routes and waypoints. If a port is not selected, the case in the picture above, a dialog is shown to select an output port. To change the selected port, go to the route manager and select “Send to GPS”.
    -
  • -
  • Ctrl + N, a shortcut that activates the next waypoint in an active route.
    -
  • -
- -
- -

Multiple Routes

-
- -

-In OpenCPN multiple routes can be handled in a couple of different ways. Many routes can be created in a session or imported into a session. -

- -

-The visibility of every route is controlled in the Route Manager. There is an “eye” to the far left on the line for each route. This works as a toggle switch. A plain Eye means that the route is visible, while an eye with a red cross means that it's hidden. This allows you to show only the routes of current interest. -

- -

-Another way is to create and export routes, and later import them when needed. To keep the chart clear of useful, but not currently needed, routes follow these steps: -

-
    -
  1. Create a folder called, 'GPX_Routes', or another suitable name.
    -
  2. -
  3. Create your route.
    -
  4. -
  5. Use the Route Manager to export the route with a descriptive file name and save it in GPX_Routes.
    -
  6. -
  7. Delete the route from the chart.
    -
  8. -
  9. Repeat for each new route.
    -
  10. -
  11. When needed, simply use the Route Managers “Import” Button to open the route file.
    -
  12. -
- -

-You can export any number of routes to one big file or export each route to a separate file. -

- -

-When you import a route that uses shared waypoints those waypoints will be left on the chart when you delete the route. To get rid of the way points left on the chart when a route has been deleted follow these steps. -

-
    -
  1. Open the Route Managers Waypoint tab and press the “Delete All” button
    -
  2. -
  3. Say 'Yes' to: 'Are you sure you want to delete <ALL> waypoints?'
    -
  4. -
- -
- -

Exporting and Importing Routes and Marks

-
- -

-To learn how to export and import routes, waypoints, tracks, and layers read the Route & Mark Manager section of the manual. To open the Route & Mark Manager click the button. -

- -
- -

Activating Routes and Active Route Console

-
- -

-Right clicking on the Route, changes the color from blue to orange and brings up a comprehensive menu. Clicking “Activate Route” or performing the same action through the Route Manager changes the route color to red and a new route information window appears on the right side of the display. This Active Route Console displays data particular to the Active Leg (XTE, Bearing, VMG, RNG & TTG) or the Active Full Route. -

- -

-Route Right Click Activate -

- -

-Right click on a an Active Route, brings up a menu with a choice for “Deactivate”. -

- -

-route-activated-right-click.jpg -

- -

-Right click on a an Active Route, brings up a menu with a choice for “Activate next waypoint”. -

- -

-Route Active -Activate Next Waypoint -

- -

-Zero XTE only shows in the right click menu if there is a cross track error. When selected it resets the present XTE (Cross Track Error) back to zero. “Zero XTE” is useful if you are offset from the route and want the autopilot to follow a direct course adjusted for your current position, rather than the position of the last route waypoint. -

- -

- -

- -
- -

Active Route Console Window

-
- -

- -

- -

-The Active Route Console Window (upper right black box) appears in the screen when a Route is set to Active by selection of Activate from the Route Right Click menu. -

- -

-To change the Font Sizes in the Active Route Console Window go to Options > User Interface > Fonts and pick “Console Legend” and “Console Value” and change the values. -

- -

-
-
-
-XTE Cross Track Error. How far off course your boat is. “L”=left, “R”=right
-
-BRG Direction to next waypoint.
-
-VMG Velocity made good to next waypoint
-
-RNG Distance to next waypoint.
-
-
-TTG Time To Go to next waypoint.
-
-
-
-
-
-
- -

- -
- -

Showing Active Leg & Active Full Route Data

-
- -

-Right clicking at the top title “This Leg” of the Black Active Route Console Window above, brings up this dialog: -

- -

-
-
-Select the “Current Leg” or the “Full RouteActive Route Console. There is an option to Show or Hide the “Highway”. -

- -
- -

Route to Autopilot

-
- -

-For sending a Route to an Autopilot several settings and conditions must be met.
-
- -Read more in Sending an Active Route to the Autopilotin Options > Data Connections (at the bottom) for more information about connections and testing. -

- -

-Note that a Connections Output Port must be configured to send ECRMB, ECRMC and ECAPB NMEA sentences to the Auto Pilot.
-
- -Also read about Route to Autopilot in Advanced Features for more details.
-
- -

- -

-Under Options Settings > Ship > Own Ship -See: -

-
    -
  • Advance route waypoint on arrival only
    -
  • -
  • Waypoint Advance (normal default)
    -
  • -
- -
- -

Route Handling Techniques

-
- -

-Any navigation object you create is saved by OpenCPN until you delete it. Having a lot of navigation objects makes for a cluttered chart display and slows down the program. -

-
    -
  1. Export unused objects to GPX files and delete them from OpenCPN.
    -
  2. -
  3. You can import them later when you need them.
    -
  4. -
  5. Create a separate GPX file for each object so you can import only the ones you need.
    -
  6. -
- -
- -

Create routes for one-time use

-
-
    -
  1. Don't refer to saved waypoints,
    -
  2. -
  3. Don't upload the route to a GPS,
    -
  4. -
  5. Delete the route when you reach the end point
    -
  6. -
- -

-Route management is pretty simple. -

- -
- -

Create routes for future use

-
- -

-If you want to save routes for future use, and want to build on a library of waypoints, and will upload routes to a GPS or chart plotter life will be simpler if you work out a strategy for naming navigational objects and computer files. -

- -

-Here's a strategy for your consideration. -

-
    -
  1. Build routes in short segments that don't duplicate other routes.
    -
  2. -
  3. Routes should not share non-end points with other routes.
    -
  4. -
  5. Route points should have meaningful, unique names related to the route name.
    -
  6. -
  7. Routes should be exported to individual GPX files so they can be called up individually.
    -
  8. -
- -
- -

Example

-
- -

-You have a home port on Little River with a channel that leads to open water. You like to visit Clear Cove and Muddy Harbor, each of which has a channel leading from open water to the final destination. -

-
    -
  1. Create a route from LR1 to your dock. Edit the route to name the route points LR1, LR2, LR3, … Dock. If you make the names correspond to the numbered channel markers where you need to make turns it will be easier to recognize the physical aids to navigation the route points represent. Name the route LR1-DOCK. Export the route to a GPX file (LR1-DOCK.gpx).
    -
  2. -
  3. Create a route from CC1 to the Clear Cove anchorage. Rename the route points CC1, CC2, CC3, … CCn (where “n” represents the number of the last point). Name the route CC1-CCn and export it to CC1-CCn.gpx.
    -
  4. -
  5. Create a route from MH1 to the Muddy Harbor dock. Rename the route points MH1, MH2, MH3, … MHn (or MHDOCK). Name the route MH1-MHn and export it to MH1-MHn.gpx.
    -
  6. -
  7. Create three more routes, one from LR1 to CC1, one from LR1 to MH1, and one from CC1 to MH1. In each case, click on the existing route point and select “Yes” in response to “Use nearby waypoint?” Those routes may be straight lines with just a beginning and end point or they may be more complicated to take you around obstructions. Any obstructions should be identified with waypoints given meaningful, unique names. Again, each route should be saved to its own GPX file.
    -
  8. -
- -
- -

Use of the GPX Routes

-
- -

-When you want to cruise from your home dock to the Clear Cove anchorage, import the LR1-DOCK.gpx file, the LR1-CC1.gpx file, and the CC1-CCn.gpx file. Since the LR1-DOCK route goes in the wrong direction you want to reverse the route. OpenCPN will offer to rename intermediate waypoint for you. Don't. Remember, your numbers correspond to channel markers whose designations don't change when you traverse the channel in a different direction. -

- -
- -

Advantages

-
-
    -
  1. Because your waypoint and route point names are unique you don't have to worry that importing one route will damage another.
    -
  2. -
  3. You can also upload these routes to your GPS without worrying about duplicate waypoint names.
    -
  4. -
  5. Most GPS receivers build routes on waypoints. They don't have the idea of route points that are not in the waypoint list.
    -
  6. -
  7. You need your route point names to be unique so that uploading one route doesn't invalidate a route that was previously uploaded.
    -
  8. -
- -
- -

OpenCPN Operation

-
-
    -
  1. OpenCPN doesn't care about duplicate route or waypoint names.
    -
  2. -
  3. When you create a route by clicking on points on the chart it names each route point with a number beginning with 001.
    -
  4. -
  5. If you create a second route which joins the first and you “use nearby waypoint” to join the original route you can end up with route points named 001, 002, 003, 004, 002.
    -
  6. -
  7. OpenCPN knows the two 002 points are different because they have different coordinates and different “guids”.
    -
  8. -
  9. Your GPS receiver isn't that sophisticated and it will confuse the two.
    -
  10. -
  11. -
  12. -
- -

-Read Route & Mark Manager for more information on exporting routes to GPX files and importing routes from GPX files. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/help.html b/data/doc/toolbar_buttons/help.html deleted file mode 100644 index d30396add5..0000000000 --- a/data/doc/toolbar_buttons/help.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:help - - - - - - - - - - - - - - - - - - - - - -
- - - -

Help?

-
- -

- -

- -

-Please Jump to the Getting Started page where Help is located. -

- -

-About OpenCPN
- -Help with search
- -How can I find the OpenCPN.Log File ?
- -How can I find the Opencpn.ini File

- -Click on the link above.
- -Please do not put any content on this page. Put it on Getting Started -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/man_overboard.html b/data/doc/toolbar_buttons/man_overboard.html deleted file mode 100644 index e6af20dfef..0000000000 --- a/data/doc/toolbar_buttons/man_overboard.html +++ /dev/null @@ -1,185 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:man_overboard - - - - - - - - - - - - - - - - - - - - - -
- - - -

Man Overboard

-
- -

-
- -Man Over Board, MOB, can be handled manually, by pressing a button on the screen, or hit a shortcut key sequence.
- -Mob can also be handled automatically, or semi-automatically, provided that the crew is equipped with the right gear.
- -
- -In any case …receiving a signal from an AIS SART or PLB will always generate an on screen alert, and sound a warning if this is set up. Read more about AIS SART . -

- -
- -

MOB Activated Manually

-
- -

-
- -Drop a Man Over Board Marker at your present position by pressing
- -* Man Over Board Button on the ToolBar. This button will always be furthest to the right among the buttons, for ease of finding.
- -or hit theKeys
- -*Ctrl + Space bar.
- -
- -A mark, looking like the button is instantly created - the MOB mark.
- -The MOB mark will be called “MAN OVERBOARD at + time-stamp”
- -
- -A temporary route, from a point 1 mile ahead on the current COG, and to the MOB mark is created and activated. On the screen, a course and bearing to the MOB mark will be displayed. This temporary triangular mark is labeled “1.0 NM along COG”.
- -
- -If COG, course over ground, is not available, no route is created but the MOB position is marked. This can happen if no GPS is connected, if the GPS signal is (temporary) unavailable or if the speed is so low that the GPS doesn't calculate COG.
- -
- -The MOB mark is persistent
- -If OpenCPN is shut down OpenCPN by mistake, and you have to restart, the MOB mark will still be there.
- -
- -To delete a MOB
- -The temporary route can be deleted, through the right-click menu, but no action of the user with the mouse or keyboard will move or delete the MOB mark, except for a right click → Mark/Wpt Properties and select a different icon, and then delete the mark (ex mob mark) from the right click menu, or through the Route Manager. A MOB mark is not included in “Delete All” in the Route Manager, to avoid mistakes. The mark has to be selected alone and then “Deleted”.
- -
- -Multiple MOB marks can be deployed, and multiple temporary routes will be created. The active route will always be associated with the last dropped MOB mark.
- -
- -Be very careful when using this capability in waters with strong tide or current.
- -The person overboard will not be at the position of the MOB mark for long. Both Own Boat and the person in the water will move with the current, but OpenCPN knows nothing about this.
- -
- -The MOB mark has just been dropped
- -
- -
- -
- -Own Boat has moved on and the MOB mark is 0.22 miles in bearing 306 degrees.
- -One option in this situation is to drag the triangle to the Own Boats position.
- -
- -
- -
- -A second MOB mark is dropped.
- -
- - -

- -
- -

MOB activated automatically.

-
- -

-
- -This works if each person onboard has a personal “AIS-SART” or “PLB(AIS)” and carry them at all times.
- -The transponder must also be activated, either manually by the MOB or automatically.
- -OpenCPN should be set to treat the MMSI of the crew devices as MOB events.
- -Do this by going to Options→Ships→MMSI Properties→New and enter the MMSI number of a device.
- -
- -
- -Mark “Always track” and “Handle this MMSI as SART/PLB(AIS) MOB”, and press OK. Do the same thing for each AIS emergency device on board. They should now all appear in the list at the “MMSI Properties” tab.
- -
- -Next set up Options→Ships→Ais Targets→“Play Sound on CPA/TCPA and DSC/SART emergencies” including “Select Alert Sound”.
- -
- -With this setup a MOB will generate an alarm and OpenCPN will start a MOB event as described above under “MOB activated manually”. -

- -
- -

Otherwise.....

-
- -

-An active SART or PLB(AIS) will generate an emergency alarm (if this is set up) and an on screen alert, even if the MMSI is not entered into OpenCPN as above. Read more about AIS AIS SART. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/night_navigation.html b/data/doc/toolbar_buttons/night_navigation.html deleted file mode 100644 index f1a183d085..0000000000 --- a/data/doc/toolbar_buttons/night_navigation.html +++ /dev/null @@ -1,137 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:night_navigation - - - - - - - - - - - - - - - - - - - - - -
- - - -

Night Navigation

-
- -
- -

Dimming the whole screen for Nighttime Navigation.

-
- -

- -

- -

-Use the F6 key for dimming and SHIFT + F6 to reverse the dimming.
- -This is not connected to a chart feature, and dims the whole display, not just OpenCPN.
- -“CTRL + G” cycles through (monochromatic) green, red and normal screen. The color change applies to the whole screen as well.
- -“Ctrl + G” may not work on some Windows systems, depending upon the graphics driver implemented. -

- -

-When pressing F6 the word “MAX” appears on the screen in the NW part. Press again and the screen gets a bit dimmer and “MAX” is replaced by a “9” and so on. -

- -

-
- -“Print Screen” refuses to catch the dimming!! -

- -

-Mac OS X users can easily adjust the screen brightness with the F1 and F2 keys. -

- -
- -

Change Color Scheme

-
- -

-This Button has 4 levels corresponding to standard US raster charts built in levels. You can cycle through the levels also by pressing the F5 key.
- -These represent the Default level, the Daylight level, the Dawn or Dusk level, and finally the Night level. -

- -

-Often there is no difference between the Default level and the Daylight level. -

- -

-The way this button works differs between different categories of charts. -

- -
- -

S57 Vector Charts and the CM93 ver2 charts.

-
- -

-All charts display the Dawn/Dusk and Night levels. This means that there is no change when the button is first pressed, but further pressing brings up a Dusk and then a Night palette. -

- -
- -

US Raster Charts

-
- -

-These are generally coded with all the levels. The Daylight level has slightly sharper colors for better daylight viewing. -

- -
- -

Other Raster Charts

-
- -

-Most other raster charts just contains a standard palette, and pressing the Button has no effect other than dimming part of OpenCPN, except for the chart display.
- -The Brazilian Raster Charts include a Dusk and Night palette, but the colors displayed are not what one would expect.
- -Charts converted with the help of tiff2bsb or imgkap, normally only contain the default color scheme. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/options.html b/data/doc/toolbar_buttons/options.html deleted file mode 100644 index 57eee09faf..0000000000 --- a/data/doc/toolbar_buttons/options.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:options - - - - - - - - - - - - - - - - - - - - - -
- - - -

Options

-
- -

-Click the icon to open the Options Dialog which has 6 tabs, as seen below. All Settings that are not context sensitive are set in Options. The Settings are persistent, meaning that settings entered in one session will still be there on restart. -

- -

-For more detail and information about this section please go to OPTIONS Setting -

- -

- -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/plugin.html b/data/doc/toolbar_buttons/plugin.html deleted file mode 100644 index 48137aca09..0000000000 --- a/data/doc/toolbar_buttons/plugin.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:plugin - - - - - - - - - - - - - - - - - - - - - -
- - - -

Plugin Link

-
- -

- -

- -

-Please click this transition -

- -

-Link to Plugins
- -

- -

-Link to Developer Beta Plugins
- -

- -

- Dev Beta Plugins (view online)
- -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/route_mark_manager.html b/data/doc/toolbar_buttons/route_mark_manager.html deleted file mode 100644 index 7b5a842286..0000000000 --- a/data/doc/toolbar_buttons/route_mark_manager.html +++ /dev/null @@ -1,708 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:route_mark_manager - - - - - - - - - - - - - - - - - - - - - -
- - - -

Route & Mark Manager

-
- -

- -

- -

-The Route & Mark Manager lists routes, tracks, waypoints, and layers that are currently loaded into OpenCPN. It allows you to view and modify those navigation objects and their components. The Route & Mark Manager has tabs for -

- - -
- -

Getting Around

-
- -
- -

Persistence

-
- -

-Navigation objects in OpenCPN, except for “Temporary layers”, are persistent between OpenCPN sessions. Navigation Data Backup discusses data persistence more fully. -

- -
- -

Show/Hide Eye

-
- -

-You can toggle the visibility of active objects by clicking the “eye” to the left of the object name on each line. For waypoints the eye is replaced by the icon shown on the chart for the waypoint. A red X across the “eye” (or waypoint icon) means that the object is invisible. -

- -
- -

Sort by Columns

-
- -

-Objects can be sorted by their column header in the Route & Mark Manager. For example, clicking “Route Name” will cause the routes below to be sorted alphabetically. Clicking again reverses the order. -

- -
- -

Selection by Ctl - Left-click

-
- -

-You can select multiple objects in the Routes, Tracks, or Waypoints tabs by holding down the CTRL key and left-clicking the objects or by holding the SHIFT key and selecting the first and last object of a group. -

- -
- -

Properties by Double Click

-
- -

-Double-clicking on a route, track, or waypoint brings up its Properties dialog. It's a shortcut for selecting the object and clicking the Properties button. -

- -
- -

Export & Import GPX Files

-
- -

-You can export and import routes, tracks, waypoints, and layers using the GPX transfer format. This lets you save your routes and marks to external files so you can have more than the active ones - for example, to do route planning or archive existing data. -

-
    -
  • GPX format is supported by a wide variety of programs.
    -
  • -
  • You can have as many external files as you wish, there are no limits on the number of eternal files.
    -
  • -
  • Use this for passage planning by saving multiple possible routes for a passage.
    -
  • -
  • Export routes and tracks for historical-log purposes.
    -
  • -
  • Prepare layers as an aid to navigation en route.
    -
  • -
- -

-Keeping a lot of active routes in OpenCPN makes for a cluttered chart display. It also slows the program and makes it use more system resources. Imagine a word processor where every document you ever created was displayed unless you made it invisible. The “Export selected” and “Import GPX” buttons work like the “Save” and “Load” options in most programs. Just as you wouldn't save all your word processing documents in a single giant file, it's not efficient to export all your navigation objects into a single file. -

- -

-It is more efficient to export each route or track to a separate file. Click on the object, click on the “Export selected” button, name the file, and navigate to the folder in which you want it saved. If you save each route and track in its own file you can import them individually. There is more discussion of a strategy for creating routes at Create Route. -

- -

-The “Export All Visible” button is useful for making a quick backup copy of all your navigation objects but the resulting file is cumbersome to work with. It is also useful for creating a GPX file that is to be loaded as a layer. Read more at Layers. -

- -
- -

Routes

-
- -

-A route is a set of two or more points you wish to visit in a given sequence. Route points can be defined as the route is created or they can be previously defined waypoints or route points. For more information about creating routes read Create Route. -

-
    -
  • The route points have exactly the same properties as the isolated waypoints, but does not show in the waypoint tab, to avoid clutter. To create a route that uses real waypoints, create them first and join them with the route tool.
    -
  • -
- -

- -

- -
- -

Click the "eye"

-
- -

-to the far left on the line with the route to toggle if the route is displayed or hidden on the chart. A small dialog let you choose if existing marks included in a route will also become invisible. When a route is turned visible, all the shared waypoints are also made visible. Once a route is deleted, such a mark will go back to be a “normal” waypoint. -

- -
- -

To Sort routes

-
- -

-Click “Route Name” or “To” -

- -
- -

Properties

-
- -

-This button brings up a new dialog with settings that can be changed for each route. - -

- -
- -

Wpt is right-clicked

-
- -

-A new dialog has popped up. The waypoint properties can be reached and edited. For example, change the default name, “005” in this case, to something more appropriate. Read more in the Extended Marks section. The waypoint can also be deleted. The last entry, “Copy all as text” copies all Route Properties for pasting into a text or Spreadsheet document. -

- -

- -

- -
- -

Plan Speed

-
- -

-The overall planned speed for the route. The speed for each leg can be set by going to the waypoint Properties→Description tab for the waypoint that starts the leg, and write in the speed. For example “ VMG=9.7”. [Unfortunately this approach presently excludes writing descriptions for the waypoint. One or the other, be warned!] The Plan Speed value is persistent and will be used for further routes, unless changed. The default value is 6.0 knots. -

- -
- -

Departure Time

-
- -

-For Planning: With no departure time the ETE (Estimated Time En route) is calculated. Route is Inactive and normal calculation is ETE. The ETE will be calculated from the First Waypoint of the Route. -route-properties-normal-ete.jpg -

- -
- -

ETA for Planning - Date & Time

-
-
    -
  • Route can be Inactive or Active.
    -
  • -
  • Enter a Departure Date and Time eg: 06/07/2014 14:00 and the ETA will be calculated.
    -
  • -
  • Make sure to press “Enter-Return” after entering a departure time. This guarantees that the entered time is used in calculations.
    -
  • -
  • The ETA will be calculated from OwnShip to the first Waypoint of the Route and then for each waypoint.
    -
  • -
  • Note the Active Waypoint Console.
    -
  • -
- -

-route-inactive-active-date-time-eta.jpg -

- -
- -

ETA Planning - Now

-
-
    -
  • Route can be Inactive or Active with first WP active.
    -
  • -
  • To enter the present time, enter “>” (meaning: “Now”) in the departure time box. This works provided “Time shown as” → Local@PC is selected.
    -
  • -
  • Press “Enter” and all the times in the “ETA” column will change.
    -
  • -
  • “>” differs from entering the same time manually, say “06/04/2016 14:23”.
    -
  • -
  • Distance from Ownship to first Waypoint (active) will be shown with ETA's for all waypoints in the route. Calculates departure Now from the current boat position, including the distance to the first waypoint of the route Use prior to leaving harbour, all calculations pass through the very first WP of the route and ETA is calculated from the boat position through the first waypoint and then to the end of the route.
    -
  • -
  • Note the Active Waypoint Console.
    -
  • -
- -

-route-active-now-eta-wp1.jpg -

- -
- -

ETA Planning - Now from Intermediate WP

-
- -

-If the Route is Active and an intermediate Waypoint is Active, say WP5, then “- ”>“ - issued at 14:00 on 06/04/2016 - calculates departure “Now” from the current boat position, including the distance to the currently “active waypoint” of the route. Waypoints before the active waypoint are left empty. -

- -
- -

ETA - During Passage

-
-
    -
  1. Set Route “Active” Route & time shown as “Local@PC”.
    -
  2. -
  3. If you are simulating this condition you may need to right click on the next WP and pick “Active”.
    -
  4. -
  5. On an ocean passage, after a week of sailing, calculate ETA to the following WP.
    -
  6. -
  7. Set the route as “active” & next WP as “active”.
    -
  8. -
  9. Then, when entering ”>“=“now” as Departure Time, all the ETAs are from your real position TO THE NEXT WP, not to the beginning of the route.
    -
  10. -
  11. The ETA to the active waypoint is from Ownship to the WP. Note the Active Waypoint Console.
    -
  12. -
- -

-route-active-now-eta-wp4.jpg -

- -

-Time UTC is a new name for GMT. LMT is a local mean time based on the present longitude. For Local Zone Time one can also enter the keyword “Now”. -

- -

-Color Set the displayed color of the track or keep the default. -

- -

-Style Solid, dashes, dots, a combination or keep the default. -

- -

-Width Set the width of the track or keep or keep the default. Marking a line with the leg number and the destination Waypoint in the Properties Dialog also marks the Waypoint on the chart with a blue square. -

- -

- -

- -

- -

- -

-The lower part of the Route properties dialog now has -

- -
- - -
- -

-Print Route button. It is possible to first select what features to print before being sent to the normal print routine. -

- -
- -

Extend Route

-
- -

-Extending is possible only when it is obvious, what should be joined with the current route (current=visible in the Dialog). -

-
    -
  • Eligible are all visible route points shared with, or lying nearby to the current route's endpoint. If there is exactly 1 such point, then it is considered obvious, and the Extend button is enabled. If there are more, some should be hidden before proceeding, until just 1 remains.
    -
  • -
  • Routes are extended forward, based on the geographic location, next route point must be very near, as when mouse-extending the route. If the next route point is to far away for extending, just create the joining leg and extend twice.
    -
  • -
- -
- -

Split Route

-
- -

-For splitting, the split point is selected as the row in the listing. The point-of-split becomes part of both new routes (shared) or tracks (cloned). Original route-track is deleted. -

-
    -
  • Here is a basic example of first splitting then extending. The test route is shown below *
    -
  • -
- -

- -

-
    -
  • Split Test_A In the Route Managers property dialog for the route we have selected a waypoint where we would like to split the route. The “Split Test” Route now consists of two parts, that has been renamed. *
    -
  • -
- -

- -

-
    -
  • Next we extend the first leg “Split Test_A” with the second leg “Split Test_B”. This extended route is now named “Split Test_B_plus.
    -
  • -
- -

- -

- -
- -

Activate-Deactivate

-
- -

-Activates-Deactivates a route marked in the left part of the window. -

- -
- -

Zoom to

-
- -

-Zooms in on a route marked in the left part of the window. -

- -
- -

Reverse

-
- -

-Reverses a selected route. It's possible to cancel the reverse operation through a confirmation dialog. * -

- -
- -

Delete

-
- -

-Deletes selected route or track. Use the Shift key to mark multiple routes for deletion. This also work in the other Route manager tabs. -

- -
- -

Export Route

-
- -

-Save the route on your computer for later use (import) -

- -
- -

Send to GPS

-
- -

-Send the Route to your GPS. Pressing the button activates a dialog were an output port is selected. This port does not have to be listed in “Connections” as it is an independent feature. This choice also appears in the right click menu for routes and waypoints. -For Garmin Users, make sure that the ToolBox→GPS→”Use Garmin GRMN-GRMN (Host) mode for Waypoint and Route uploads” box is ticked. The reason for this is that Garmin units cannot accept route uploads via NMEA0183. This is a “design feature” of all Garmin receivers. -

- -

- -

- -
- -

Delete All

-
- -

-Be careful. If you know you have saved the routes on your computer and are able to import the again, this is a simple way to clear the screen from routes. Better be safe than sorry, so save before deleting, if you want to be able to use the routes again. -

- -
- -

Import

-
- -

-Import one or more previously saved Routes, or Routes from other gpx compatible applications. It is possible to select and import multiple routes. The default waypoint icon bitmap is a circle. This kicks in if the icon in the imported gpx-file is not recognized. -

- -
- -

Export All Visible

-
- -

-Saves all visible routes, waypoints and layers, in one gpx file. This is done through a normal file saving dialog. -

- -

- -

- -
- -

Tidal Column - Use and activation

-
- -

-To Show tidal heights in the column, open the “Tidal Height Curve Dialog” for an individual tidal station so that it is shown on the screen as below. The tidal situation for this station will be tabulated along all route points in the route properties dialog. -

-
    -
  • It is essential to enter a departure time and a planned speed.
    -
  • -
  • Once “Enter” is pressed the tidal column will show the nearest High or Low water considering the ETA at each waypoint.
    -
  • -
- -

- -

- -

- -

-
    -
  • If no tide dialog for any station is open and a waypoints name contains the string @~~<name>, for example “@~~York Spit Light”, then the tide report for the closest station with matching name is shown in the tide column for this waypoint. The most appropriate tidal station for each waypoint can thus be selected.
    -
  • -
  • When entering a departure time the ETA, Expected Time of Arrival will be shown, instead of ETE, Expected Time En-route.
    -
  • -
  • The individual waypoints “Description” field can contain the setting of planned speed specific just to the next route leg (e.g. “VMG=4.5;”) and-or the specification of Estimated Time of Departure from this waypoint (e.g. “ ETD=2/14/2011 12:00;”), allowing for planning extended stopovers. Time can be specified as UT, LMT or local zone time at the PC (default).
    -
  • -
- -

- -

- -
- -

Tracks

-
- -

- -

- -

-Make sure that you have read all about Automatic Daily tracks and track Highlighting in the Documentation on the Own Ship. -

- -
- -

Eye

-
- -

-The visibility of tracks is controlled by clicking the “eye” on each line. -

- -
- -

Sorting

-
- -

-Tracks can be sorted by clicking the column headers. Tracks are extended backward, based on the time-stamp sequence, a track is selected, which ends as the latest one before the start of current track. Tracks are extended as a single segment if they share the extending point. If they have no common point a new “empty” segment, with no visible track, is added. -

- -
- -

Joining

-
- -

-Joining two tracks (i.e. extending a track) results in just track one remaining. It may look like two tracks but the Route Manager treats it as a single track. -

- -
- -

Merge Selected Tracks

-
- -

-An alternative to “Extend Track” where two separate tracks are joined. The difference is that Merged tracks are visibly joined by straight track-lines. Read on for instructions on merging tracks. -

-
    -
  • If you have ever hit the Track icon by mistake, or closed down OpenCPN in the middle of a passage, you know that it's very frustrating to have a voyage split up in a number of different tracks that are not joined together. This can be fixed.
    -
  • -
  • Just select any number of tracks in the Track tab of the Route Manager window, right click the mouse to bring up the context menu, and choose to “Merge Selected Tracks”. The selected tracks will be merged in chronological order, with the track properties (name, color etc) of the resulting track keeping those of the earliest track in the selection.
    -
  • -
- -

- -

- -
- -

Copy as text

-
- -

-Copies the track name, unless it's the default time stamp, and the track distance. -The result of clicking the merge button. -

- -

- -

- -

- -

- -
- -

Reduce Track Data

-
-
    -
  • Do you have have massive amounts of tracks and finds them bogging down OpenCPN? This feature is for you!
    -
  • -
  • It is available from the context menu in the Track Manager. Right click on an existing track, and then click “Reduce Data…” .
    -
  • -
  • Pick one of the options, it reduces the amount of points in an existing track while maintaining the specified maximum error between the original track and the reduced track. Testing on an old OpenCPN track or an imported track, with an error setting of 10 or 20 meters tracks, will, in many cases, reduce the size to less than half and one can't really see the difference.
    -
  • -
  • Tracks made with the new intelligent dynamic tracking available in OpenCPN will not reduce much, unless a large error is tolerated.
    -
  • -
- -

- -

- -

- -

- -
- -

Track Properties

-
- -

-The track properties dialog is similar to the route properties dialog above. There are some obvious differences as a track describes something that took place in the past and a route is planning for the future. Track properties also has an Advanced tab that works similar to the Extended Marks dialog. -

- -
- -

Waypoints

-
- -

- -

- -

- -

-
    -
  • Control the visibility of each waypoint by clicking the waypoint icon to the left on each line. Sort the waypoints by clicking the column headers. * New. Create a new waypoint. This brings up the waypoints properties dialog. The default position is set to the current position of “Own Ship”.
    -
  • -
  • Properties. All about the dialog in Extended Marks
    -
  • -
  • Zoom to centers the chart display on the waypoint.
    -
  • -
  • Go To. Makes an instant route from present position to the mark and activates the route. A similar instant route is created by right clicking and selecting “Go To Here” without first creating a mark. This instant route will be listed in the Route Tab.
    -
  • -
  • Export Wpt and Send to GPS buttons behaves similar to corresponding buttons for Routes.
    -
  • -
  • Delete All, does not delete any Man Over Board marks. All other marks are deleted.
    -
  • -
  • Use the Shift key to mark multiple waypoints for deletion. This also work in the other Route manager tabs.
    -
  • -
- - -
- -

FAQ

-
- -
- -

Is there a way to change the WP 'Icon' in a route?

-
- -

-http://www.cruisersforum.com/forums/f134/change-route-wp-icon-192133.html -

- -

-To change a single WP icon of a route go to the properties window with a right click on the WP icon. -To Globally change a Route's WP Icons is not possible because the icon Diamond is hard coded in the source. -However it is possible to change globally the WP icon for normal WPs, the triangle. -To do that search a line with “DefaultWPIcon=…” in opencpn.ini. -

- -

-Also see Use your own Icons -

- -
- - -
-
    -
  • Where are Routes, Tracks and Waypoints Stored?
    -
  • -
  • I lost my route, is there a backup?
    -
  • -
  • Can I find a missing track?
    -
  • -
- -

-See Navobj -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/route_mark_manager/great_circle_sailing.html b/data/doc/toolbar_buttons/route_mark_manager/great_circle_sailing.html deleted file mode 100644 index bcc8173e57..0000000000 --- a/data/doc/toolbar_buttons/route_mark_manager/great_circle_sailing.html +++ /dev/null @@ -1,175 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:route_mark_manager:great_circle_sailing - - - - - - - - - - - - - - - - - - - - - -
- - - -

Great Circle Sailing

-
- -

-Very few cruising boats need to use Great Circles, but it's certainly an important consideration for commercial vessels across the North Atlantic and North Pacific. -

- -

-The advantage of a great circle is obvious, the shorter distance. The disadvantages, depending on latitude, could be quite a few. Colder weather, stronger winds, higher seas and perhaps even icebergs. The great circle is just one factor in the decision making, when planning a route, the weather is likely to be the deciding factor in most cases. -

- -

-OpenCPN has a builtin Great Circle tool as well as a Great Circle plugin. -

- -

-The built in Great Circle tool. -

- -

-The “Measure” tool in the right-click menu and the “Create Route” button on the ToolBar switches seamlessly to a great circle mode when asked to do long distance tasks. This mainly happens when using these tools in some east-west direction and far away from the equator. The mode kicks in when the difference between the normal, rhumb line and the great circle becomes larger than two nautical miles. This will be some 0.2% to 0.5% of the total distance, depending on latitude and direction. When this happens a clear curve towards the pole will appear. -

- -

- The Measure Tool -

- -

- -

- -

-Testing the measure tool for Manila to San Francisco (approximately). For a good illustration to Great circles, find a second point that is opposite the first, on the other side of the globe, and just move around slightly. -

- -

- -

- -

-Once the first leg in measuring is done, it's plotted as a rhumb-line, to keep things simple. The active leg is still displayed as a great circle, if long enough. The distance displayed is the combined great circle distances. -

- -

- The “Create Route” Tool -

- -

- -

- -

-If you answer no to the above question, OpenCPN will use a traditional rhumb line for the leg. Answering yes, will kick the great circle option into action and a number of intermediate waypoints will be created. There will be at least 3 waypoints. The exact number of waypoints is calculated by OpenCPN and is appropriate for most cases. -

- -

- -

- -

-The created route is now available in the RouteManager dialog, as a normal route. -

- -

- -

- -

-As a real example let us look at a route from Mossel Baai, South Africa, to the western entrance to Investigator Strait, South Australia. The rhumb line is 5660 nautilcal miles, and the great circle, as approximated by the created route is 5249 miles. The “real” great circle is some 15 miles shorter. -

- -

- -

- -

-Composite Saling -

- -

- -

- -

-Composite sailing is a great circle sailing with a maximum allowed latitude. OpenCPN has no such built-in option, but it's easy to create. -

- -

-Above is the same route as before designed for composite sailing, not going further south than 45° S latitude. Start a route at Mossel Baai extend it until 45° S becomes a tangent to the visible great circle. End the route. -

- -

- -

- -

-Do the same thing, starting with the destination and going backwards. Create a rhumb line route, using the two points along 45° S. The three routes together form the composite route. The total distance of the composite route is 5293 Nautical Miles. -

- -
- -

Route Plugin

-
- -

-“Salty Paws” route plugin handles much more than great circles, introduced here. -

- -

- -

- -

-The plugin has a few features not present in the built-in tool. It can calculate a composite route, and the distance between the waypoints can be set by the user. The end result, however, is a “gpx” file that is exported, and then imported into OpenCPN via the Route Manager. -

- -

- -

- -

-A great circle from Cook Strait to Cape Horn limited by 60° S -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/route_mark_manager/layers.html b/data/doc/toolbar_buttons/route_mark_manager/layers.html deleted file mode 100644 index c276aa5974..0000000000 --- a/data/doc/toolbar_buttons/route_mark_manager/layers.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:route_mark_manager:layers - - - - - - - - - - - - - - - - - - - - - -
- - - -

Layers

-
-
    -
  • Layers are one or more routes, tracks or waypoints that have been saved together in a gpx file. A layer is represented as a single gpx file. A layer is persistent and protected from changes. A waypoint in a gpx file for example, can be imported either as a “waypoint” or as a layer. The difference is that when imported as a layer it cannot be changed or deleted.
    -
  • -
- -

- -

- -

-The Route Managers Layer Tab -

- -

- -

-
    -
  • Layers are useful for many things. It can for example be used to update charts with new navigation marks and dangers as per Notices to Mariners, and to add Radio Call-In Points or to build a database of lights and locations, that will be visible on chart regardless of current scale. See the first picture above, where French and UK forecast areas are good examples of Layers. In the second picture, a very good celestial fix, plotted with a gpx script has been saved as a layer.
    -
  • -
  • More advanced uses could, for example, be an interactive cruising guide using the possibility to embed links in waypoint descriptions.
    -
  • -
- -
- -

When is a feature a part of a Layer?

-
-
    -
  • Layers are immutable, nothing can be changed. This could make them confusing, unless you are aware of the fact that they are layers!
    -
  • -
  • To see if a waypoint, route or track, is a part of a layer, right-click the object. If it is part of a layer, the context sensitive menu will say so. Alternatively, open properties and check the top of the dialog. If part of a layer, the layer's name is printed. As always, double clicking on an object directly brings up the properties dialog,
    -
  • -
- -

- -

- -

- -

- -

- -

-
    -
  • A route belonging to a layer is also identified as such, by just hovering with the cursor above the route.
    -
    -
  • -
- -

- -

-
    -
  • A Route belonging to a layer also has the option “Activate”. It can thus be used, but still, no changes can be made. A much more flexible option, would be to import the route layer file as a normal gpx file.
    -
  • -
- -
- -

Handling Layers.

-
-
    -
  • Layers can be created in OpenCPN and saved as a gpx file, or be created offline manually or by scripts, for example.
    -
  • -
  • Layers that are saved in a directory called “layers”, in the same place that holds your opencpn.ini(config) file, are automatically loaded on start of OpenCPN. These layers will be listed in the Route Managers Layers Tab on start up. The first time they will all be visible. Adjust visibility by clicking on the “eye” in the first column. This setting will be remembered. Have a look at the first picture on this page!
    -
  • -
  • The easiest way to find this directory is to go to the
    -
  • -
- -

-- button in the ToolBar and look all the way down in the first tab (About).
-In Linux create the directory: /home/$USER/.opencpn/layers. -

-
    -
  • On Mac OS X, the location is “/Users/“username”/Library/Preferences/Layers”. Note that “Library” is a hidden directory in “Lion”.
    -
  • -
  • Any subdirectories in the layers directory are also loaded.
    -
  • -
  • Layers worth keeping could be kept in the mentioned “layers” directory and visibility during a session can be handled through “Hide from Chart” or “Show on Chart” buttons. New layers, gpx files, can easily be added in a subdirectory of it's own.
    -
  • -
  • A few restrictions apply to layer marks. A layer mark cannot be used to set anchor watch on. If right-click-selecting co-located objects, priority is given to non-layer objects.
    -
  • -
- -
- -

The Route Managers Layer Tab.

-
-
    -
  • Temporary layer: Any gpx file can be imported as a layer. This can be used for developing layers, or for import from a user defined directory with predefined layers, as necessary. Layers imported this way will be saved when closing down the computer, they are persistent. More permanent layers should be kept in the “layers” directory, as described above.
    -
  • -
  • Delete: Unloads the layer, but doesn't of course touch the originally imported gpx file. A progress bar will appear when deleting large layers. It is not possible to stop the deletion, once started. For size restrictions, see below.
    -
  • -
  • Hide from Chart or Show on Chart Controls if the marked layer is visible. The same thing can be achieved by clicking the “eye” to the left of the layers name. A red X across the eye marks a hidden layer. See picture above. These settings are persistent, they will be remembered after a restart.
    -
  • -
  • Hide WPT Names Shows a visible layer without waypoint names. This helps to un-clutter layers, when zoomed out.
    -
  • -
  • List contents or Delist Contents Listing is this context means showing the individual points in the layer as waypoints in the “Waypoints Tab”
    -
  • -
  • Import GPX.. and Export All..Warning these buttons has nothing to do with Layers. They work as if you are in an other tab. For import use “Import New Layers”. For export, create layers as described above.
    -
  • -
  • Export All Visible.. exports all visible layers, routes and waypoints to a gpx file. Use this button to create new layers, for example. Just save the gpxfile in the right place, described above. Note that “visible” in this context is the opposite to a layer, route or waypoint being “hidden”. This means that objects not visible on the screen, may be included.
    -
  • -
  • A progress bar will appear when exporting large layers. It is not possible to stop the deletion, once started. For size restrictions, see below.
    -
  • -
  • If a layer includes extended marks, linked to pictures, for example, the pictures will not be exported, only the links to the pictures. To “export” the whole layer to another computer, copy all the pictures separately. Adjust all the links in the gpx file, to the new computer, by doing a “search and replace” in a text editor on the new computer.
    -
  • -
- -
- -

Size Limits for the Layer feature.

-
-
    -
  • OpenCPN is not suited to handle very large permanent layer files. Exporting and deleting such layers bogs down the program. With older hardware or limited available memory, even these recommendations may be to optimistic.
    -
  • -
  • OpenCPN 4.0 has refined the track and layer logic to improve performance with large tracks. See next paragraph.
    -
  • -
  • Newly developed static layers by argus.survice.com show that OpenCPN has problems with very large layers consisting of waypoints named after the depth at the position. With 10,000 + posistions it's necessary to consider some rules when using OpenCPN. If you disregard these rules, expect bad performance.
    -
  • -
  • Deactivating OpenGL may improve the performance somewhat.
    -
  • -
  • Always load the files as a temporary layer, zoomed in on your local area. Never load when zoomed out. Why? Zoomed out OpenCPN has to handle all wpts at the same time when zooming/panning. Zoomed in it just a handful of wpts at the same time.
    -
  • -
  • An alternative is to load a file when zoomed in on an other area. This goes quick. Then promptly make the layer invisible. Only make the layer visible when zoomed in on the actual area.
    -
  • -
  • Never zoom out with these files loaded, unless you make the layer invisible first. There is no point in this anyway as all you will see is a lot of black “smear”.
    -
  • -
- -
- -

More on creating layers and saving data.

-
- - -
- -

Where to find ready made Layers?

-
-
    -
- -
- - -
- - diff --git a/data/doc/toolbar_buttons/route_mark_manager/planning_data.html b/data/doc/toolbar_buttons/route_mark_manager/planning_data.html deleted file mode 100644 index fe8318b10c..0000000000 --- a/data/doc/toolbar_buttons/route_mark_manager/planning_data.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:route_mark_manager:planning_data - - - - - - - - - - - - - - - - - - - - - -
- - - -

Planning Data

-
- -

-The examples shown on this page are all suitable for import as layers, as that will prevent any waypoint from being moved by mistake. -

- -
- -

Need to see some offshore weather observations?

-
- - -

-NOAAs NDBC site gives access to a lot of offshore observations from buoys and ships worldwide. -

- -

-To easily visualize all this data the “ShipWxRep” script transform a limited set of all the available data into gpx waypoints. The format, as seen above is “wind direction, wind speed, time for observation, and air pressure”. This can be helpful when evaluating the accuracy of grib files, even though the best tool in this respect probably is a calibrated digital barometer. -

- -
- -

Plotting Miami Tropical Forecast Advisories.

-
- -

-If you only have access to low bandwidth Internet, this script is a way to quickly plot the contents of, for example, an email containing the forecast advisory. In any case, it is a good idea to have the forecast track of a tropical system available where you normally do your navigation and planning. -

- -

- -

- -

- -

- -

-Download the gpx scripts here. The old great circle script is included. For some help run each script without arguments. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/route_mark_manager/using_routes.html b/data/doc/toolbar_buttons/route_mark_manager/using_routes.html deleted file mode 100644 index b36ecad438..0000000000 --- a/data/doc/toolbar_buttons/route_mark_manager/using_routes.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:route_mark_manager:using_routes - - - - - - - - - - - - - - - - - - - - - -
- - - -

Using Routes

-
- -
- -

To include existing waypoints in a route

-
- -

-How to use split and extend - an example. -

- -

- -

- -

-Hm…a bit of a miss in the planning. An islet with a shallow bank extending southward on our route. We put two marks north of the obstruction and would like to include these in our route. -

- -

- -

- -

-The waypoint west of the islet is #2. We mark this in “Route Properties”, from the right-click menu. The Button “Split Route” is highlighted, meaning it is available to use. This is exactly what we want to do, so we click the button and split the route at wpt #2. -

- -

- -

- -

-Right click at #2 and choose “Append Waypoint”, -

- -

- -

- -

-Move the cursor to the first triangle, and answer yes to “Use nearby waypoint?”.
- -Then move the cursor to the second triangle , and answer yes to “Use nearby waypoint?”.
- -Same thing for the original wpt to the east of the islet. -

- -

- -

- -

-Click “Activate Route” to see that this extension worked. -

- -

- -

- -

-Once again mark “Route Properties” in the right-click dialog. #3 is the last wpt in our “new” temporary route. The “Extend Route” button is highlighted, so we click it. -

- -

- -

- -

-Open the Route Manager to view the result. Notice the naming of the routes. _B_plus is active. What remains is to delete route _B and to rename _B_plus to a suitable name, for example the name of your original route. -

- -

- -

- -

-Deleting route _B. -

- -

- -

- -

-And here is the finally adjusted route. -

- -

-This was just an exercise…..in real life, it would be easier to just move the existing waypoints in the route, to avoid the Islet. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/scaling_charts.html b/data/doc/toolbar_buttons/scaling_charts.html deleted file mode 100644 index 4ae017e4b6..0000000000 --- a/data/doc/toolbar_buttons/scaling_charts.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:scaling_charts - - - - - - - - - - - - - - - - - - - - - -
- - - -

Scaling Charts

-
- -

- -

- -

-These buttons will allow you to change the scale of chart you are using, unless only CM93 charts are loaded, in which case these buttons have no effect, and are grayed out. If just a yellow bar is visible in the Chart Selection Bar, above the Status Bar, then CM93 is the only available chart for the area. -

- -

- -

- -

-Shift to larger scale chart. Will change to next chart of greater detail, covering less area, if available, within the current view. -

- -

- -

- -

-Shift to smaller scale chart. Will change to the next chart of less detail, covering a greater area, if available, within the current view. -

- -
- -

Chart Bar Buttons

-
- -

-The charts in the Chart Bar just above the Status Bar are ordered according to scale. The leftmost chart, is the largest scale chart available, and the rightmost chart is the smallest scale chart. -

- -

- -

- -

-Also see Chart Status Bar -

- -

-Above the largest scale chart is a raster chart (blue) on the far left. To the far right is CM93 (yellow), and it will always be there, if available. The green ENC vector chart, next to CM93, is the smallest scale raster/ENC chart available at the center of the display. -

- -
- -

The scale of the displayed chart.

-
- -

-The chart display indicates the true scale of a particular chart at the present zoom level. Look to the far right on the bar above: “Scale 1299400 (1.7x)”. -

- -

-There is also a quick reference visual indicator always present in the SW part of the display. -

- -

- -

- -

-When the indicator is gray and orange the total length is 1 nautical mile an each segment is 1 cable. When the indicator is gray and black the total length is 10 miles and each segment is 2 miles. -

- -

-Alternatively the ScaleBar can be horizontal in the lower right corner of the screen. -Add this line to opencpn.ini (conf): -

-
UseSimplifiedScalebar=1
- -

- -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/ship_track.html b/data/doc/toolbar_buttons/ship_track.html deleted file mode 100644 index 29c54aeb8f..0000000000 --- a/data/doc/toolbar_buttons/ship_track.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:ship_track - - - - - - - - - - - - - - - - - - - - - -
- - - -

Ship Track

-
- -

-Track off -

- -

-Track on -

- -

-Toggling the track icon turns tracking on and off. When tracking is on, the button hasa green background. Tracking means that a record is kept of the vessels position as it proceeds. A trail is left behind the vessel on the chart display. -

- -

-Tracking is persistent. If you shut down OpenCPN with tracking active, tracking will be activated automatically next time you start. Note however that tracking on start up is delayed until a GPS position is available. This action avoids large nonsense jumps in the beginning of the new track. The way the track is recorded can be set in Options → Ships → Ownship. A full explanation is available in Own Ship -

- -

- -

- -

-Recorded tracks can be imported, exported and managed using the Route & Mark Manager. When right clicking on a track you can select Track Properties from the context menu, and a new dialog pops up. Normally it looks like this: -

- -

- -

- -

-But if the track is a layer or part of a layer, you will see this instead: -

- -

- -

- -

-A layer cannot be changed easily, and a lot of what follows does not apply to Layer Tracks. Read more about Layers. -

- -

-The properties dialog can also be reached through the Route Manager. A record of all the track point will be listed. On the screen dump below the tracking precision is set to “Medium”. The Waypoints, track points really, appears at irregular times, due to the smart tracking. Only trackpoints that contribute to the track are recorded. In other words, a change in the track occurs at every recorded trackpoint. Click anywhere on a line in the list of track points, to mark the line and a blue square will mark the position on the track. -

- -

- -

- -

-From the right click menu the Delete track option is available as well. To prevent mistakes a confirmation dialog pops up. For more about Tracks read about the Route Managers Track Tab in Route & Mark Manager. -

- -

- -

- -

-There are many options for how a track will be shown and what time to use. The Advanced tab, where you can document the track and include links, works similar to Extended Marks. -

- -

-As a backup, a logbook entry is made every half hour in the OpenCPN log file. The format is similar to this: -

- -

-14:30:00 CEST: LOGBOOK: 2011-06-28 12:30:00 UTC DR Lat 44.43657 Lon -65.17280 -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/tides_and_currents.html b/data/doc/toolbar_buttons/tides_and_currents.html deleted file mode 100644 index 2d40a08c20..0000000000 --- a/data/doc/toolbar_buttons/tides_and_currents.html +++ /dev/null @@ -1,316 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:tides_and_currents - - - - - - - - - - - - - - - - - - - - - -
- - - -

Tides and Currents

-
- -

- - -

- -
- -

Notes

-
-
    -
  • Tide and Current predictions are not available for all areas.
    -
  • -
  • OpenCPN comes with a built in tidal data file, but can use any legacy IDX or binary tcd file. Multiple tidal files can be used at the same time. More about this further down this page.
    -
  • -
  • As with all predictions, the displayed values are calculated using mathematical models and actual tides and currents will vary.
    -
  • -
  • Variations from the predicted tide may be caused by weather (offshore wind and high barometric pressure) and can vary easily by 15 minutes and 1 foot. In some remote areas (north) the period of observation used for the calculation may be relatively short, thus causing the value of the predictions to be less accurate. Predictions are predictions!
    -
  • -
- -
- -

Enable Tides and Currents Display

-
-
    -
  • Click the toolbar button to see tide stations.
    -
  • -
  • Select to see current stations.
    -
  • -
  • Important: tide and currents will not be displayed unless these toolbar buttons are selected.
    -
  • -
- -
- -

Displaying Tides

-
-
    -
  • Available tide stations will show on the chart as green graphs with a “T” logo:
    -
  • -
  • The “T” becomes a yellow and blue vertical bar when the scale is greater than 1:500.000
    -
  • -
- -

- -

- -

- -

- -

-The vertical bar contains a lot of information at a glance. -

- -

- -The tidal rise is 2.5m above the chart datum. The blue part is “water”. The “V” inside he bar indicates that the tide is decreasing towards Low Water. -

- -

- -Here, the tide is rising towards High Water. -

- -

- -Low Water looks like this. -

- -

- -High Water Looks like this. -

- -

-Right click the middle of either icon to see the tidal graph: - -

- -

- If a waypoint, route or a track is, or passes, on top of a tidal icon, a right-click will show a context menu for those features. To see the tidal graph, press “Show Tide Information” at the bottom of the menu. -

- -

- -

- -

-The Tidal Dialog gives the name of the station as well as the the name of the Data Source file. This is important when you have multiple sources covering the same area. Time and height for HW and LW is displayed in the upper right part. -

- -

-The Yellow box, with the tidal rise and time, follows the cursor when hovering over the dialog. The time axis at the bottom displays the time, in this case he timezone is “Z +01:00”, which is the same as one hour ahead (east) of UTC, that used to be called GMT. -

- -

-In North America it is common to use a three or four letter acronym for timezones. -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UNITED STATES TIME ZONE CODES UTC OFFSET
AST ATLANTIC STANDARD TIME UTC - 4
EST EASTERN STANDARD TIME UTC - 5
EDT EASTERN DAYLIGHT TIME UTC - 4
CST CENTRAL STANDARD TIME UTC - 6
CDT CENTRAL DAYLIGHT TIME UTC - 5
MST MOUNTAIN STANDARD TIME UTC - 7
MDT MOUNTAIN DAYLIGHT TIME UTC - 6
PST PACIFIC STANDARD TIME UTC - 8
PDT PACIFIC DAYLIGHT TIME UTC - 7
AKST ALASKA TIME UTC - 9
AKDT ALASKA DAYLIGHT TIME UTC - 8
HAST HAWAII-ALEUTIAN STANDARD TIME UTC - 10
HADT HAWAII-ALEUTIAN DAYLIGHT TIME UTC - 9
SST SAMOA STANDARD TIME UTC - 11
SDT SAMOA DAYLIGHT TIME UTC - 10
CHST CHAMORRO STANDARD TIME UTC +10
- -
- -

Displaying Currents

-
- -

-Available current stations will show on the chart as orange diamonds, when zooming in arrows will appear pointing in the direction of the set. Note that “current” here is short for “Tidal Current”, and is the same as the UK term “Tidal Stream”. -

- -

-Master current stations are shown like this -in all scales. No direction is associated with these stations but they can be queried, trough a right click, for the magnitude of the current. -

- -

- -

- -

-Arrow indicates current direction and strength - the bigger the arrow, the more current. -

- -

-The size of the arrows can be customized by users in the opencpn.ini (opencpn.conf) file.
- -

- -

-In the [Settings/Others] section you can set the option CurrentArrowScale to a positive number representing a percentage scaling factor of the current arrows. -The values bellow 100 mean the arrows will be smaller than now, the values above 100 will cause them to be bigger. -

- -

- -

- -

-A numerical value can be displayed next to the arrow. -

- -

-To do this go to Options→Ships→AIS Targets and tick the box “Show names with AIS targets at a scale grater than 1:”, and set a scale. When zoomed in to a scale greater than this, the current will also be displayed with a number -

- -

-Right click the orange box to see current graph: - -

- -

-If a waypoint, route or a track is, or passes, on top of a current icon, a rightclick will show a context menu for those features. To see the current graph, press “Show Current Information” at the bottom of the menu. -

- -

-The Yellow box, with time,speed and direction, follows the cursor when hovering over the dialog. -

- -

-Note that OpenCPN can only display “Reversing Currents” found in restricted waterways, such as rivers and straits. -

- -

-The general case with “Rotary Tidal Currents”, can not be displayed with this interface, but are available for some areas as Grib files. More here -Grib Weather Plugin -

- -
- -

Using alternative data sets

-
- -

-OpenCPN supports two tidal file formats. Xtides .tcd file format as well as the default .IDX type. The latter consits of a pair of files called HARMONIC and HARMONIC.IDX, in a directory. -

- -

-The default, IDX dataset for tides and currents is limited, mainly for copyright reasons. -

- -

-Please note that OpenCPN differs from XTide results, in very small amounts, usually a few minutes, regarding the times of slack water. This is due to the older algorithm used in OpenCPN compared to the most modern XTides implementation of subordinate station time offset calculation -

- -

-OpenCPN currently has a problem when multiple .tcd files are loaded. The reference station may be incorrectly identified. In practical navigation only one .tcd file is needed at any given time, depending on which side of the Atlantic you are navigating. -

- -

-A number of different datasets are available on the Internet, with vastly greater coverage. Some of these datasets are quite old, and they also contain glitches and errors, many of which have been corrected in the OpenCPN default dataset. -

- -

-In many areas there are no free alternatives, and OpenCPN makes it possible to switch between data sets and even using them at the same time. If two stations are located on exactly the same position, only one will be visible…… -

- -

-
- -

- -

-Go to Options→Charts→Tides & Currents. Press “Add Dataset..” to add another dataset. -

- -

-Tidal files can be located anywhere on your file system, but it will pay off to be organized. The first entry above shows the default location for the built in datafile on Linux. On windows a typical location is “C:\Program Files\OpenCPN\tcdata”. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/vector_text_display.html b/data/doc/toolbar_buttons/vector_text_display.html deleted file mode 100644 index ca77d6a645..0000000000 --- a/data/doc/toolbar_buttons/vector_text_display.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:vector_text_display - - - - - - - - - - - - - - - - - - - - - -
- - - -

Vector Text Display

-
- -

- -

- -

-OpenCPN makes a serious effort to be compliant with IHO standards for ECDIS display of cartography. -

- -

-First, one very important setting for vector charts is handled directly from the main toolbar. -This button toggles all text displayed on a vector chart On and Off. -The hotKey “T” is an alternative for toggling the text. -In OpenGL mode, all text will always be horizontal when using the “Course Up” option. -

- -

-Second, double clicking on a vector chart, as long as the cursor hasn't changed to a green arrow near the edges, brings up an information dialog, displaying the available vector-chart information at the selected point. Scroll down to see all the information. An alternative to double clicking is right-clicking and selecting “Object Query”. -Note that a single normal (left) click will center the chart at that point. -

- -

- -

- -

-The example is taken from double-clicking on a lighthouse in a busy area. -Exactly what is shown in this dialog depend on the settings described below in “Display Categories”. -

- -

-Third, it is possible to select what font is used for the text on vector charts. There is an entry in the ToolBox→Languages/Fonts→Choose Fonts tab, called ChartTexts. Here you select what font to use, and a template size. Weight and final size of the displayed texts depends on the charts you are using, but if the charts contain various weights and sizes, they will all scale together depending on what size you select. -

- -

-Options-Charts-Vector Charts Tab is where everything else is handled. -

- -

-If the S63 chart plugin is active, there will also be a “S63 Charts” tab. -

- -
- - -
- - diff --git a/data/doc/toolbar_buttons/zooming.html b/data/doc/toolbar_buttons/zooming.html deleted file mode 100644 index e7959fa1d9..0000000000 --- a/data/doc/toolbar_buttons/zooming.html +++ /dev/null @@ -1,208 +0,0 @@ - - - - - opencpn:opencpn_user_manual:toolbar_buttons:zooming - - - - - - - - - - - - - - - - - - - - - -
- - - -

Zooming

-
- -

- -

- -

-It is essential to understand what happens when both zooming in and zooming out in a chart view. Vector charts have their own issues, with both over- and under-zooming. Both can be potentially dangerous, and it's essential to understand what's going on. -

- -
- -

How too Zoom in/out

-
- -

-Zooming in makes the chart scale larger while zooming out makes the scale smaller -

- -

-These buttons allow you to zoom in and out on the chart currently being displayed. -

- -

-Will zoom the chart in for more detail, larger scale. -

- -

-Will zoom the chart view out for more area, smaller scale. -

- -

-Alternatively, the + and - keys on your keyboard will zoom in and out. If you have a mouse with a scroll wheel, it can also be used to quickly zoom in and out. -

- -

-Other alternatives for zooming includes: -

-
    -
  • Page Up for zooming in.
    -
  • -
  • Page Down for zooming out.
    -
  • -
  • Menu Bar→Navigate click Zoom In / Zoom Out
    -
  • -
- -

-For zooming in smaller steps try -

-
    -
  • Alt + for fine scale zooming in.
    -
  • -
  • Alt - for fine scale zooming out.
    -
  • -
  • Alt + scroll wheel, zooming in/out in small steps.
    -
  • -
- -

-Some settings for zooming are available in the Options→Display→General tab. Read more about “Smooth Panning/Zooming” and “Zoom to Cursor” in Options Setting. Note that -

-
    -
  • Keyboard, Menubar, and Toolbar zooms always zoom to the center of the screen.
    -
  • -
  • Wheel zoom behaviour changes depending on “Zoom To Cursor” and “SmoothZoom” settings.
    -
  • -
- -
- -

Overzooming

-
- -

-
- -Overzooming a raster chart. -

- -

-
- -Overzooming a vector chart. -

- -

-If you zoom in enough there will appear a warning “OverZoom” in the upper left part of the chart area. This means that you have zoomed in way to far, and are using the chart at a scale that was never intended, and that is not supported by the original survey. No new information will be seen, and the situation is potentially dangerous as it could give the impression of increased distance between dangers. On a raster-chart pixelation will be seen, but on a vector chart it is not so obvious when you have over zoomed. This is where the warning is useful. -

- -

-Your first action when the warning appears should be to zoom out at least one snap. Charts are generally based on surveys in twice the scale of the released chart, so when zooming in beyond a factor of 2, there is no support, increased details etc, in the underlying survey. OpenCPN warns for “OverZoom” when zooming with a factor of 4 or more. -

- -

-Overzooming settings are explained in Options Setting. In short OpenCPN, by default, blurs vector-charts and expands the text and lines to imitate what happens with raster charts when zooming in beyond a factor 10.0 x. -

- -

-Unlimited zooming is available using the background Map. Just create an empty chartgroup and switch to this map at any time. More in Chart Groups Tab. -

- -
- -

Underzooming

-
- -

-Underzooming is only a general problem with CM93 V2, in OpenCPN. The reason is the very poor graphical representation in small scale charts, of reefs, small islands and other dangers. The case with the Cargados Carajos Shoals in Indian Ocean is well known since Team Vestas grounding in the 2014/2015 Volvo Ocean Race. -

- -

-This is what you see. All pictures are in a scale of approximately 1:650.000. In the normal view, no indication at all appears of islands or reefs, even though the name in itself indicates, to a seasoned navigator, that more information should be sought elsewhere. Look upon a blue area as a warning sign. Zoom in to see if more deatails are available. If no more details show up, even using a large scale view, it indicates that the CM93 coverage is poor in the area. Once again, use alternative sources. -

- -

- -

- -

-Switching to single mode view, and with chart outlines active, OpenCPN shows that a larger scale chart is available. This will show on zooming in further. The available chart does not cover the southern end of the reef where Vestas ran aground. In some editions of CM93 more charts of the area are available, including the southern part. -

- -

- -

- -

-Compare this to the well thought out representation in the raster chart INT 702 in scale 1:3.500.000. -

- -

- -

- -
- -

Using CM93 in OpenCPN

-
- -

-It all starts with passage planning. The bottom line is: Don't trust CM93. Always check with other reliable sources, meaning, for example, raster charts, paper charts, Pilot Books, or ENC charts, not another privately issued vector chart, with similar problems (for example Navionics). -

- -

-Doing the best you can with OpenCPN and only CM93 available. -

- -

-For passages including small scale CM93 charts (A or Z scale): Create a route that you plan to follow. Switch to single chart mode. (Shortcut key “Q”.) Activate chart outlines. (Shortcut key “O”.) “Fly” along the route, making sure you are zoomed in to a factor of at least 2.5 x. Available charts should now be outlined in magenta. Drop suitable marks documenting these charts, and the dangers they represent, for later reference. -

- -

-Nigel Calder: “How to read a Nautical Chart, Second ed. 2012” is recommended to all users who want to know more about charts, the surveys they are based on, and their horizontal and vertical accuracy. -

- -
- - -
- - diff --git a/data/doc/ver500.html b/data/doc/ver500.html deleted file mode 100644 index a5a2fd4d3a..0000000000 --- a/data/doc/ver500.html +++ /dev/null @@ -1,364 +0,0 @@ - - - - OpenCPN Version 5.0.0 - - - - - - - - - - - -
-
- -

- -

OpenCPN version 5.0

-
- -

OpenCPN version 5.0

-Released: March 2019
-

What's New in V5

- - - -

The new version is a major update in both looks and features.  It introduces some very powerful tools – split, or dual, chart panels and saved configurations in form of templates.   -

Here, we'll get you acquainted with the main news in OpenCPN version5.

- -
-

-There are a few obvious changes as soon as you start and view the screen.
-There are now 2 toolbars, here seen in a contracted view.  The global Toolbar in the upper left corner, activated by clicking it, and the Chart Panel Bar, also called the Canvas Bar, in the lower right corner, activated by clicking the icon with 3 horizontal bars.  O5 can, as an option, be used with two different chart panels at the same time, each one with it's own toolbar for panel options.
- - -Note that the previous option to use a simplified scale-bar, now is default.  See lower left corner.
-More about using two chart-panels later.


- -

The Main Toolbar

- -

- -

The Main Toolbar to the left is similar to the old 4.8 version, with a different look.  The idea is that all the settings that changes infrequently are gathered here.   Quite a few buttons are gone, and you can now mostly find them in the chart-panels setting options.   Gone are the buttons for Zooming, Auto Follow, Vector chart Text, AIS and the tidal buttons.

-The Zoom in/out buttons and the autofollow buttons and the AIS button are now in the Chart Panel Bar in the lower right corner.  The “Shift to Larger/Smaller Scale Charts” buttons are gone for good.
-Buttons for plugins ends up in the Main Toolbar, that expands to two columns, as necessary.
-Right clicking on the Main Toolbar enables selection of what icons to show, same as in 4.8
-There is no option to revert to the old style Toolbar.


- -

Chart Panel Bar

-

The Chart Panel Bar contains zoom in/out button the chart scale, the Autofollow button and the icon to expand the Chart Panel Options sidebar.

- -The Autofollow button looks and works differently.  There are three different versions of this button, depending on what features that are active.
- -
- -This is the standard no-follow mode that you will see if Autofollow is not activated.  OpenCPN will revert to this mode if Autofollowing is active but you move the chart in such way that Own Ship ends up outside the Chart Panel.  In other words, Autofollowing will then be turned off.  - -
- -This is what you see if Chart Panel Options ? Look Ahead Mode is active.  This corresponds to the 4.8 Look Ahead Mode.  One difference is that Autofollow will not be turned off if you move the chart with the cursor, as long as Own Ship is still visible.  In this case the Own Ship Icon will auto revert to it's original position on the screen.
- -
-This mode is a more general version of the old Look Ahead mode.  Just Left Click and grab the canvas and move the boat to were you want it on the screen, and it will stay there.


- -

Chart Panel Options

- -

The Chart Panel Options contains well known options, that earlier were found in the different tabs in “Options” or in the Toolbar itself.  Note that the former vector chart text button has moved here as an option.  See Vector charts ? Show Text.  The “Mariner's Standard” vector charts display category has changed name to “User Standard”.


- -

Options

- -

The wrench (spanner) icon is gone and replaced by the standard cogwheel.
-Many settings in Options are now moved to the “Chart Panel Options” side bar, with the same function as in the 4.8 releases.  There are also a number of new options available.
- -The Options-Display-General Tab: The “Preserve scale when switching charts” option does not exist in O5 as it is now default behavior.

- -
- -

There is a new section called Canvas Layout.  This is where you can split the screen in two panels, or canvases.  To change to a view where you can see two charts at the same time, just click the split view icon and press “OK”.  The chart you were viewing earlier will be in the left panel.  The right panel will, to start with, contain a small scale view of the same area using your first chart group, if possible;  otherwise the background map.  Choose charts for the individual panels the same way as you did in 4.8.
- -


- -Each Chart Panel has it's own Canvas Bar and all the Chart Panel Options can be set individually for each displayed chart.  The size of the two panels can easily be adjusted by just grabbing the black vertical bar between the panels with the cursor + left Click, and move left or right.
- -There is always an “Active Panel” where, for example, keyboard input works.  It is marked by a narrow horizontal blue bar at the top of the panel that is active.  To make a panel active, left- or right-click somewhere on the panels canvas.  Hitting the “Tab” key will change which panel is active as well.
- -In multi-canvas mode, the first left-click on an inactive canvas will just change the focus.  After that, left-clicks will center the canvas on the click point as usual.
- -The easiest practical way to change between single and dual panel in an organized way is to use “Templates”.  Read on!


- -

The Options-Display-Advanced Tab

- -

Four options are canceled:
- -* Disable Full Screen Quilting
-* Suppress blur/fog effects on overzoom
-* Suppress scaled vector charts on overzoom
-* Enable Transparent Toolbar is removed.  This option is not relevant for V5.0.  Use the toolbar AutoHide option instead.
-
- -

The Options-Display-Templates Tab

- - -

Templates is a new and powerful concept in OpenCPN.  There are a lot of options and settings in OpenCPN.  Some of these may need changing as your navigation area and conditions change.

-Imagine that you have proceeded along the US Intracoastal Waterway – ICW for a few days using vector charts, with adjusted settings for shallow depth, course up display and AIS alarms, just as examples.  Heading out through a pass for an overnight offshore passage you find those settings unsuitable and you try to remember what settings you used to have when offshore. Do you remember them all?  Have you written them down, or do you have to start from scratch again?  -Templates solves the problem and you just have to switch from your “ICW” template to your prepared “Offshore” template as you clear the pass.
-This was just an example to get you started.  The possibilities are endless.

- -

So what settings are included in templates?
-
    -
  • Display single or dual chart panel option.
  • -
  • Every option in the “Chart Panel Options” sidebar, for each canvas.
  • -
  • Options-Ships-AIS Targets
  • -
  • All options in the Vector Chart Display Tab.
  • -
  • All settings in User Interface, except Fonts.
  • -
- -
-
What's not included?
-Generally hardware related settings and data that may originate from external sources and varies from one installation to another.  The best example of the latter is charts and layers.
-
    -
  • Screen-width and OpenGL settings
  • -
  • What charts you have installed. -
  • Chart view specifics.  Allows better compatibility between users.
  • -
  • Routes/Waypoints including settings in Options-Ships-Routes/Points
  • -
  • Layers, and layer visibility.
  • -
  • AIS target MMSI cache.
  • -
  • Settings in Options-Plugins
  • -
  • Settings in Options-Connections
  • -
  • Font settings

  • -
- - -

- -To create a new template/configuration press the “Create Config...” button in the “Templates” tab.  -But ... only do that after you have set all the options that you want included in the new template.  -A template is a named snapshot of how OpenCPN is configured at the moment of creation, that is saved for future use.

-

- -Give the new configuration a suitable name and description.
-From experience, it pays off to be organized and use clearly understandable names and very clear descriptions.  So clear that you understand your own intentions at 3 am being very tired, and experiencing a high and confusing sea.
- -To activate a configuration, simply press a template in the list and press “Apply Selected Config” + -“OK”.  Nothing stops you from further adjusting settings as usual.
- -


- -If all goes wrong when creating a template there is a default “Recovery Template” that takes you back to a safe and reasonable state.
- -


- -Above the list of templates there an area called “Template Status“ which will tell the name of the last applied configuration.

- -

Export and Import of Templates

- - -Templates are designed to be exchangeable between users.
-The idea is, for example, to be able to help friends and giving a teacher of a course in OpenCPN, a chance to give all participants the same settings.  Just to start with.  Many other scenarios are, of course, possible.
-


- -Templates are stored in the "Configs" directory, typically located at the C:\ProgramData\opencpn\ in Windows 10.  In Linux it's found in /home/"username"/.opencpn.  each template consists of a file named similar to this: "OCPNTemplate-lots of numbers.conf"
- -


- -Each template also has an entry in the "configs.xml" file.  See the blue highlighted text above.
-The entry starts with
"<config GUID=" and ends with "/>"
-

-To move a template from computer A to computer B:
-1.  Copy the "OCPNTemplate-lots of numbers.conf" file in computer A.
-2.  Paste it into the "Configs" directory on computer B.
-3.  Copy the templates entrance in the "configs.xml" on computer A.  See the highlighted blue area above.  Make sure that the entry "templateFile=" is the same as in the name of the file you copied in 1.
-4.  Paste this template entry into the "configs.xml" on computer B.  Make sure to keep the format of the xml file.  Do not change the beginning or the end of the file.  Be warned - xml is very picky!
-5.  Restart computer B.
-
- -

The Options Connections Tab

- -

This tab has a new layout and works like this:
-

    -
  • Click a connection to select it.  Click again to unselect it.
  • -
  • To edit or remove a connection, select it.
  • -
  • To "Add a Connection", make sure that no connection is selected.
  • -
-The only really new feature is the possibility to add personal comments to each connection.
- -
- -

Routes and Waypoints

- -

The visibility of way-points, including route-points, can now be adjusted to show either always, above a certain chart-scale or never.  This will help greatly to decrease clutter when you have a lot of marks.
-Old marks and waypoints will be in "always show" mode, as usual, to start with.
- -


- -

Some news on the waypoint properties “Extended” tab.  “Show at scale >1:”  is where a minimum scale to show the waypoint is set.  The grayed out big number you see is just to show the smallest scale that OpenCPN can accept, and should have no practical implication.
-At the bottom of the dialog you can connect the waypoint with a tidal station.  Press “v” to see available tidal stations and then “~” to display the tides.
- -


-The box GUID contains information for editing gpx files.
-Knowing the GUID is good to be able to find a specific object in OpenCPN's GPX data when processed in a text editor.
- - -In routepoint properties, some options are moved from the basic tab to the extended tab, which also includes a few new items described earlier or well known.
- -


- -The Route properties dialog has been reworked and expanded with an Advanced tab for a description of the route and for links.


- -

The Options-Ships-Routes/Points Tab

- -

- -

This new tab includes some option that has been moved from other tabs as well as new options.  -It is now possible to set the default icons used when creating waypoints and routes.

- -

Other Options that Affect Waypoints Visibility and Routes

- -

The 'V' hotkey turns off all waypoints, routes, and tracks on the chart display.   For dual display, it will turn these off in the chart display that is active.
-In the Routes & Mark Manager Waypoint Tab, the first two columns are about the visibility.   - -
-In the “Icon” column you can toggle the visibility by clicking the individual icon.
-In the second, “Scale” Column the visibility scale is listed.  This value only kicks in if the first column is set to show the waypoint icon.
- -It is now possible to create a new route via the right-click menu.   The same menu also now has the option “Toggle full screen”.
-
-

Using Active Routes

- -
- - -

In the console widget that pops up on activating a route...
-Clicking on the console cycles between the speed used for the calculations, instead of the original 2 states it now has 4 states:
- -Current Leg Using SOG to compute TTG
-Current Leg Using VMG to compute TTG
-Entire Route Using VMG to compute TTG and ETA
-Entire Route Using SOG to compute TTG and ETA
-
- - - -
-

- -

Persistent Layers

-

Creating Layers in OpenCPN is now much easier.
-A new button "Create Persistent Layer" in the Route & Mark Managers Layers Tab, copies the selected gpx file directly to the correct place.
-It's called persistent as it will be available as a layer on restart.
-A new column in the dialog tells if a layer is temporary or persistent.

- -

-When a Persistent layer is deleted, corresponding file is also deleted from the "layers" folder.

- -

Options-User Interface

- -

The option “Toolbar and Windows Style” is gone.  Only the new default style is available.
-Windows user have the ability to edit the “Audio Play Command”, but the default should just work.
-The Option “Sound Device Index” is replaced by a list of choices in “Sound Device”.
-There could be a few options in Linux while there may just be “Unknown device:0” in Windows.
-The defaults should just work in almost all cases.


- -

Built in Plugins

-

Grib graphics, like wind arrows, are shown on the right canvas only.
-The WMM plugin, displaying world magnetics info, has been updated with latest available data.
-
- -

Change in some Standard Waypoint Icons

-

Some of the marker icons that come with OpenCPN have been adjusted.

- - - - -
- -

The left east cardinal mark is from a vector chart.  The right is a waypoint marker icon.  The position of the left marker is at the center of the circle along the baseline.  The position of the right marker is now in the same place, even though the circle is absent.

- -
- -The markers of type "Symbol-Pin-color" and "Symbol-Spot-color" have their position at the sharp point.
-All other Standard Waypoint Icons are approximately centered in the middle of the icons.

- -

Expanded Vector Chart Information

- -

Many vector charts have built in links to files that come with the chart.
-Those files can be text or pictures.  For example, it's quite common that inland charts, both US and European, have pictures of bridges.
-In 05 these new links will be obvious when doing an Object Query, also called a cursor pick.

- -
- -This is from a Swiss inland ENC.  Double click on the bridge to get the dialog "Object Query" then click the blue underlined link and get the picture of the bridge.

- -
-Here is a US example from the Miami area.

- -

Preprocessing S57 and S63 Charts

- -

- -

Creating SENC charts from vector charts the first time they are used, now happens in the background.  The user can continue to use OpenCPN while this happens.   The newly processed charts will be directly available when they are ready.  During this process the background map changes colors to those of vector charts.   Note that only visible charts will be processed.
-To process all charts in one go, use Options-Charts-Chart Files-Prepare all ENC charts.  No change from 4.8.8.

- -

Warning for Empty Chart Groups

- -

This warning is very important if you start with an empty chart group.   For some reason, it prevents you from seeing any charts.  The first response should be to change to a chart group with charts in, for example, "All Active Charts" shortcut "0" (zero).

- -

New Chart Format Supported

- -

OpenCPN now supports MBTiles with the .mbtiles file extension and requires that OpenGL is on in Options-Display-Advanced.  Trying MBTiles without OpenGL will create a yellow popup warning just above the chart-bar.  "MBTile requires OpenGL to be enabled"
- -

MBTiles are colored "Violet" in the chartbar to separate them from other chart formats.

- -

- -

OpenCPN treats the MBTile format different from normal raster and vector charts.  MBtiles are NOT fully capable and quiltable charts.  They are used as switchable overlays.  This is seen as the best compromise considering the unknowable zoom composition and accuracy of tilesets loaded from unknown sources.
- -

MBTiles are shown as switchable overlays to whatever base chart sets are loaded.   In the picture above, the background map is the base-map and the MBTiles is a satpic overlay.  There are four charts in the chart-bar.  All are MBTiles.  Three are of a darker shade with a red "X".  One is a lighter shade of violet and represents the visible satpic.  Left click on a MBTiles piano key is a visibility toggle shortcut.  Same effect as Right-click->"hide" on a piano key.  Clicking on one of the darker shade buttons makes that MBTile chart visible.  The button changes to a lighter shade and the red "X" disappears.
- -

With MBTiles it's advisable to show the charts outline - use the "O" shortcut key.  If a chart is not visible, and there is no red "X" on the piano key, zoom in until it's visible.
- -

MBTiles use the Web Mercator projection, with possible quite large errors in geo referencing.  In real life these large errors are hard to find.
- -

NOAA has tile-sets available for all their charts.  There is however, no good reason to use this service as the tile-set will be much larger than corresponding kap chart sets. - -

For reasons mentioned above, the NOAA tile-sets do not fulfill the chart requirements for commercial shipping.
- - -

-

Chart Sources

- -

Allow chart source master catalog update from the internet.
- -

-

In Options->Plugins->ChartDownloader->Preferences there is a new Button, called "Update chart source catalog".  The button allows the user to update the list of support chart catalog.  Previously the user had to replace the data file in the install location.

- - -

AIS Improvements

- -

The column order, in the AIS target list dialog, will now be saved and reloaded in the same way as the column width.
-Waypoints created from the AIS target list dialog, will now have a useful name, consisting of target name, MMSI number and a time stamp.
- -

Enhancements to the AIS and DSC handling as requested by SAR services:
- -

    -
  • DSC position and distress report target names changed to include MMSI, to allow easy identification of the vessel in distress or reporting position
  • - -
  • The maximum allowed length of the AIS target track may be extended beyond 300 minutes by setting key "TargetTracksLimit" in Settings/AIS section of opencpn.ini(conf)
  • -

- -
- -

Miscellaneous

-

Higher baud rates are now available for all architectures.
-This means that OpenCPN is now available for a range of new electronics.
-A depth offset feature is now available in the Dashboard.
-The Grib plugin uses only the right pane if opened multi-canvas mode.
-

-




- - diff --git a/data/help_web.html b/data/help_web.html new file mode 100644 index 0000000000..e71cf85c68 --- /dev/null +++ b/data/help_web.html @@ -0,0 +1,51 @@ + + + + + + index + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
For Online Help
+ +click on
+ +OpenCPN.org
+ +
+ + + diff --git a/data/ssfn/FreeSans.sfn b/data/ssfn/FreeSans.sfn new file mode 100644 index 0000000000..a7b427a08a Binary files /dev/null and b/data/ssfn/FreeSans.sfn differ diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb75db..0000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index 169e2164ef..0000000000 --- a/debian/control +++ /dev/null @@ -1,59 +0,0 @@ -Source: opencpn -Section: misc -Priority: extra -Maintainer: Pavel Kalian -Build-Depends: debhelper (>= 9), - cmake3 | cmake (>> 3.5.0), - base-files (>=12) | lsb-core, - lsb-release, - libarchive-dev, - libbz2-dev, - libcairo2-dev, - libcurl4-openssl-dev, - libelf-dev, - libexif-dev, - libgdk-pixbuf2.0-dev, - libgl1-mesa-dev, - libglib2.0-dev, - liblz4-dev, - liblzma-dev, - libpango1.0-dev, - libsndfile1-dev, - libsqlite3-dev, - libssl-dev, - libtinyxml-dev, - libudev-dev, - libunarr-dev | base-files (<< 11), - libusb-1.0-0-dev, - base-files (>=12) | libwxgtk3.0-gtk3-dev, - base-files (>=12) | libwxgtk3.0-gtk3-0v5, - base-files (>=12) | libwxgtk-webview3.0-gtk3-dev, - base-files (<< 12) | libwxgtk3.2-dev, - base-files (<< 12) | libwxgtk-webview3.2-dev, - portaudio19-dev, - rapidjson-dev, - libxrandr-dev, - libgtk-3-dev, - base-files (<< 11) | libglew-dev, - base-files (>=11) | libglew2.1-static, - git -#For the ARM build, perhaps add: , libdri2-dev [armhf],libgles1-mesa-dev [armhf] -Standards-Version: 3.9.3 -Homepage: http://www.opencpn.org -#Vcs-Git: git://git.debian.org/collab-maint/opencpn.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/opencpn.git;a=summary - -Package: opencpn -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, wx-i18n -Breaks: opencpn-gshhs-crude (<< ${source:Version}), - opencpn-tcdata (<< ${source:Version}) -Provides: opencpn-plugin-wmm, opencpn-plugin-chartdldr -Conflicts: opencpn-plugin-wmm, opencpn-plugin-chartdldr -Replaces: opencpn-plugin-wmm, opencpn-plugin-chartdldr, - opencpn-gshhs-crude (<< ${source:Version}), - opencpn-tcdata (<< ${source:Version}), - opencpn-data (<< ${source:Version}) -Recommends: xcalib,xdg-utils,opencpn-doc,opencpn-sglock-amd64,opencpn-sglock-arm64,opencpn-sglock-arm32,libusb-0.1-4 -Description: Concise chartplotter and navigation software - OpenCPN is a free software (GPLv2) project to create a concise chartplotter and navigation software for use as an underway or planning tool. OpenCPN is developed by a team of active sailors using real world conditions for program testing and refinement. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index f55fabba26..0000000000 --- a/debian/copyright +++ /dev/null @@ -1,41 +0,0 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: opencpn -Source: - -Files: * -Copyright: David S. Register -License: GPL-2+ - This package 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 package 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, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -Files: debian/* -Copyright: 2012 Pavel Kalian -License: GPL-2+ - This package 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 package 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, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e845566c06..0000000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian/rules b/debian/rules deleted file mode 100755 index e2bb60d09a..0000000000 --- a/debian/rules +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/dpkg/architecture.mk -include /usr/share/dpkg/pkg-info.mk - -%: - dh $@ - - echo $(DEB_DISTRIBUTION) - -override_dh_auto_configure: -ifeq ($(DEB_BUILD_ARCH_CPU), arm) - dh_auto_configure -- \ - -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ - -DOCPN_ENABLE_SYSTEM_CMD_SOUND:BOOL=ON \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DDEB_VERSION=$(DEB_VERSION) \ - -DDEB_DISTRIBUTION=$(DEB_DISTRIBUTION) \ - -DOCPN_BUILD_TEST=OFF -else ifeq ($(DEB_BUILD_ARCH_CPU), aarch64) - dh_auto_configure -- \ - -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ - -DOCPN_ENABLE_SYSTEM_CMD_SOUND:BOOL=ON \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DDEB_VERSION=$(DEB_VERSION) \ - -DDEB_DISTRIBUTION=$(DEB_DISTRIBUTION) \ - -DOCPN_BUILD_TEST=OFF -else ifeq ($(DEB_BUILD_ARCH_CPU), arm64) - dh_auto_configure -- \ - -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ - -DOCPN_ENABLE_SYSTEM_CMD_SOUND:BOOL=ON \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DDEB_VERSION=$(DEB_VERSION) \ - -DDEB_DISTRIBUTION=$(DEB_DISTRIBUTION) \ - -DOCPN_BUILD_TEST=OFF -else - dh_auto_configure -- \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DDEB_VERSION=$(DEB_VERSION) \ - -DDEB_DISTRIBUTION=$(DEB_DISTRIBUTION) \ - -DOCPN_BUILD_TEST=OFF - -endif diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d82..0000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/flatpak/.gitignore b/flatpak/.gitignore index 8a7bfd0822..0c2531464c 100644 --- a/flatpak/.gitignore +++ b/flatpak/.gitignore @@ -1,2 +1,3 @@ plugin gpg +org.opencpn.OpenCPN.yaml diff --git a/flatpak/Makefile b/flatpak/Makefile index 6565c1e5cb..3640b78370 100755 --- a/flatpak/Makefile +++ b/flatpak/Makefile @@ -1,26 +1,38 @@ # -# Build the opencpn repo +# Build and install Flatpak OpenCPN # # NOTE: this is supposed to be run from the build dir, like # # cd build; make -f ../flatpak/Makefile ... # -GPG_KEY ?= leamas@opencpn.org -DESTDIR ?= website -GPG_HOMEDIR ?= $(shell readlink -fn gpg) -RSYNC_RSH ?= ssh -RSYNC_HOST ?= opencpnci@ocpnci.kalian.cz -REPO_URL ?= https://flatpak.ocpnci.kalian.cz +all: local-build -all: build sign +build: local-build build-only: flatpak-builder --repo=$(CURDIR)/repo --force-clean \ --build-only --keep-build-dirs --default-branch=devel \ app ../flatpak/org.opencpn.OpenCPN.yaml -build: +submodules: .phony + cd ../flatpak; \ + git submodule update --init org.opencpn.OpenCPN; \ + git submodule update --remote --rebase org.opencpn.OpenCPN; \ + cd ../flatpak/org.opencpn.OpenCPN; \ + git submodule update --init shared-modules; \ + git submodule update --remote --merge shared-modules + +manifest: submodules + cd ../flatpak; \ + cp org.opencpn.OpenCPN/org.opencpn.OpenCPN.yaml . ; \ + sed -i \ + -e 's|patches/|org.opencpn.OpenCPN/patches/|g' \ + -e 's|shared-modules/|org.opencpn.OpenCPN/shared-modules/|g' \ + -e '/name: opencpn/,$$s/tag:.*/branch: master/' \ + -e '/name: opencpn/,$$s/commit:.*/branch: master/' \ + org.opencpn.OpenCPN.yaml +ci-build: manifest flatpak-builder --repo=$(CURDIR)/repo --force-clean \ --default-branch=devel \ app ../flatpak/org.opencpn.OpenCPN.yaml @@ -28,49 +40,20 @@ build: flatpak install -y --user --reinstall \ $(CURDIR)/repo org.opencpn.OpenCPN//devel -install: .phony - rm -rf $(DESTDIR); mkdir $(DESTDIR) - cp ../flatpak/repo/*flat* ../flatpak/repo/index.html $(DESTDIR) - cp -ar repo $(DESTDIR) - rm -f $(DESTDIR)/repo/.lock +local-manifest: manifest + cd ../flatpak; \ + sed -i \ + -e '/name: opencpn/,$$s/url:.*/url: ../' \ + -e '/name: opencpn/,$$s/tag:.*/branch: HEAD/' \ + -e '/name: opencpn/,$$s/commit:.*/branch: HEAD/' \ + org.opencpn.OpenCPN.yaml -sign: .phony - @test -d $(GPG_HOMEDIR) || { \ - echo "cannot find GPG_HOMEDIR (abort)"; exit 1; \ - } - flatpak build-sign --gpg-sign=$(GPG_KEY) --gpg-homedir=$(GPG_HOMEDIR) \ - $(CURDIR)/website/repo - flatpak build-update-repo --gpg-sign=$(GPG_KEY) --prune \ - --gpg-homedir=$(GPG_HOMEDIR) \ - $(CURDIR)/website/repo - @for file in $(CURDIR)/website/opencpn.flatpakrepo \ - $(CURDIR)/website/opencpn.flatpakref;\ - do \ - echo "Signing $$file"; \ - sed -i '/GPGKey/d' $$file; \ - echo -n "GPGKey=" >> $$file ; \ - gpg2 --homedir=$(GPG_HOMEDIR) --export $(GPG_KEY) | \ - base64 --wrap=0 | tr -d '\n' >> $$file; \ - done - echo "Exporting gpg key" - -gpg2 --export -a --homedir=$(GPG_HOMEDIR) $(GPG_KEY) \ - > $(DESTDIR)/opencpn.key - - -repourl: - sed -i '/^Url/s|=.*|=$(REPO_URL)|' $(DESTDIR)/opencpn.flatpakref - -publish: - rsync -a --info=stats --rsh="$(RSYNC_RSH)" $(DESTDIR)/ \ - --delete-after \ - $(RSYNC_HOST):/var/www/ocpn-flatpak/website - -cloud-publish: - rsync -a --info=stats --rsh="ssh" website/ \ - --delete-after \ - rsync@mumin.crabdance.com:/home/rsync/flatpak/website - rsync -a --info=stats --rsh="ssh -p 2222" website/ \ - --delete-after \ - rsync@gafsan.crabdance.com:/home/rsync/flatpak/website +local-build: local-manifest + flatpak-builder --repo=$(CURDIR)/repo --force-clean \ + --default-branch=devel \ + app ../flatpak/org.opencpn.OpenCPN.yaml + -flatpak uninstall --user -y org.opencpn.OpenCPN.Locale//devel + flatpak install -y --user --reinstall \ + $(CURDIR)/repo org.opencpn.OpenCPN//devel .phony: diff --git a/flatpak/org.opencpn.OpenCPN b/flatpak/org.opencpn.OpenCPN new file mode 160000 index 0000000000..ba950c154c --- /dev/null +++ b/flatpak/org.opencpn.OpenCPN @@ -0,0 +1 @@ +Subproject commit ba950c154c765b54cde2440d6b2278baba7412d2 diff --git a/flatpak/org.opencpn.OpenCPN.yaml b/flatpak/org.opencpn.OpenCPN.yaml deleted file mode 100644 index aae1623339..0000000000 --- a/flatpak/org.opencpn.OpenCPN.yaml +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright (c) 2018 Alec Leamas -# -# 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 manifest is used to build development snapshots (including -# nightly builds) of the flatpak package. The official packaging -# lives in https://github.com/flathub/org.opencpn.OpenCPN -# - - -app-id: org.opencpn.OpenCPN -runtime: org.freedesktop.Platform -runtime-version: 22.08 -sdk: org.freedesktop.Sdk -command: opencpn.sh - -rename-desktop-file: opencpn.desktop -rename-icon: opencpn -rename-appdata-file: opencpn.appdata.xml - -finish-args: - - --socket=x11 - - --socket=pulseaudio - - --filesystem=home - - --share=network - - --device=all - - --allow=canbus - - --talk-name=org.opencpn.OpenCPN.* - - --system-talk-name=org.freedesktop.systemd1 - - --system-talk-name=org.freedesktop.login1 - -add-extensions: - org.opencpn.OpenCPN.Plugin: - directory: extensions - merge-dirs: lib/opencpn;share/opencpn/plugins;share/locale - subdirectories: true - no-autodownload: true - autodelete: false - -modules: - - name: pycairo - buildsystem: meson - sources: - - type: archive - url: https://files.pythonhosted.org/packages/c7/7c/de4d40316ee563e4f15a0f05f28c8458833fbef80c4588b9dd51f39b78ee/pycairo-1.25.1.tar.gz - sha256: 7e2be4fbc3b4536f16db7a11982cbf713e75069a4d73d44fe5a49b68423f5c0c - - name: PyGobject - buildsystem: meson - sources: - - type: archive - url: https://files.pythonhosted.org/packages/ac/4a/f24ddf1d20cc4b56affc7921e29928559a06c922eb60077448392792b914/PyGObject-3.46.0.tar.gz - sha256: 481437b05af0a66b7c366ea052710eb3aacbb979d22d30b797f7ec29347ab1e6 - - name: python-dbus - sources: - - type: archive - url: https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.3.2.tar.gz - sha256: ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8 - - - name: rapidjson - buildsystem: cmake - builddir: true - config-opts: - - -DRAPIDJSON_BUILD_DOC=OFF - - -DRAPIDJSON_BUILD_EXAMPLES=OFF - - -DRAPIDJSON_BUILD_TESTS=OFF - sources: - - type: archive - url: https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz - sha256: bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e - - type: patch - paths: - - src/0010-rapidjson-1.1.0-c++20.patch - - src/0011-rapidjson-1.1.0-do_not_include_gtest_src_dir.patch - - src/0012-Fix-Wclass-memaccess-warnings-errors.patch - - src/0013-gcc7.patch - - - name: glew - no-autogen: true - make-args: - - GLEW_PREFIX=/app - - GLEW_DEST=/app - - LIBDIR=/app/lib - make-install-args: - - GLEW_PREFIX=/app - - GLEW_DEST=/app - - LIBDIR=/app/lib - sources: - - type: archive - url: https://downloads.sourceforge.net/project/glew/glew/2.1.0/glew-2.1.0.tgz - sha256: 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 - cleanup: - - /include - - /lib/pkgconfig - - /lib/*.a - - - name: glu - config-opts: - - --disable-static - sources: - - type: archive - url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.2.tar.xz - sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 - cleanup: - - /include - - /lib/*.a - - /lib/*.la - - /lib/pkgconfig - - - name: libusb - config-opts: - - --disable-static - - --disable-udev - - --prefix=/app - sources: - - type: archive - url: https://github.com/libusb/libusb/archive/v1.0.22.tar.gz - sha256: 3500f7b182750cd9ccf9be8b1df998f83df56a39ab264976bdb3307773e16f48 - - name: portaudio - sources: - - type: archive - url: https://github.com/PortAudio/portaudio/archive/refs/tags/v19.7.0.tar.gz - sha256: 5af29ba58bbdbb7bbcefaaecc77ec8fc413f0db6f4c4e286c40c3e1b83174fa0 - config-opts: - - --disable-static - - - name: wxGTK3 - sources: - - type: archive - url: https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.5/wxWidgets-3.2.5.tar.bz2 - sha256: 0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51 - config-opts: - - --with-gtk=3 - - --with-opengl - - --with-sdl - - --with-libmspack - - --enable-intl - - --disable-rpath - - --enable-ipv6 - cleanup: - - /include/ - - - name: zlib - sources: - - type: archive - url: https://www.zlib.net/fossils/zlib-1.2.13.tar.gz - sha256: b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 - - - name: opencpn - buildsystem: cmake - builddir: true - config-opts: - - -DOCPN_BUNDLE_DOCS=ON - - -DOCPN_BUNDLE_TCDATA=ON - - -DOCPN_CI_BUILD=ON - - -DOCPN_FLATPAK=ON - - -DOCPN_USE_SYSFS_PORTS=ON - - -DBUILD_SHARED_LIBS=OFF - - -DOCPN_TARGET_TUPLE=flatpak-x86_64;22.08;x86_64 - - -DCMAKE_FIND_ROOT_PATH=/app;/usr - - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH - - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY - - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY - - -DCMAKE_BUILD_TYPE=Release - build-options: - build-args: - - --share=network - cxxflags: -DFLATPAK - cflags: -DFLATPAK - env: - BUILD_NUMBER: "0" - CCACHE_DISABLE: "1" - run-tests: true - test-rule: run-tests - post-install: - - install -d /app/extensions - - sed -i '/^Exec=/s/=.*/=opencpn.sh/' /app/share/applications/opencpn.desktop - - install -Dm 755 ../data/opencpn.sh /app/bin/opencpn.sh - sources: - - type: git - url: .. - branch: HEAD - - type: patch - path: ../flatpak/src/0008-flatpak-Add-a-shell-wrapper.patch diff --git a/flatpak/patches/0002-flatpak-Add-a-shell-wrapper.patch b/flatpak/patches/0002-flatpak-Add-a-shell-wrapper.patch deleted file mode 100644 index b046a15e3c..0000000000 --- a/flatpak/patches/0002-flatpak-Add-a-shell-wrapper.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0ef7d9ef5f4ce1d8c03294ea198f54a18f826e63 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Fri, 3 Aug 2018 18:50:08 +0200 -Subject: [PATCH] flatpak: Add a shell wrapper. - ---- -data/opencpn.sh | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 data/opencpn.sh - -diff --git a/data/opencpn.sh b/data/opencpn.sh -new file mode 100644 -index 000000000..fca02ad9c ---- /dev/null -+++ b/data/opencpn.sh -@@ -0,0 +1,7 @@ -+#!/bin/sh -+ -+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/app/extensions/share -+export GDK_BACKEND=x11 -+export OPENCPN_PLUGIN_DIRS=/app/extensions/lib/opencpn:/app/lib/opencpn -+ -+exec opencpn $@ --- -2.38.1 diff --git a/flatpak/patches/0101-Add-wxDEPRECATED_EXPORT_CORE-macro-for-wxTransformMa.patch b/flatpak/patches/0101-Add-wxDEPRECATED_EXPORT_CORE-macro-for-wxTransformMa.patch deleted file mode 100644 index 645072239d..0000000000 --- a/flatpak/patches/0101-Add-wxDEPRECATED_EXPORT_CORE-macro-for-wxTransformMa.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2d939a36653a7ea015c82c841a30dfd22f90cdad Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin -Date: Sun, 18 Sep 2022 18:27:04 +0200 -Subject: [PATCH] Add wxDEPRECATED_EXPORT_CORE() macro for wxTransformMatrix - -wxDEPRECATED_MSG() and WXDLLIMPEXP_CORE can't be used together in the -same declaration when the former uses the standard attribute ([[...]]) -and the latter uses a legacy one (__attribute__((....))), at least not -with gcc 12. - -Work around this problem by defining a special new macro that combines -both attributes in a working way. - -This is rather ugly, as it would seem to be better to just always define -WXDLLIMPEXP_CORE using the standard attribute, but unfortunately this -doesn't work as the standard attribute must be placed before the -function and variable declarations, while we currently use our DLL -export macros in the middle of the declaration. Maybe we can change all -the declarations doing this later, but for now this is the simplest -solution to the immediate problem. - -See #22790. ---- - include/wx/defs.h | 30 ++++++++++++++++++++++++++++++ - include/wx/matrix.h | 6 ++---- - 2 files changed, 32 insertions(+), 4 deletions(-) - -diff --git a/include/wx/defs.h b/include/wx/defs.h -index 102e8c9950..01b7c228a1 100644 ---- a/include/wx/defs.h -+++ b/include/wx/defs.h -@@ -697,6 +697,36 @@ typedef short int WXTYPE; - # define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x) - #endif - -+/* -+ Some gcc versions choke on __has_cpp_attribute(gnu::visibility) due to the -+ presence of the colon, but we only need this macro in C++ code, so just -+ don't define it when using C. -+ */ -+#ifdef __cplusplus -+ -+/* -+ Special macro used for the classes that are exported and deprecated. -+ It exists because standard [[deprecated]] attribute can't be combined with -+ legacy __attribute__((visibility)), but we can't use [[visibility]] instead -+ of the latter because it can't be use in the same place in the declarations -+ where we use WXDLLIMPEXP_CORE. So we define this special macro which uses -+ the standard visibility attribute just where we can't do otherwise. -+ */ -+/* #ifdef wxHAS_DEPRECATED_ATTR */ -+/* #if __has_cpp_attribute(gnu::visibility) */ -+ #define wxDEPRECATED_EXPORT_CORE(msg) \ -+ __attribute__((visibility("default"))) -+/* #endif */ -+/* #endif */ -+ -+#ifndef wxDEPRECATED_EXPORT_CORE -+ /* Fall back when nothing special is needed or available. */ -+ #define wxDEPRECATED_EXPORT_CORE(msg) \ -+ wxDEPRECATED_MSG(msg) WXDLLIMPEXP_CORE -+#endif -+ -+#endif /* __cplusplus */ -+ - /* - Macros to suppress and restore gcc warnings, requires g++ >= 4.6 and don't - do anything otherwise. -diff --git a/include/wx/matrix.h b/include/wx/matrix.h -index d18a0d2321..3b3225d3fa 100644 ---- a/include/wx/matrix.h -+++ b/include/wx/matrix.h -@@ -38,10 +38,8 @@ - // At all times m_isIdentity is set if the matrix itself is an Identity matrix. - // It is used where possible to optimize calculations. - class --#ifndef WXBUILDING --wxDEPRECATED_MSG("use wxAffineMatrix2D instead") --#endif --WXDLLIMPEXP_CORE wxTransformMatrix: public wxObject -+wxDEPRECATED_EXPORT_CORE("use wxAffineMatrix2D instead") -+wxTransformMatrix: public wxObject - { - public: - wxTransformMatrix(); --- -2.38.1 - diff --git a/flatpak/src/0001-error.c-Add-missing-stddef-include.patch b/flatpak/src/0001-error.c-Add-missing-stddef-include.patch deleted file mode 100644 index 3d67a0e175..0000000000 --- a/flatpak/src/0001-error.c-Add-missing-stddef-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a70564d4fddb9138ff50846289b21a22672020de Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Sat, 31 Jul 2021 18:50:07 +0200 -Subject: [PATCH] error.c: Add missing stddef include. - ---- - src/libutil/error.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libutil/error.c b/src/libutil/error.c -index 7212748..fcc0e3b 100644 ---- a/src/libutil/error.c -+++ b/src/libutil/error.c -@@ -27,7 +27,7 @@ - * other dealings in this Software without prior written authorization from - * Silicon Graphics, Inc. - */ -- -+#include - #include "gluos.h" - #include "gluint.h" - #include --- -2.30.2 - diff --git a/flatpak/src/0008-flatpak-Add-a-shell-wrapper.patch b/flatpak/src/0008-flatpak-Add-a-shell-wrapper.patch deleted file mode 100644 index f70ab5ba02..0000000000 --- a/flatpak/src/0008-flatpak-Add-a-shell-wrapper.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fc232a016a70bb764669ac61f86c297cb03eb1dc Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Fri, 3 Aug 2018 18:50:08 +0200 -Subject: [PATCH] flatpak: Add a shell wrapper. - ---- - data/opencpn.sh | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - create mode 100644 data/opencpn.sh - -diff --git a/data/opencpn.sh b/data/opencpn.sh -new file mode 100644 -index 000000000..698d4dd9a ---- /dev/null -+++ b/data/opencpn.sh -@@ -0,0 +1,17 @@ -+#!/bin/bash -+set -o pipefail -+ -+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/app/extensions/share -+export OPENCPN_PLUGIN_DIRS=/app/extensions/lib/opencpn:/app/lib/opencpn -+ -+if [ -f /.flatpak-info ]; then -+ fp_vers="$(grep flatpak-version /.flatpak-info | sed -e 's/.*=//')" -+ num_vers="$(echo $fp_vers | tr -d '.')" -+ if (( num_vers < 120 )); then -+ export OPENPN_FATAL_ERROR="Flatpak version $fp_vers is too old." -+ fi -+else -+ export OPENPN_FATAL_ERROR="Flatpak version is too old." -+fi -+ -+exec opencpn $@ --- -2.24.1 - diff --git a/flatpak/src/0010-rapidjson-1.1.0-c++20.patch b/flatpak/src/0010-rapidjson-1.1.0-c++20.patch deleted file mode 100644 index 9b10ae6c43..0000000000 --- a/flatpak/src/0010-rapidjson-1.1.0-c++20.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit c6c56d87ff12ba8100b261f371fdaa106f95fe14 -Author: Tom Hughes -Date: Tue Sep 1 19:24:03 2020 +0100 - - Avoid ambiguous operator errors in C++20 - - Derived from upstream commit ebcbd04484fcdaddbb9fd7798e76bbfb4ae8f840 - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index e3e20dfb..1485321d 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -168,12 +168,12 @@ public: - - //! @name relations - //@{ -- bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; } -- bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; } -- bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; } -- bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; } -- bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; } -- bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; } -+ template bool operator==(const GenericMemberIterator& that) const { return ptr_ == that.ptr_; } -+ template bool operator!=(const GenericMemberIterator& that) const { return ptr_ != that.ptr_; } -+ template bool operator<=(const GenericMemberIterator& that) const { return ptr_ <= that.ptr_; } -+ template bool operator>=(const GenericMemberIterator& that) const { return ptr_ >= that.ptr_; } -+ template bool operator< (const GenericMemberIterator& that) const { return ptr_ < that.ptr_; } -+ template bool operator> (const GenericMemberIterator& that) const { return ptr_ > that.ptr_; } - //@} - - //! @name dereference diff --git a/flatpak/src/0011-rapidjson-1.1.0-do_not_include_gtest_src_dir.patch b/flatpak/src/0011-rapidjson-1.1.0-do_not_include_gtest_src_dir.patch deleted file mode 100644 index 18e8e8023a..0000000000 --- a/flatpak/src/0011-rapidjson-1.1.0-do_not_include_gtest_src_dir.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e61866f098098422462e8bc220506443e76c3bb0 -Author: Björn Esser -Date: Sun Apr 3 11:21:47 2016 +0200 - - do not include gtest_src_dir - -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 11c1b04..43377db 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -8,7 +8,7 @@ IF(GTESTSRC_FOUND) - set(gtest_force_shared_crt ON) - endif() - -- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) -+# add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) - include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) - - set(TEST_LIBRARIES gtest gtest_main) diff --git a/flatpak/src/0012-Fix-Wclass-memaccess-warnings-errors.patch b/flatpak/src/0012-Fix-Wclass-memaccess-warnings-errors.patch deleted file mode 100644 index ee14248183..0000000000 --- a/flatpak/src/0012-Fix-Wclass-memaccess-warnings-errors.patch +++ /dev/null @@ -1,57 +0,0 @@ -From fa5963a2f5b231ee2babff771f169ccca22870ed Mon Sep 17 00:00:00 2001 -From: Philipp A Hartmann -Date: Sun, 15 Jul 2018 14:17:14 +0200 -Subject: [PATCH 1/3] Fix -Wclass-memaccess warnings/errors - -Recent GCC versions warn about using memcpy/memmove to -write to a class pointer (-Wclass-memaccess). - -Avoid the warnings by casting to void* first. - -Closes #1086. -Closes #1205. -Closes #1246. ---- - include/rapidjson/document.h | 20 +++++--------------- - 1 file changed, 5 insertions(+), 15 deletions(-) - ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -1425,7 +1425,7 @@ - MemberIterator pos = MemberBegin() + (first - MemberBegin()); - for (MemberIterator itr = pos; itr != last; ++itr) - itr->~Member(); -- std::memmove(&*pos, &*last, static_cast(MemberEnd() - last) * sizeof(Member)); -+ std::memmove(static_cast(&*pos), &*last, static_cast(MemberEnd() - last) * sizeof(Member)); - data_.o.size -= static_cast(last - first); - return pos; - } -@@ -1628,8 +1628,8 @@ - RAPIDJSON_ASSERT(last <= End()); - ValueIterator pos = Begin() + (first - Begin()); - for (ValueIterator itr = pos; itr != last; ++itr) -- itr->~GenericValue(); -- std::memmove(pos, last, static_cast(End() - last) * sizeof(GenericValue)); -+ itr->~GenericValue(); -+ std::memmove(static_cast(pos), last, static_cast(End() - last) * sizeof(GenericValue)); - data_.a.size -= static_cast(last - first); - return pos; - } -@@ -1936,7 +1936,7 @@ - if (count) { - GenericValue* e = static_cast(allocator.Malloc(count * sizeof(GenericValue))); - SetElementsPointer(e); -- std::memcpy(e, values, count * sizeof(GenericValue)); -+ std::memcpy(static_cast(e), values, count * sizeof(GenericValue)); - } - else - SetElementsPointer(0); -@@ -1949,7 +1949,7 @@ - if (count) { - Member* m = static_cast(allocator.Malloc(count * sizeof(Member))); - SetMembersPointer(m); -- std::memcpy(m, members, count * sizeof(Member)); -+ std::memcpy(static_cast(m), members, count * sizeof(Member)); - } - else - SetMembersPointer(0); diff --git a/flatpak/src/0013-gcc7.patch b/flatpak/src/0013-gcc7.patch deleted file mode 100644 index f753552c29..0000000000 --- a/flatpak/src/0013-gcc7.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: fix build with gcc7 - From - https://github.com/miloyip/rapidjson/commit/fe19b7b6016d446722621fb407738209d1a911e8 -and - https://github.com/miloyip/rapidjson/commit/cba45fe9de6923b858edb0780e257b7257aa4f7b -Bug-Debian: https://bugs.debian.org/846568 - ---- -Origin: upstream -Forwarded: not-needed -Last-Update: 2017-08-26 - ---- rapidjson-1.1.0+dfsg.orig/include/rapidjson/internal/regex.h -+++ rapidjson-1.1.0+dfsg/include/rapidjson/internal/regex.h -@@ -29,6 +29,9 @@ RAPIDJSON_DIAG_OFF(implicit-fallthrough) - #ifdef __GNUC__ - RAPIDJSON_DIAG_PUSH - RAPIDJSON_DIAG_OFF(effc++) -+#if __GNUC__ >= 7 -+RAPIDJSON_DIAG_OFF(implicit-fallthrough) -+#endif - #endif - - #ifdef _MSC_VER diff --git a/gui/include/gui/AISTargetAlertDialog.h b/gui/include/gui/AISTargetAlertDialog.h index 02354fefe6..8ab3437f43 100644 --- a/gui/include/gui/AISTargetAlertDialog.h +++ b/gui/include/gui/AISTargetAlertDialog.h @@ -35,6 +35,7 @@ class AisDecoder; class wxHtmlWindow; + class OCPN_AlertDialog : public wxDialog { DECLARE_CLASS(OCPN_AlertDialog) DECLARE_EVENT_TABLE() @@ -54,6 +55,10 @@ class OCPN_AlertDialog : public wxDialog { wxWindow* m_pparent; }; +/** + * Dialog for displaying AIS target alerts. Shows alerts for specific AIS targets, + * allowing user interaction such as acknowledging or silencing the alert. + */ class AISTargetAlertDialog : public OCPN_AlertDialog { DECLARE_CLASS(AISTargetAlertDialog) DECLARE_EVENT_TABLE() @@ -88,7 +93,7 @@ class AISTargetAlertDialog : public OCPN_AlertDialog { void OnIdJumptoClick(wxCommandEvent& event); void OnIdCreateWPClick(wxCommandEvent& event); - wxWindow *m_pParent; + wxWindow* m_pParent; wxHtmlWindow* m_pAlertTextCtl; int m_target_mmsi; AisDecoder* m_pdecoder; diff --git a/gui/include/gui/AISTargetListDialog.h b/gui/include/gui/AISTargetListDialog.h index 7163248bee..d7cef7ce3b 100644 --- a/gui/include/gui/AISTargetListDialog.h +++ b/gui/include/gui/AISTargetListDialog.h @@ -48,6 +48,10 @@ class wxAuiManagerEvent; WX_DEFINE_SORTED_ARRAY_INT(int, ArrayOfMMSI); +/** + * Dialog for displaying a list of AIS targets. Shows a list of AIS targets, + * allowing users to view and interact with multiple AIS targets. + */ class AISTargetListDialog : public wxPanel { DECLARE_CLASS(AISTargetListDialog) diff --git a/gui/include/gui/AISTargetQueryDialog.h b/gui/include/gui/AISTargetQueryDialog.h index 90326f2ace..c6b31d41a2 100644 --- a/gui/include/gui/AISTargetQueryDialog.h +++ b/gui/include/gui/AISTargetQueryDialog.h @@ -35,6 +35,10 @@ class wxHtmlWindow; class AisTargetData; +/** + * Dialog for querying detailed information about an AIS target. Displays detailed + * information about a specific AIS target and allows user interaction. + */ class AISTargetQueryDialog : public wxFrame { DECLARE_CLASS(AISTargetQueryDialog) DECLARE_EVENT_TABLE() diff --git a/gui/include/gui/AboutFrame.h b/gui/include/gui/AboutFrame.h index bd77b342b5..8bfe01a948 100644 --- a/gui/include/gui/AboutFrame.h +++ b/gui/include/gui/AboutFrame.h @@ -33,9 +33,10 @@ /////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// -/// Class AboutFrame -/////////////////////////////////////////////////////////////////////////////// +/** + * Represents the main frame for the About dialog. Implements the main frame + * that contains various controls to display information about OpenCPN. + */ class AboutFrame : public wxFrame { private: protected: diff --git a/gui/include/gui/AboutFrameImpl.h b/gui/include/gui/AboutFrameImpl.h index 31077caf3c..95e4661883 100644 --- a/gui/include/gui/AboutFrameImpl.h +++ b/gui/include/gui/AboutFrameImpl.h @@ -27,6 +27,10 @@ #include "AboutFrame.h" +/** + * Implements the AboutFrame class with additional functionality. Extends AboutFrame + * and provides implementation for various event handlers and additional methods. + */ class AboutFrameImpl : public AboutFrame { protected: void AboutFrameOnClose(wxCloseEvent& event) { @@ -45,8 +49,11 @@ class AboutFrameImpl : public AboutFrame { void AboutFrameOnActivate(wxActivateEvent& event); #if wxUSE_WEBVIEW && defined(HAVE_WEBVIEW) void m_btnBackOnButtonClick(wxCommandEvent& event) { - m_htmlWinHelp->GoBack(); - m_btnBack->Enable(m_htmlWinHelp->CanGoBack()); + wxString locn = m_htmlWinHelp->GetCurrentURL(); + if (!locn.Contains("toc_flat")) { + m_htmlWinHelp->GoBack(); + m_btnBack->Enable(m_htmlWinHelp->CanGoBack()); + } } #else void m_btnBackOnButtonClick(wxCommandEvent& event) { @@ -62,7 +69,7 @@ class AboutFrameImpl : public AboutFrame { void RecalculateSize(void); public: - ~AboutFrameImpl(){}; + ~AboutFrameImpl() {}; AboutFrameImpl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About OpenCPN"), diff --git a/gui/include/gui/AdapterInfo.h b/gui/include/gui/AdapterInfo.h index 2cbfcdc4c0..e88563ae5e 100644 --- a/gui/include/gui/AdapterInfo.h +++ b/gui/include/gui/AdapterInfo.h @@ -2,22 +2,24 @@ #include +/** + * Represents network adapter information and provides related functionality. + * Encapsulates IP address, netmask, and gateway, with methods to calculate and retrieve the broadcast address. + */ class AdapterInfo { - std::string IPAddress; - std::string NetMask; - std::string GateWay; - void QueryAdapterInfo(); - unsigned long ipToLong(const std::string& ip); - std::string longToIp(unsigned long ip); - + std::string IPAddress; + std::string NetMask; + std::string GateWay; + void QueryAdapterInfo(); + unsigned long ipToLong(const std::string& ip); + std::string longToIp(unsigned long ip); public: - AdapterInfo(); - std::string GetIPAddress(); - std::string GetNetMask(); - std::string GetGateWay(); - std::string CalculateBroadcastAddress(const std::string& ip, const std::string& netmask); - std::string GetBroadcastAddress(); + AdapterInfo(); + std::string GetIPAddress(); + std::string GetNetMask(); + std::string GetGateWay(); + std::string CalculateBroadcastAddress(const std::string& ip, + const std::string& netmask); + std::string GetBroadcastAddress(); }; - - diff --git a/gui/include/gui/CanvasConfig.h b/gui/include/gui/CanvasConfig.h index a25bd29d39..81857632ba 100644 --- a/gui/include/gui/CanvasConfig.h +++ b/gui/include/gui/CanvasConfig.h @@ -37,7 +37,10 @@ class ChartCanvas; class wxFileConfig; -// Class to encapsulate persistant canvas configuration(s) +/** + * Encapsulates persistent canvas configuration. Stores various settings for a chart canvas, + * including position, scale, rotation, and display options for different chart elements. + */ class canvasConfig { public: canvasConfig(); diff --git a/gui/include/gui/CanvasOptions.h b/gui/include/gui/CanvasOptions.h index e37b0877d1..7833daf219 100644 --- a/gui/include/gui/CanvasOptions.h +++ b/gui/include/gui/CanvasOptions.h @@ -27,42 +27,95 @@ #ifndef __canvasoption_H__ #define __canvasoption_H__ -//---------------------------------------------------------------------------- -// constants -//---------------------------------------------------------------------------- +/** + * Enumeration of control IDs used in the CanvasOptions dialog. + */ enum { + /** @brief ID for checkbox to show depth units */ IDCO_SHOWDEPTHUNITSBOX1 = 31000, + /** @brief ID for checkbox to show chart outlines */ IDCO_OUTLINECHECKBOX1, + /** @brief ID for checkbox to display grid */ IDCO_CHECK_DISPLAYGRID, + /** @brief ID for checkbox related to zoom-to-cursor functionality */ IDCO_ZTCCHECKBOX, + /** @brief ID for checkbox to enable smooth pan/zoom */ IDCO_SMOOTHPANZOOMBOX, + /** @brief ID for checkbox to preserve scale during operations */ IDCO_PRESERVECHECKBOX, + /** @brief ID for checkbox to enable chart quilting + * + * Chart quilting combines multiple electronic charts into a seamless display. + * When enabled, the system automatically selects and blends the most appropriate + * charts based on the current view and zoom level. This provides a continuous + * navigation experience without visible chart boundaries, potentially combining + * charts of different scales or from different sources. + */ IDCO_QUILTCHECKBOX1, + /** @brief ID for checkbox to enable look-ahead mode + * + * Look-ahead mode automatically adjusts the chart view to show more of the area + * ahead of the vessel based on its current course and speed. This feature helps + * navigators anticipate upcoming navigational challenges or points of interest. + * When enabled, the chart view is typically shifted so that the vessel's position + * is not centered but offset towards the bottom of the screen, showing more of + * the area ahead. + */ IDCO_CHECK_LOOKAHEAD, + /** @brief ID for checkbox to set course-up orientation + * + * In course-up mode, the chart is rotated so that the vessel's current course + * is always pointing towards the top of the screen. This orientation changes + * dynamically as the vessel changes course. It's particularly useful for + * navigation as it aligns the chart view with the vessel's direction of travel, + * making it easier to interpret upcoming features or obstacles. + */ IDCO_COURSEUPCHECKBOX, + /** @brief ID for checkbox to set head-up orientation + * + * In head-up mode, the chart is rotated so that the vessel's current heading + * (the direction the bow is pointing) is always at the top of the screen. + * This mode updates in real-time based on data from a compass or heading sensor. + * It's useful for understanding the vessel's orientation relative to charted + * objects, especially in situations with strong currents where heading and + * course might differ significantly. + */ IDCO_HEADUPCHECKBOX, + /** @brief ID for checkbox to show tides */ IDCO_TIDES_CHECKBOX, + /** @brief ID for checkbox to show currents */ IDCO_CURRENTS_CHECKBOX, + /** @brief ID for checkbox to show ENC (Electronic Navigational Chart) text */ IDCO_ENCTEXT_CHECKBOX1, + /** @brief ID for checkbox to show/hide toolbar */ ID_TOOLBARCHECKBOX, + /** @brief ID for control to set ENC display category */ ID_CODISPCAT, + /** @brief ID for checkbox to show ENC depths */ IDCO_ENCDEPTH_CHECKBOX1, + /** @brief ID for checkbox to show ENC buoys */ IDCO_ENCBUOY_CHECKBOX1, + /** @brief ID for checkbox to show ENC buoy labels */ IDCO_ENCBUOYLABEL_CHECKBOX1, + /** @brief ID for checkbox to show ENC anchor details */ IDCO_ENCANCHOR_CHECKBOX1, + /** @brief ID for checkbox to show AIS (Automatic Identification System) targets */ IDCO_SHOW_AIS_CHECKBOX, + /** @brief ID for checkbox to attenuate AIS targets */ IDCO_ATTEN_AIS_CHECKBOX, + /** @brief ID for checkbox to show ENC visible light sectors */ IDCO_ENCVISIBLESECTORS_CHECKBOX1, + /** @brief ID for checkbox to show ENC data quality indicators */ IDCO_ENCDATAQUALITY_CHECKBOX, }; class MyFrame; class ChartCanvas; -//---------------------------------------------------------------------------- -// CanvasOptions -//---------------------------------------------------------------------------- - +/** + * Represents the Canvas Options dialog. Implements a dialog that allows users + * to configure various options for the chart canvas display. + */ class CanvasOptions : public wxDialog { public: CanvasOptions(wxWindow *parent); @@ -101,7 +154,9 @@ class CanvasOptions : public wxDialog { wxChoice *m_pDispCat; wxCheckBox *pCBENCDepth, *pCBENCLightDesc, *pCBENCBuoyLabels, *pCBENCLights, *pCBENCAnchorDetails; - wxCheckBox *pCBShowAIS, *pCBAttenAIS, *pCBENCVisibleSectors, *pCBENCDataQuality; + wxCheckBox *pCBShowAIS, *pCBAttenAIS, *pCBENCVisibleSectors, + *pCBENCDataQuality; + bool m_bmode_change_while_hidden; // Coming from compass icon click DECLARE_EVENT_TABLE() }; diff --git a/gui/include/gui/ChInfoWin.h b/gui/include/gui/ChInfoWin.h index 196c1b465b..bb06159161 100644 --- a/gui/include/gui/ChInfoWin.h +++ b/gui/include/gui/ChInfoWin.h @@ -28,6 +28,10 @@ #include #include +/** + * A custom panel for displaying chart information. Represents a panel that displays + * information about a chart, such as its scale and other relevant details. + */ class ChInfoWin : public wxPanel { public: ChInfoWin(wxWindow* parent); @@ -48,6 +52,7 @@ class ChInfoWin : public wxPanel { wxStaticText* m_pInfoTextCtl; int dbIndex; int chart_scale; + private: wxString m_string; wxSize m_size; diff --git a/gui/include/gui/ConfigMgr.h b/gui/include/gui/ConfigMgr.h index 80650840e1..8a0dd82a38 100644 --- a/gui/include/gui/ConfigMgr.h +++ b/gui/include/gui/ConfigMgr.h @@ -38,9 +38,8 @@ class OCPNConfigObject; WX_DECLARE_LIST(OCPNConfigObject, ConfigObjectList); /** - * Manages the user config matrix. - * - * Singleton. + * Manages the user configuration matrix. Singleton that handles the creation, + * deletion, and management of user configurations in OpenCPN. */ class ConfigMgr { public: @@ -56,7 +55,7 @@ class ConfigMgr { wxString GetTemplateTitle(wxString GUID); bool ApplyConfigGUID(wxString GUID); bool CheckTemplateGUID(wxString GUID); - arrayofCanvasConfigPtr &GetCanvasConfigArray(){ return g_canvasConfigArray;} + arrayofCanvasConfigPtr &GetCanvasConfigArray() { return g_canvasConfigArray; } private: // private for singleton ConfigMgr(); @@ -80,9 +79,12 @@ class ConfigMgr { OCPNConfigCatalog *m_configCatalog; ConfigObjectList *configList; arrayofCanvasConfigPtr g_canvasConfigArray; - }; +/** + * Represents a panel for displaying and editing a configuration. Creates a wxPanel + * that shows the details of a specific configuration object and allows for user interaction. + */ class ConfigPanel : public wxPanel { public: ConfigPanel(OCPNConfigObject *config, wxWindow *parent, diff --git a/gui/include/gui/DetailSlider.h b/gui/include/gui/DetailSlider.h index f672a50a83..f6b9568a44 100644 --- a/gui/include/gui/DetailSlider.h +++ b/gui/include/gui/DetailSlider.h @@ -25,13 +25,15 @@ #ifndef __DETAILSLIDE_H #define __DETAILSLIDE_H - #include #include #include "chartdb.h" -//#include "chcanv.h" +// #include "chcanv.h" +/** + * A popup frame containing a detail slider for chart display. + */ class PopUpDSlide : public wxFrame { public: PopUpDSlide(wxWindow* parent, wxWindowID id, ChartTypeEnum ChartType, diff --git a/gui/include/gui/FlexHash.h b/gui/include/gui/FlexHash.h index 5904532a5c..c6cd04d622 100644 --- a/gui/include/gui/FlexHash.h +++ b/gui/include/gui/FlexHash.h @@ -32,6 +32,9 @@ #include #include "ssl/sha1.h" +/** + * A class for computing hash of arbitrary length. + */ class FlexHash { public: FlexHash(size_t output_octets); diff --git a/gui/include/gui/FontMgr.h b/gui/include/gui/FontMgr.h index 8f10976e3c..3c7ca42851 100644 --- a/gui/include/gui/FontMgr.h +++ b/gui/include/gui/FontMgr.h @@ -45,7 +45,7 @@ class FontMgr { void SetLocale(wxString &newLocale); wxFont *GetFont(const wxString &TextElement, int default_size = 0); wxColour GetFontColor(const wxString &TextElement) const; - wxColour GetDefaultFontColor( const wxString &TextElement ); + wxColour GetDefaultFontColor(const wxString &TextElement); bool SetFontColor(const wxString &TextElement, const wxColour color) const; int GetNumFonts(void) const; diff --git a/gui/include/gui/IDX_entry.h b/gui/include/gui/IDX_entry.h index 82bc7f7a02..8950122ebe 100644 --- a/gui/include/gui/IDX_entry.h +++ b/gui/include/gui/IDX_entry.h @@ -32,75 +32,85 @@ class TCDataSource; class Station_Data; +/** + * Enumeration of source data types. + */ typedef enum { - SOURCE_TYPE_UNKNOWN, - SOURCE_TYPE_ASCII_HARMONIC, - SOURCE_TYPE_BINARY_HARMONIC, + SOURCE_TYPE_UNKNOWN, ///< Unknown source type + SOURCE_TYPE_ASCII_HARMONIC, ///< ASCII harmonic source type + SOURCE_TYPE_BINARY_HARMONIC, ///< Binary harmonic source type } source_data_t; +/** + * Represents an index entry for tidal and current data. Stores various attributes + * and data related to tidal and current stations, including location, offsets, and harmonic constituents. + */ class IDX_entry { public: IDX_entry(); ~IDX_entry(); - source_data_t source_data_type; - TCDataSource *pDataSource; - char source_ident[MAXNAMELEN]; // actually, the file name + source_data_t source_data_type; ///< Format of the source data (ASCII or binary) + TCDataSource *pDataSource; ///< Pointer to the associated data source + char source_ident[MAXNAMELEN]; ///< Identifier of the source (typically file name) - int IDX_rec_num; // Keeps track of multiple entries w/same name - char IDX_type; // Entry "TCtcIUu" identifier - char IDX_zone[40]; // Alpha region/country/state ID - char IDX_station_name[MAXNAMELEN]; // Name of station - double IDX_lon; // Longitude (+East) - double IDX_lat; // Latitude (+North) - int IDX_ht_time_off; // High tide offset in minutes - float IDX_ht_mpy; // High tide multiplier (nom 1.0) - float IDX_ht_off; // High tide level offset (feet?) - int IDX_lt_time_off; // Low tide offset in minutes - float IDX_lt_mpy; // Low tide multiplier (nom 1.0) - float IDX_lt_off; // Low tide level offset (feet?) - int IDX_sta_num; // Subordinate station number, **UNUSED** - int IDX_flood_dir; // Added DSR opencpn - int IDX_ebb_dir; - int IDX_Useable; - int Valid15; - float Value15; - float Dir15; - bool Ret15; - char *IDX_tzname; // Timezone name - int IDX_ref_file_num; // # of reference file where reference station is - char IDX_reference_name[MAXNAMELEN]; // Name of reference station - int IDX_ref_dbIndex; // tcd index of reference station - double max_amplitude; - int have_offsets; - int station_tz_offset; // Offset in seconds to convert from harmonic data - // (epochs) to the station time zone. Depends on - // Master Station reference only. For ASCII data, - // typically 0 For Binary data, probably - // -(IDX_time_zone * 60)-(tiderec->zone_offset * 3600) - int IDX_time_zone; // Station location minutes offset from UTC + int IDX_rec_num; ///< Record number for multiple entries with same name + char IDX_type; ///< Entry type identifier "TCtcIUu" + char IDX_zone[40]; ///< Geographic zone identifier + char IDX_station_name[MAXNAMELEN]; ///< Name of the tidal or current station + double IDX_lon; ///< Longitude of the station (in degrees, +East) + double IDX_lat; ///< Latitude of the station (in degrees, +North) + int IDX_ht_time_off; ///< High tide time offset (in minutes) + float IDX_ht_mpy; ///< High tide height multiplier + float IDX_ht_off; ///< High tide height offset + int IDX_lt_time_off; ///< Low tide time offset (in minutes) + float IDX_lt_mpy; ///< Low tide height multiplier + float IDX_lt_off; ///< Low tide height offset + int IDX_sta_num; ///< Subordinate station number (UNUSED) + int IDX_flood_dir; ///< Flood current direction (in degrees) + int IDX_ebb_dir; ///< Ebb current direction (in degrees) + int IDX_Useable; ///< Flag indicating if the entry is usable + int Valid15; ///< Validity flag for 15-minute interval data + float Value15; ///< Value for 15-minute interval data + float Dir15; ///< Direction for 15-minute interval data + bool Ret15; ///< Return flag for 15-minute interval data + char *IDX_tzname; ///< Timezone name (dynamically allocated) + int IDX_ref_file_num; ///< Reference file number + char IDX_reference_name[MAXNAMELEN];///< Name of the reference station + int IDX_ref_dbIndex; ///< Database index of the reference station + double max_amplitude; ///< Maximum tidal amplitude + int have_offsets; ///< Flag indicating presence of time/height offsets + /** + * @brief Offset in seconds to convert from harmonic data (epochs) to the station time zone + * + * This offset depends on the Master Station reference only. For ASCII data, + * it's typically 0. For Binary data, it's probably calculated as: + * -(IDX_time_zone * 60) - (tiderec->zone_offset * 3600) + */ + int station_tz_offset; + int IDX_time_zone; ///< Station timezone offset from UTC (in minutes) - Station_Data *pref_sta_data; // Pointer to the Reference Station Data + Station_Data *pref_sta_data; ///< Pointer to the reference station data - int num_nodes; // These are copies of relevant data pointers - int num_csts; // allocated during invariant harmonic loading - int num_epochs; // and owned by the DataSource - double *m_cst_speeds; - double **m_cst_nodes; - double **m_cst_epochs; - double *m_work_buffer; - int first_year; - time_t epoch; - int epoch_year; - int current_depth; - bool b_skipTooDeep; + int num_nodes; ///< Number of nodes in harmonic analysis + int num_csts; ///< Number of harmonic constituents + int num_epochs; ///< Number of epochs in harmonic data + double *m_cst_speeds; ///< Array of constituent speeds + double **m_cst_nodes; ///< 2D array of constituent nodes + double **m_cst_epochs; ///< 2D array of constituent epochs + double *m_work_buffer; ///< Work buffer for calculations + int first_year; ///< First year of valid data + time_t epoch; ///< Epoch time for the station + int epoch_year; ///< Year of the epoch + int current_depth; ///< Depth for current stations + bool b_skipTooDeep; ///< Flag to skip processing if depth exceeds limit - // Cached values - time_t recent_highlow_calc_time; - float recent_high_level; - time_t recent_high_time; - float recent_low_level; - time_t recent_low_time; + // Cached values for performance + time_t recent_highlow_calc_time; ///< Timestamp of the most recent high/low calculation + float recent_high_level; ///< Most recently calculated high tide level + time_t recent_high_time; ///< Time of the most recent high tide + float recent_low_level; ///< Most recently calculated low tide level + time_t recent_low_time; ///< Time of the most recent low tide }; WX_DECLARE_OBJARRAY(IDX_entry, ArrayOfIDXEntry); diff --git a/gui/include/gui/Layer.h b/gui/include/gui/Layer.h index 43d1218502..2608e35a56 100644 --- a/gui/include/gui/Layer.h +++ b/gui/include/gui/Layer.h @@ -29,6 +29,11 @@ #include #include +/** + * Represents a layer of chart objects in OpenCPN. A Layer in OpenCPN is a collection + * of chart objects (such as waypoints, routes, or tracks) that can be managed and + * displayed as a group. Layers provide a way to organize and control the visibility of related chart objects. + */ class Layer { public: Layer(void); diff --git a/gui/include/gui/LinkPropDlg.h b/gui/include/gui/LinkPropDlg.h index 82892ad457..b2dfdce2df 100644 --- a/gui/include/gui/LinkPropDlg.h +++ b/gui/include/gui/LinkPropDlg.h @@ -36,7 +36,7 @@ #include #include #include -//#include "chcanv.h" +// #include "chcanv.h" #if wxCHECK_VERSION(2, 9, 0) #include diff --git a/gui/include/gui/MUIBar.h b/gui/include/gui/MUIBar.h index 0ef6f931ff..77a457664e 100644 --- a/gui/include/gui/MUIBar.h +++ b/gui/include/gui/MUIBar.h @@ -35,15 +35,18 @@ enum { ID_MUI_MENU = 21500 }; +/** + * Enumeration for animation types + */ enum { - CO_ANIMATION_LINEAR = 0, - CO_ANIMATION_QUADRATIC, - CO_ANIMATION_CUBIC, - CO_ANIMATION_CUBIC_BOUNCE_IN, - CO_ANIMATION_CUBIC_BACK_IN, - CO_ANIMATION_CUBIC_REVERSE, - CO_PULL, - CO_PUSH + CO_ANIMATION_LINEAR = 0, ///< Linear animation + CO_ANIMATION_QUADRATIC, ///< Quadratic animation + CO_ANIMATION_CUBIC, ///< Cubic animation + CO_ANIMATION_CUBIC_BOUNCE_IN, ///< Cubic animation with bounce-in effect + CO_ANIMATION_CUBIC_BACK_IN, ///< Cubic animation with back-in effect + CO_ANIMATION_CUBIC_REVERSE, ///< Reversed cubic animation + CO_PULL, ///< Pull animation + CO_PUSH ///< Push animation }; class MyFrame; @@ -52,9 +55,10 @@ class MUIButton; class MUITextButton; class CanvasOptions; -//---------------------------------------------------------------------------- -// MUIBar -//---------------------------------------------------------------------------- +/** + * Modern User Interface Control Bar for OpenCPN. Provides a customizable control bar + * with various buttons and options for interacting with the chart canvas in OpenCPN. + */ class MUIBar : public wxEvtHandler { public: MUIBar(); @@ -79,7 +83,7 @@ class MUIBar : public wxEvtHandler { void OnScaleSelected(wxMouseEvent &event); void DrawGL(ocpnDC &gldc, double displayScale); void DrawDC(ocpnDC &dc, double displayScale); - wxRect GetRect(){ return wxRect(m_screenPos, m_size); } + wxRect GetRect() { return wxRect(m_screenPos, m_size); } bool MouseEvent(wxMouseEvent &event); void PushCanvasOptions(); @@ -94,7 +98,7 @@ class MUIBar : public wxEvtHandler { void HandleMenuClick(); wxBitmap &CreateBitmap(double displayScale); void InvalidateBitmap(); - + wxColor &GetBackgroundColor() { return m_backcolor; } void CaptureCanvasOptionsBitmap(); void CaptureCanvasOptionsBitmapChain(wxTimerEvent &event); @@ -123,7 +127,7 @@ class MUIBar : public wxEvtHandler { int m_animationTotalTime; int m_pushPull; - wxString m_backcolorString; + wxColor m_backcolor; wxBitmap m_animateBitmap; wxBitmap m_backingBitmap; wxTimer CanvasOptionTimer; diff --git a/gui/include/gui/MarkInfo.h b/gui/include/gui/MarkInfo.h index c6b1f4d7f4..05097c32a3 100644 --- a/gui/include/gui/MarkInfo.h +++ b/gui/include/gui/MarkInfo.h @@ -30,7 +30,7 @@ * Includes */ #include -#include "ocpn_frame.h" //FIXME (dave ) // for ColorScheme +#include "ocpn_frame.h" //FIXME (dave ) // for ColorScheme #include // toh, 2009.02.08 #include #include @@ -145,10 +145,10 @@ WX_DECLARE_OBJARRAY(wxBitmap, ArrayOfBitmaps); class SaveDefaultsDialog; -/*! - * OCPNIconCombo class declaration +/** + * Custom combobox for selecting waypoint icons. Extends wxOwnerDrawnComboBox to provide + * a combobox with custom-drawn items, specifically for selecting waypoint icons. */ - class OCPNIconCombo : public wxOwnerDrawnComboBox { public: OCPNIconCombo(wxWindow* parent, wxWindowID id, const wxString& value = _T(""), @@ -197,9 +197,12 @@ class LatLonTextCtrl : public wxTextCtrl { wxEvtHandler* m_pParentEventHandler; }; -/////////////////////////////////////////////////////////////////////////////// -/// Class MarkInfoDef -/////////////////////////////////////////////////////////////////////////////// +/** + * Dialog for displaying and editing waypoint properties. + * Provides a comprehensive interface for viewing and modifying + * waypoint properties in OpenCPN. Includes functionality for + * editing basic and extended properties, managing links, and setting defaults. + */ class MarkInfoDlg : public DIALOG_PARENT { DECLARE_EVENT_TABLE() friend class SaveDefaultsDialog; @@ -368,7 +371,7 @@ class MarkInfoDlg : public DIALOG_PARENT { void RecalculateSize(void); RoutePoint* GetRoutePoint(void) { return m_pRoutePoint; } void SetColorScheme(ColorScheme cs); - void SetRoutePoints(const std::vector &); + void SetRoutePoints(const std::vector&); void ClearData(); void SetBulkEdit(bool bBulkEdit); void UpdateHtmlList(); @@ -386,10 +389,10 @@ class MarkInfoDlg : public DIALOG_PARENT { SaveDefaultsDialog* m_SaveDefaultDlg; }; -/////////////////////////////////////////////////////////////////////////////// -/// Class SaveDefaultsDialog -/////////////////////////////////////////////////////////////////////////////// - +/** + * Dialog for saving default waypoint properties. Allows users to select + * which properties of the current waypoint should be saved as defaults for future waypoints. + */ class SaveDefaultsDialog : public wxDialog { friend class MarkInfoDlg; diff --git a/gui/include/gui/NMEALogWindow.h b/gui/include/gui/NMEALogWindow.h index 0e6c04b57c..4d7dfe8dd9 100644 --- a/gui/include/gui/NMEALogWindow.h +++ b/gui/include/gui/NMEALogWindow.h @@ -66,11 +66,11 @@ class NMEALogWindow : public NmeaLog, public WindowDestroyListener { void Move(); virtual void DestroyWindow(); static void Shutdown(); - wxWindow *GetTTYWindow(void) { return static_cast(m_window); } + wxWindow *GetTTYWindow(void) { return static_cast(m_window); } private: NMEALogWindow(); - virtual ~NMEALogWindow(){}; + virtual ~NMEALogWindow() {}; void UpdateGeometry(); static NMEALogWindow *instance; diff --git a/gui/include/gui/OCPNListCtrl.h b/gui/include/gui/OCPNListCtrl.h index 91aadd0cc8..102febfa43 100644 --- a/gui/include/gui/OCPNListCtrl.h +++ b/gui/include/gui/OCPNListCtrl.h @@ -30,6 +30,10 @@ #include "AISTargetListDialog.h" #include "ais.h" +/** + * A custom list control for displaying AIS target information. Extends wxListCtrl + * to provide specialized functionality for displaying and managing AIS target data in OpenCPN. + */ class OCPNListCtrl : public wxListCtrl { public: OCPNListCtrl(AISTargetListDialog* parent, wxWindowID id, const wxPoint& pos, diff --git a/gui/include/gui/OCPNPlatform.h b/gui/include/gui/OCPNPlatform.h index 052ec3359f..9ed5d9d4d2 100644 --- a/gui/include/gui/OCPNPlatform.h +++ b/gui/include/gui/OCPNPlatform.h @@ -38,7 +38,7 @@ #include #endif // precompiled headers -#endif // _WX_DEFS_H_ +#endif // _WX_DEFS_H_ #include #include @@ -58,7 +58,6 @@ class MyConfig; class ArrayOfCDI; - //-------------------------------------------------------------------------- // Per-Platform Utility support //-------------------------------------------------------------------------- @@ -68,6 +67,12 @@ class ArrayOfCDI; // extern QString getQtStyleSheet( void ); // #endif +/** + * Provides platform-specific support utilities for OpenCPN. Extends BasePlatform + * to implement platform-specific functionality for various aspects of the application, + * including device support, initialization, display handling, and + * file operations, and more. + */ class OCPNPlatform : public BasePlatform { public: OCPNPlatform(); @@ -126,7 +131,7 @@ class OCPNPlatform : public BasePlatform { void PositionAISAlert(wxWindow *alert_window); float GetChartScaleFactorExp(float scale_linear); float GetMarkScaleFactorExp(float scale_linear); - //float GetDIPScaleFactor(); + // float GetDIPScaleFactor(); int GetStatusBarFieldCount(); bool GetFullscreen(); bool SetFullscreen(bool bFull); @@ -139,7 +144,7 @@ class OCPNPlatform : public BasePlatform { // Per-Platform file/directory support //-------------------------------------------------------------------------- - MyConfig *GetConfigObject(); + MyConfig *GetConfigObject(); wxString GetSupplementalLicenseString(); int DoFileSelectorDialog(wxWindow *parent, wxString *file_spec, @@ -148,7 +153,6 @@ class OCPNPlatform : public BasePlatform { int DoDirSelectorDialog(wxWindow *parent, wxString *file_spec, wxString Title, wxString initDir, bool b_addFiles = true); - //-------------------------------------------------------------------------- // Per-Platform Utility support //-------------------------------------------------------------------------- @@ -178,8 +182,6 @@ class OCPNPlatform : public BasePlatform { private: wxString m_SData_Dir; - - }; // Private colourPicker control diff --git a/gui/include/gui/OCPNRegion.h b/gui/include/gui/OCPNRegion.h index 5e616c5979..ddd645d452 100644 --- a/gui/include/gui/OCPNRegion.h +++ b/gui/include/gui/OCPNRegion.h @@ -37,14 +37,16 @@ #include #endif // precompiled headers -//#if defined(__WXOSX__) +// #if defined(__WXOSX__) #define USE_NEW_REGION -//#endif - -// ---------------------------------------------------------------------------- -// OCPNRegion -// ---------------------------------------------------------------------------- +// #endif +/** + * A wrapper class for wxRegion with additional functionality. + * Extends either wxObject or wxRegion (depending on compilation flags) + * to provide region-related operations for OpenCPN. Includes methods for + * creating, modifying, and querying regions. + */ class OCPNRegion : public #ifdef USE_NEW_REGION wxObject @@ -148,9 +150,11 @@ class OCPNRegion : public DECLARE_DYNAMIC_CLASS(OCPNRegion) }; -// ---------------------------------------------------------------------------- -// OCPNRegionIterator: decomposes a region into rectangles -// ---------------------------------------------------------------------------- +/** + * An iterator class for OCPNRegion. + * Provides methods to iterate over the rectangles + * that make up an OCPNRegion. + */ class OCPNRegionIterator { public: diff --git a/gui/include/gui/Osenc.h b/gui/include/gui/Osenc.h index db2410c348..98e90bd7d8 100644 --- a/gui/include/gui/Osenc.h +++ b/gui/include/gui/Osenc.h @@ -321,8 +321,8 @@ typedef std::vector VC_ElementVector; //-------------------------------------------------------------------------- class Osenc_instream { public: - Osenc_instream(){}; - virtual ~Osenc_instream(){}; + Osenc_instream() {}; + virtual ~Osenc_instream() {}; virtual bool Open(const wxString &senc_file_name) = 0; virtual void Close() = 0; @@ -362,8 +362,8 @@ class Osenc_instreamFile : public Osenc_instream { //-------------------------------------------------------------------------- class Osenc_outstream { public: - Osenc_outstream(){}; - virtual ~Osenc_outstream(){}; + Osenc_outstream() {}; + virtual ~Osenc_outstream() {}; virtual bool Open(const wxString &ofileName) = 0; diff --git a/gui/include/gui/Quilt.h b/gui/include/gui/Quilt.h index 2f06a8e751..860db5a0ce 100644 --- a/gui/include/gui/Quilt.h +++ b/gui/include/gui/Quilt.h @@ -150,7 +150,8 @@ class Quilt { void SetHiliteIndex(int index) { m_nHiLiteIndex = index; } void SetHiliteIndexArray(const std::vector &index_array) { - m_HiLiteIndexArray = index_array; } + m_HiLiteIndexArray = index_array; + } void ClearHiliteIndexArray() { m_HiLiteIndexArray.clear(); } void SetReferenceChart(int dbIndex) { @@ -198,7 +199,7 @@ class Quilt { bool DoesQuiltContainPlugins(void); LLRegion GetHiliteRegion(); - std::vector &GetHiLiteIndexArray(){ return m_HiLiteIndexArray; } + std::vector &GetHiLiteIndexArray() { return m_HiLiteIndexArray; } static LLRegion GetChartQuiltRegion(const ChartTableEntry &cte, ViewPort &vp); diff --git a/gui/include/gui/RoutePropDlg.h b/gui/include/gui/RoutePropDlg.h index 31b57b1c69..5f8adda469 100644 --- a/gui/include/gui/RoutePropDlg.h +++ b/gui/include/gui/RoutePropDlg.h @@ -54,8 +54,6 @@ /////////////////////////////////////////////////////////////////////////// - - /////////////////////////////////////////////////////////////////////////////// /// Class RoutePropDlg /////////////////////////////////////////////////////////////////////////////// @@ -64,7 +62,6 @@ class RoutePropDlg : public DIALOG_PARENT { ObservableListener navobj_del_track_listener; ObservableListener navobj_del_route_listener; - protected: wxNotebook* m_ntbRteProp; wxPanel* m_pnlBasic; diff --git a/gui/include/gui/RoutePropDlgImpl.h b/gui/include/gui/RoutePropDlgImpl.h index 45f50f5744..50fd30addb 100644 --- a/gui/include/gui/RoutePropDlgImpl.h +++ b/gui/include/gui/RoutePropDlgImpl.h @@ -97,7 +97,8 @@ class RoutePropDlgImpl : public RoutePropDlg { const wxString& title = _("Route Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(550, 450), - long style = FRAME_WITH_LINKS_STYLE ); + long style = FRAME_WITH_LINKS_STYLE); + private: void SaveGeometry(); static bool instanceFlag; diff --git a/gui/include/gui/S57Light.h b/gui/include/gui/S57Light.h index 75ddddb137..bccb760a70 100644 --- a/gui/include/gui/S57Light.h +++ b/gui/include/gui/S57Light.h @@ -27,6 +27,10 @@ #include +/** + * Represents a light feature in an S57 chart. Encapsulates the attributes and properties of a light feature, + * including its position, attributes, and sector information. + */ class S57Light { public: wxArrayString attributeNames; diff --git a/gui/include/gui/S57ObjectDesc.h b/gui/include/gui/S57ObjectDesc.h index 540f35947a..29994b2b5d 100644 --- a/gui/include/gui/S57ObjectDesc.h +++ b/gui/include/gui/S57ObjectDesc.h @@ -27,6 +27,11 @@ #include +/** + * Describes an S57 object (feature) in an Electronic Navigational Chart. + * Objects represent various maritime features such as buoys, lights, depth areas, land areas, etc. Each object has a specific class + * and set of attributes that define its characteristics. + */ class S57ObjectDesc { public: wxString S57ClassName; diff --git a/gui/include/gui/S57QueryDialog.h b/gui/include/gui/S57QueryDialog.h index c40f7f7e5e..c7354cdebe 100644 --- a/gui/include/gui/S57QueryDialog.h +++ b/gui/include/gui/S57QueryDialog.h @@ -31,6 +31,10 @@ class wxHtmlWindow; +/** + * Dialog for displaying query results of S57 objects. Creates a dialog window to display detailed information about + * queried S57 objects, including an HTML view of the object's properties. + */ class S57QueryDialog : public wxFrame { DECLARE_CLASS(S57QueryDialog) DECLARE_EVENT_TABLE() @@ -77,6 +81,10 @@ class S57QueryDialog : public wxFrame { wxButton* m_btnOK; }; +/** + * Dialog for displaying extra query information for S57 objects. + * Extends S57QueryDialog to provide additional query information about S57 objects. + */ class S57ExtraQueryInfoDlg : public S57QueryDialog { DECLARE_CLASS(S57ExtraQueryInfoDlg) DECLARE_EVENT_TABLE() diff --git a/gui/include/gui/S57Sector.h b/gui/include/gui/S57Sector.h index a3c5a1b6a1..31d2e37bee 100644 --- a/gui/include/gui/S57Sector.h +++ b/gui/include/gui/S57Sector.h @@ -28,6 +28,10 @@ #include +/** + * Represents a sector of a light in an S57 chart. Contains information about a light sector, including its + * position, angular range, visibility range, color, and type. + */ typedef struct { wxPoint2DDouble pos; double sector1, sector2; diff --git a/gui/include/gui/SencManager.h b/gui/include/gui/SencManager.h index cdbe220ac3..a57aa0008b 100644 --- a/gui/include/gui/SencManager.h +++ b/gui/include/gui/SencManager.h @@ -98,9 +98,11 @@ class OCPN_BUILDSENC_ThreadEvent : public wxEvent { private: }; -//---------------------------------------------------------------------------- -// s57 Chart Thread based SENC creator -//---------------------------------------------------------------------------- +/** + * Manager for S57 chart SENC creation threads. + * Manages the creation of SENC (Simplified Electronic Navigational Chart) files + * from S57 charts using background threads. Handles scheduling and executing SENC build jobs. + */ class SENCThreadManager : public wxEvtHandler { public: SENCThreadManager(); diff --git a/gui/include/gui/SendToGpsDlg.h b/gui/include/gui/SendToGpsDlg.h index 7cc10888ed..687e7af840 100644 --- a/gui/include/gui/SendToGpsDlg.h +++ b/gui/include/gui/SendToGpsDlg.h @@ -46,7 +46,8 @@ class Route; class RoutePoint; /** - * Route "Send to GPS..." Dialog Definition + * Dialog for sending routes/waypoints to a GPS device. Allows users to send route and waypoint data to a connected GPS device. + * It provides options to select the GPS device and displays a progress gauge during transfer. */ class SendToGpsDlg : public wxDialog { DECLARE_DYNAMIC_CLASS(SendToGpsDlg) diff --git a/gui/include/gui/SendToPeerDlg.h b/gui/include/gui/SendToPeerDlg.h index cb07f36441..f90b946cd5 100644 --- a/gui/include/gui/SendToPeerDlg.h +++ b/gui/include/gui/SendToPeerDlg.h @@ -52,7 +52,6 @@ #include "observable_evtvar.h" - // Constants for SendToPeer... Dialog #define ID_STPDIALOG 10006 #define SYMBOL_STP_STYLE \ @@ -66,7 +65,8 @@ enum { ID_STP_CANCEL = 10000, ID_STP_OK, ID_STP_CHOICE_PEER, ID_STP_SCAN }; /** - * Route "Send to Peer..." Dialog Definition + * Dialog for sending navigation objects to peer devices. Enables sending routes, waypoints, and tracks to peer devices over a network. + * It allows selecting the peer device and provides options for scanning for available peers. */ class SendToPeerDlg : public wxDialog { DECLARE_DYNAMIC_CLASS(SendToPeerDlg) @@ -83,11 +83,13 @@ class SendToPeerDlg : public wxDialog { const wxSize& size = SYMBOL_STP_SIZE, long style = SYMBOL_STP_STYLE); void SetRoute(Route* pRoute) { m_RouteList.push_back(pRoute); } - void SetWaypoint(RoutePoint* pRoutePoint) { m_RoutePointList.push_back(pRoutePoint); } + void SetWaypoint(RoutePoint* pRoutePoint) { + m_RoutePointList.push_back(pRoutePoint); + } void SetTrack(Track* pTrack) { m_TrackList.push_back(pTrack); } void SetMessage(wxString message); - void SetScanOnCreate(bool s){ m_bScanOnCreate = s;} - void SetScanTime(int t){ m_scanTime = t * 2;} + void SetScanOnCreate(bool s) { m_bScanOnCreate = s; } + void SetScanTime(int t) { m_scanTime = t * 2; } private: void CreateControls([[maybe_unused]] const wxString& hint); @@ -95,8 +97,8 @@ class SendToPeerDlg : public wxDialog { void OnCancelClick(wxCommandEvent& event); void OnSendClick([[maybe_unused]] wxCommandEvent& event); void OnScanClick(wxCommandEvent& event); - void OnTimerAutoscan(wxTimerEvent &event); - void OnTimerScanTick(wxTimerEvent &event); + void OnTimerAutoscan(wxTimerEvent& event); + void OnTimerScanTick(wxTimerEvent& event); void DoScan(); bool EnableActivateChkbox(); @@ -112,13 +114,13 @@ class SendToPeerDlg : public wxDialog { wxCheckBox* m_activate_chkbox; EventVar progress; ObsListener progress_listener; + std::string m_ownipAddr; wxTimer m_autoScanTimer; wxTimer m_ScanTickTimer; int m_tick; int m_scanTime; bool m_bScanOnCreate; - }; #endif diff --git a/gui/include/gui/about.h b/gui/include/gui/about.h index b9f6325bd6..aaa25ef10a 100644 --- a/gui/include/gui/about.h +++ b/gui/include/gui/about.h @@ -45,6 +45,10 @@ class wxHtmlWindow; +/** + * Represents the About dialog for OpenCPN. Implements a dialog that displays information about OpenCPN, + * including version, authors, license, and tips. + */ class about : public wxDialog { DECLARE_DYNAMIC_CLASS(about) DECLARE_EVENT_TABLE() diff --git a/gui/include/gui/ais.h b/gui/include/gui/ais.h index dc2fe7558b..b5a731c8dd 100644 --- a/gui/include/gui/ais.h +++ b/gui/include/gui/ais.h @@ -63,7 +63,6 @@ class ChartCanvas; #define TIMER_AIS_MSEC 998 #define TIMER_AIS_AUDIO_MSEC 2000 - enum { tlTRK = 0, tlNAME, @@ -97,7 +96,6 @@ WX_DEFINE_SORTED_ARRAY(AisTargetData *, ArrayOfAISTarget); // Implement the AISTargetList as a wxHashMap - void AISDrawAreaNotices(ocpnDC &dc, ViewPort &vp, ChartCanvas *cp); void AISDraw(ocpnDC &dc, ViewPort &vp, ChartCanvas *cp); bool AnyAISTargetsOnscreen(ChartCanvas *cc, ViewPort &vp); diff --git a/gui/include/gui/ais_info_gui.h b/gui/include/gui/ais_info_gui.h index 8219d723af..50513de130 100644 --- a/gui/include/gui/ais_info_gui.h +++ b/gui/include/gui/ais_info_gui.h @@ -25,14 +25,18 @@ #include "observable.h" #include "OCPN_Sound.h" -class AisInfoGui: public wxEvtHandler { +/** + * Handles the AIS information GUI and sound alerts. Manages the display of AIS information and handles audio alerts + * related to AIS targets. + */ +class AisInfoGui : public wxEvtHandler { public: AisInfoGui(); void ShowAisInfo(std::shared_ptr palert_target); bool AIS_AlertPlaying(void) { return m_bAIS_AlertPlaying; }; - void OnSoundFinishedAISAudio(wxCommandEvent &event); + void OnSoundFinishedAISAudio(wxCommandEvent& event); bool m_bAIS_Audio_Alert_On; bool m_bAIS_AlertPlaying; diff --git a/gui/include/gui/canvasMenu.h b/gui/include/gui/canvasMenu.h index 154ae51b5d..085a97013d 100644 --- a/gui/include/gui/canvasMenu.h +++ b/gui/include/gui/canvasMenu.h @@ -47,7 +47,6 @@ #include "timers.h" #include "emboss_data.h" - class wxGLContext; class GSHHSChart; class IDX_entry; @@ -75,9 +74,10 @@ class ChInfoWin; class glChartCanvas; class Track; -//---------------------------------------------------------------------------- -// CanvasMenuHandler -//---------------------------------------------------------------------------- +/** + * Handles context menu events for the chart canvas. Manages the creation and handling of context menus that appear + * when right-clicking on the chart canvas. + */ class CanvasMenuHandler : public wxEvtHandler { public: CanvasMenuHandler(ChartCanvas *parentCanvas, Route *selectedRoute, @@ -89,7 +89,7 @@ class CanvasMenuHandler : public wxEvtHandler { void CanvasPopupMenu(int x, int y, int seltype); void PopupMenuHandler(wxCommandEvent &event); static int GetNextContextMenuId(); - void PrepareMenuItem( wxMenuItem *item ); + void PrepareMenuItem(wxMenuItem *item); void MenuPrepend1(wxMenu *menu, int id, wxString label); void MenuAppend1(wxMenu *menu, int id, wxString label); void SetMenuItemFont1(wxMenuItem *item); diff --git a/gui/include/gui/cat_settings.h b/gui/include/gui/cat_settings.h index b1db88adb2..00bff8eb57 100644 --- a/gui/include/gui/cat_settings.h +++ b/gui/include/gui/cat_settings.h @@ -29,7 +29,8 @@ #include /** - * Modal dialog, displays settings for plugin catalog. + * Modal dialog for plugin catalog settings. Implements a dialog that displays and allows editing of + * settings for the plugin catalog. */ class CatalogSettingsDialog : public wxDialog { public: diff --git a/gui/include/gui/chart_ctx_factory.h b/gui/include/gui/chart_ctx_factory.h index 8f24d39f96..6ebd2aef10 100644 --- a/gui/include/gui/chart_ctx_factory.h +++ b/gui/include/gui/chart_ctx_factory.h @@ -34,7 +34,7 @@ extern GLenum g_texture_rectangle_format; /** Return a ChartCtx reflecting caller's opengl context */ static ChartCtx ChartCtxFactory() { - return ChartCtx(g_bopengl, g_texture_rectangle_format); + return ChartCtx(g_bopengl, g_texture_rectangle_format); } #else @@ -42,4 +42,4 @@ static ChartCtx ChartCtxFactory() { static ChartCtx ChartCtxFactory() { return ChartCtx(g_bopengl); } #endif -#endif // _CHART_CTX_FACTORY_H__ +#endif // _CHART_CTX_FACTORY_H__ diff --git a/gui/include/gui/chartbase.h b/gui/include/gui/chartbase.h index 0a672c346d..580b2204ad 100644 --- a/gui/include/gui/chartbase.h +++ b/gui/include/gui/chartbase.h @@ -110,10 +110,11 @@ class Plypoint { float lnp; }; -// ---------------------------------------------------------------------------- -// ChartBase -// ---------------------------------------------------------------------------- - +/** + * Base class for all chart types. Defines the interface and common functionality + * for all chart types in OpenCPN. Provides methods for initialization, rendering, and querying + * chart properties and data. + */ class ChartBase { public: ChartBase(); @@ -121,8 +122,8 @@ class ChartBase { virtual InitReturn Init(const wxString &name, ChartInitFlag init_flags) = 0; - virtual void Activate(void){}; - virtual void Deactivate(void){}; + virtual void Activate(void) {}; + virtual void Deactivate(void) {}; // Accessors virtual ThumbData *GetThumbData(int tnx, int tny, float lat, float lon) = 0; diff --git a/gui/include/gui/chartdb.h b/gui/include/gui/chartdb.h index bd64a990ba..0d1a0b2cc4 100644 --- a/gui/include/gui/chartdb.h +++ b/gui/include/gui/chartdb.h @@ -86,15 +86,21 @@ class CacheEntry { int n_lock; }; -// ---------------------------------------------------------------------------- -// Chart Database -// ---------------------------------------------------------------------------- - +/** + * Manages the chart database and provides access to chart data. + * Responsible for loading, saving, and managing the chart database. + * Provides methods for building chart stacks, opening charts, and managing the chart cache. + */ class ChartDB : public ChartDatabase { public: ChartDB(); virtual ~ChartDB(); + /** + * Load the chart database from a binary file. + * @param filename Name of the file to load + * @param dir_array_check Array to store directory information + */ bool LoadBinary(const wxString &filename, ArrayOfCDI &dir_array_check); bool SaveBinary(const wxString &filename) { return ChartDatabase::Write(filename); diff --git a/gui/include/gui/chartdbs.h b/gui/include/gui/chartdbs.h index c3e9b7c2f9..7e9bd3a5bd 100644 --- a/gui/include/gui/chartdbs.h +++ b/gui/include/gui/chartdbs.h @@ -174,7 +174,9 @@ struct ChartTableHeader { int nTableEntries; int nDirEntries; }; - +/** + * Represents an entry in the chart table, containing information about a single chart. + */ struct ChartTableEntry { ChartTableEntry() { Clear(); } ChartTableEntry(ChartBase &theChart, wxString &utf8Path); @@ -281,11 +283,11 @@ enum { BUILTIN_DESCRIPTOR = 0, PLUGIN_DESCRIPTOR }; class ChartClassDescriptor { public: - ChartClassDescriptor(){}; + ChartClassDescriptor() {}; virtual ~ChartClassDescriptor() {} ChartClassDescriptor(wxString classn, wxString mask, int type) - : m_class_name(classn), m_search_mask(mask), m_descriptor_type(type){}; + : m_class_name(classn), m_search_mask(mask), m_descriptor_type(type) {}; wxString m_class_name; wxString m_search_mask; @@ -298,12 +300,27 @@ class ChartClassDescriptor { WX_DECLARE_OBJARRAY(ChartTableEntry, ChartTable); +/** + * Manages a database of charts, including reading, writing, and querying chart information. + */ class ChartDatabase { public: ChartDatabase(); - virtual ~ChartDatabase(){}; + virtual ~ChartDatabase() {}; + /** + * Creates a new chart database from a list of directories. + * @param dir_array Array of chart directory information + * @param pprog Progress dialog for user feedback + */ bool Create(ArrayOfCDI &dir_array, wxGenericProgressDialog *pprog); + + /** + * Updates the chart database. + * @param dir_array Array of chart directory information + * @param bForce Force update even if no changes detected + * @param pprog Progress dialog for user feedback + */ bool Update(ArrayOfCDI &dir_array, bool bForce, wxGenericProgressDialog *pprog); @@ -416,6 +433,12 @@ class ChartGroup; WX_DEFINE_ARRAY_PTR(ChartGroup *, ChartGroupArray); +/** + * Represents an individual component within a ChartGroup. + * Typically corresponds to a single chart or a subgroup within a ChartGroup. Maintains information about the element's name + * and any charts that are supposed to be part of this element but are + * currently missing or unavailable. + */ class ChartGroupElement { // ChartGroupElements need nothing special to delete since // m_missing_name_array is a wxArrayString which manages @@ -425,6 +448,17 @@ class ChartGroupElement { wxArrayString m_missing_name_array; }; +/** + * Represents a user-defined collection of logically related charts. + * + * Allows users to categorize and manage + * sets of nautical charts based on criteria such as geographical region, chart type, + * or specific voyages. Enhances chart management by enabling: + * - Efficient organization of large chart collections + * - Quick access to relevant charts for specific needs + * - Grouped operations like enabling/disabling multiple charts simultaneously + * - Simplified update management for sets of related charts + */ class ChartGroup { public: wxString m_group_name; diff --git a/gui/include/gui/chartimg.h b/gui/include/gui/chartimg.h index a44fe5b3ea..4fec07519f 100644 --- a/gui/include/gui/chartimg.h +++ b/gui/include/gui/chartimg.h @@ -113,10 +113,20 @@ class opncpnPalette { int nRev; }; -// ---------------------------------------------------------------------------- -// ChartBaseBSB -// ---------------------------------------------------------------------------- - +/** + * Base class for BSB (Maptech/NOS) format nautical charts. + * + * Provides core functionality for handling BSB format raster nautical charts. + * Implements chart rendering, coordinate transformations, and utility functions. + * + * Key features include: + * - Chart initialization and loading + * - Rendering of chart views on different devices (DC, OpenGL) + * - Coordinate conversions between lat/lon and chart pixels + * - Color scheme management + * - Chart scaling and zooming + * - Caching mechanisms for improved performance + */ class ChartBaseBSB : public ChartBase { public: // Public methods @@ -318,10 +328,9 @@ class ChartBaseBSB : public ChartBase { wxULongLong m_filesize; }; -// ---------------------------------------------------------------------------- -// ChartKAP -// ---------------------------------------------------------------------------- - +/** + * Represents a KAP format chart, derived from ChartBaseBSB. + */ class ChartKAP : public ChartBaseBSB { public: // Methods @@ -352,6 +361,11 @@ class ChartGEO : public ChartBaseBSB { class PlugInChartBase; // found in ocpn_plugin.h +/** + * Wrapper class for plugin-based charts. + * Serves as an interface between the main application and plugin-provided charts. Allows seamless integration of charts + * from external plugins into the main chart handling system. + */ class ChartPlugInWrapper : public ChartBaseBSB { public: ChartPlugInWrapper(); diff --git a/gui/include/gui/chcanv.h b/gui/include/gui/chcanv.h index a45f1b6e21..a026aa855c 100644 --- a/gui/include/gui/chcanv.h +++ b/gui/include/gui/chcanv.h @@ -117,17 +117,19 @@ typedef enum ownship_state_t { enum { ID_S57QUERYTREECTRL = 10000, ID_AISDIALOGOK }; -enum { ID_PIANO_DISABLE_QUILT_CHART = 32000, - ID_PIANO_ENABLE_QUILT_CHART, - ID_PIANO_CONTRACT_PIANO, - ID_PIANO_EXPAND_PIANO +enum { + ID_PIANO_DISABLE_QUILT_CHART = 32000, + ID_PIANO_ENABLE_QUILT_CHART, + ID_PIANO_CONTRACT_PIANO, + ID_PIANO_EXPAND_PIANO }; enum { NORTH_UP_MODE, COURSE_UP_MODE, HEAD_UP_MODE }; -//---------------------------------------------------------------------------- -// ChartCanvas -//---------------------------------------------------------------------------- +/** + * Chart display canvas. + * Manages the display of charts and overlays. Handles chart loading, panning, zooming, and rendering of charts, routes, tracks, etc. + */ class ChartCanvas : public wxWindow { friend class glChartCanvas; @@ -159,20 +161,20 @@ class ChartCanvas : public wxWindow { void OnKillFocus(wxFocusEvent &WXUNUSED(event)); void OnSetFocus(wxFocusEvent &WXUNUSED(event)); #ifdef HAVE_WX_GESTURE_EVENTS - void OnZoom(wxZoomGestureEvent& event); - void OnLongPress(wxLongPressEvent& event); - void OnPressAndTap(wxPressAndTapEvent& event); + void OnZoom(wxZoomGestureEvent &event); + void OnLongPress(wxLongPressEvent &event); + void OnPressAndTap(wxPressAndTapEvent &event); - void OnLeftDown(wxMouseEvent& evt); - void OnLeftUp(wxMouseEvent& evt); + void OnLeftDown(wxMouseEvent &evt); + void OnLeftUp(wxMouseEvent &evt); - void OnRightUp(wxMouseEvent& event); - void OnRightDown(wxMouseEvent& event); + void OnRightUp(wxMouseEvent &event); + void OnRightDown(wxMouseEvent &event); - void OnDoubleLeftClick(wxMouseEvent& event); + void OnDoubleLeftClick(wxMouseEvent &event); - void OnWheel(wxMouseEvent& event); - void OnMotion(wxMouseEvent& event); + void OnWheel(wxMouseEvent &event); + void OnMotion(wxMouseEvent &event); #endif /* HAVE_WX_GESTURE_EVENTS */ void PopupMenuHandler(wxCommandEvent &event); @@ -370,8 +372,8 @@ class ChartCanvas : public wxWindow { void ShowChartInfoWindow(int x, int dbIndex); void HideChartInfoWindow(void); - void ShowCompositeInfoWindow(int x, int n_charts, - int scale, const std::vector &index_vector); + void ShowCompositeInfoWindow(int x, int n_charts, int scale, + const std::vector &index_vector); void StartMeasureRoute(); void CancelMeasureRoute(); @@ -384,7 +386,7 @@ class ChartCanvas : public wxWindow { void RemoveChartFromQuilt(int dbIndex); void HandlePianoClick(int selected_index, - const std::vector &selected_dbIndex_array); + const std::vector &selected_dbIndex_array); void HandlePianoRClick(int x, int y, int selected_index, const std::vector &selected_dbIndex_array); void HandlePianoRollover(int selected_index, @@ -479,7 +481,6 @@ class ChartCanvas : public wxWindow { void TouchAISToolActive(void); void UpdateAISTBTool(void); - void SelectChartFromStack(int index, bool bDir = false, ChartTypeEnum New_Type = CHART_TYPE_DONTCARE, ChartFamilyEnum New_Family = CHART_FAMILY_DONTCARE); @@ -563,7 +564,7 @@ class ChartCanvas : public wxWindow { std::vector GetQuiltNoshowIindexArray() { return m_quilt_noshow_index_array; } - double GetDisplayScale(){ return m_displayScale; } + double GetDisplayScale() { return m_displayScale; } private: int AdjustQuiltRefChart(); @@ -646,7 +647,7 @@ class ChartCanvas : public wxWindow { // m_canvas_scale_factor / pixels_per_meter of // displayed chart also may be considered as the // "pixels-per-meter" of the canvas on-screen - double m_pix_per_mm; // pixels per millimeter on the screen + double m_pix_per_mm; // pixels per millimeter on the screen double m_display_size_mm; double m_absolute_min_scale_ppm; @@ -853,9 +854,9 @@ class ChartCanvas : public wxWindow { bool m_bzooming, m_bzooming_to_cursor; IDX_entry *m_pIDXCandidate; - //#ifdef ocpnUSE_GL + // #ifdef ocpnUSE_GL glChartCanvas *m_glcc; - //#endif + // #endif // Smooth movement member variables wxPoint m_pan_drag; @@ -878,7 +879,6 @@ class ChartCanvas : public wxWindow { bool m_dragoffsetSet; - bool m_bautofind; bool m_bFirstAuto; double m_vLat, m_vLon; diff --git a/gui/include/gui/cm93.h b/gui/include/gui/cm93.h index 172411cb05..3f2cf8d6a2 100644 --- a/gui/include/gui/cm93.h +++ b/gui/include/gui/cm93.h @@ -103,7 +103,7 @@ static const double CM93_semimajor_axis_meters = class Extended_Geometry; -//#pragma pack(push,1) +// #pragma pack(push,1) typedef struct { unsigned short x; @@ -116,7 +116,7 @@ typedef struct { unsigned short z; } cm93_point_3d; -//#pragma pack(pop) +// #pragma pack(pop) typedef struct { double lon_min; @@ -287,9 +287,17 @@ class cm93manager { bool m_bfoundZ; }; -//---------------------------------------------------------------------------- -// cm93 Chart object class -//---------------------------------------------------------------------------- +/** + * Represents a single CM93 chart at a specific scale. + * + * CM93 charts are a proprietary vector chart format developed by C-Map. Unlike S57 charts, + * CM93 charts use a different data structure and cover the entire world in a seamless database. + * Key differences from S57 include: + * - Multi-scale coverage: CM93 data is organized into several discrete zoom levels. + * - Proprietary encoding: CM93 uses its own object and attribute encoding, requiring translation to S57 objects. + * - Global coverage: A single CM93 database covers the entire world, eliminating chart boundaries. + * - Efficient storage: Data is highly compressed and organized in a cell-based structure. + */ class cm93chart : public s57chart { public: cm93chart(); @@ -400,6 +408,11 @@ class cm93chart : public s57chart { //---------------------------------------------------------------------------- class CM93OffsetDialog; +/** + * Represents a composite CM93 chart covering multiple scales. + * Manages multiple cm93chart objects at different scales, providing a seamless multi-scale chart. Handles scale transitions, + * rendering, and querying across different chart scales. + */ class cm93compchart : public s57chart { public: cm93compchart(); @@ -453,7 +466,7 @@ class cm93compchart : public s57chart { void UpdateLUPs(s57chart *pOwner); void ForceEdgePriorityEvaluate(void); - std::list *GetAssociatedObjects(S57Obj *obj); + std::list *GetAssociatedObjects(S57Obj *obj); cm93chart *GetCurrentSingleScaleChart() { return m_pcm93chart_current; } void SetSpecialOutlineCellIndex(int cell_index, int object_id, int subcell) { @@ -489,7 +502,7 @@ class cm93compchart : public s57chart { const LLRegion &Region); bool RenderCellOutlines(ocpnDC &dc, ViewPort &vp, wxPoint *pwp, - M_COVR_Desc *mcd); + M_COVR_Desc *mcd); // Data members @@ -518,9 +531,10 @@ class cm93compchart : public s57chart { }; class OCPNOffsetListCtrl; -//---------------------------------------------------------------------------------------------------------- -// CM93OffsetDialog Specification -//---------------------------------------------------------------------------------------------------------- +/** + * Dialog for managing CM93 chart offsets. + * Allows users to view and adjust offsets for CM93 charts, which can be used to fine-tune chart positioning. + */ class CM93OffsetDialog : public wxDialog { DECLARE_CLASS(CM93OffsetDialog) DECLARE_EVENT_TABLE() diff --git a/gui/include/gui/color_handler.h b/gui/include/gui/color_handler.h index 4a1ceae7ee..ccf7f61141 100644 --- a/gui/include/gui/color_handler.h +++ b/gui/include/gui/color_handler.h @@ -5,17 +5,24 @@ #define _COLOR_HANDLER_H wxColour GetGlobalColor(wxString colorName); +/** + * Enumeration of color types used in dialogs. + * This enum defines different color roles used in the application's dialogs. + */ enum DialogColor { - DLG_BACKGROUND, - DLG_SELECTED_BACKGROUND, - DLG_UNSELECTED_BACKGROUND, - DLG_ACCENT, - DLG_SELECTED_ACCENT, - DLG_UNSELECTED_ACCENT, - DLG_TEXT, - DLG_HIGHLIGHT + DLG_BACKGROUND, /**< Background color of the dialog */ + DLG_SELECTED_BACKGROUND, /**< Background color for selected items */ + DLG_UNSELECTED_BACKGROUND, /**< Background color for unselected items */ + DLG_ACCENT, /**< Accent color */ + DLG_SELECTED_ACCENT, /**< Accent color for selected items */ + DLG_UNSELECTED_ACCENT, /**< Accent color for unselected items */ + DLG_TEXT, /**< Text color */ + DLG_HIGHLIGHT /**< Highlight color */ }; -wxColour GetDialogColor(DialogColor color); +/** + * Retrieves a dialog color based on its role in the application's dialogs. + */ +wxColour GetDialogColor(DialogColor color); -#endif // _COLOR_HANDLER_H +#endif // _COLOR_HANDLER_H diff --git a/gui/include/gui/comm_overflow_dlg.h b/gui/include/gui/comm_overflow_dlg.h index aa46e35b71..5f72cca395 100644 --- a/gui/include/gui/comm_overflow_dlg.h +++ b/gui/include/gui/comm_overflow_dlg.h @@ -24,6 +24,10 @@ #include "observable.h" +/** + * A dialog for handling communication overflow notifications. + * This class manages a popup dialog that appears when communication overflows occur. + */ class CommOverflowDlg { public: CommOverflowDlg(wxWindow* parent); diff --git a/gui/include/gui/compass.h b/gui/include/gui/compass.h index 265be6c198..d92de320aa 100644 --- a/gui/include/gui/compass.h +++ b/gui/include/gui/compass.h @@ -27,6 +27,13 @@ class ocpnDC; class ChartCanvas; +/** + * Represents a compass display in the OpenCPN navigation system. + * + * The ocpnCompass class provides a visual compass display for the OpenCPN + * application. It shows the current heading and, optionally, GPS status. + * This compass is typically displayed as an overlay on the main chart view. + */ class ocpnCompass { public: ocpnCompass(ChartCanvas *parent, bool bShowGPS = true); @@ -53,7 +60,6 @@ class ocpnCompass { void CreateTexture(); void UpdateTexture(); - ChartCanvas *m_parent; wxBitmap m_StatBmp; wxBitmap m_MaskBmp; diff --git a/gui/include/gui/concanv.h b/gui/include/gui/concanv.h index efb677fca6..5f46a41a93 100644 --- a/gui/include/gui/concanv.h +++ b/gui/include/gui/concanv.h @@ -32,7 +32,7 @@ // constants //---------------------------------------------------------------------------- -#include "ocpn_frame.h" //FIXME (dave) Only needed for colorscheme stuff +#include "ocpn_frame.h" //FIXME (dave) Only needed for colorscheme stuff #define SPEED_VMG 0 #define SPEED_SOG 1 @@ -43,10 +43,10 @@ // Class declarations class Routeman; -//---------------------------------------------------------------------------- -// CDI -//---------------------------------------------------------------------------- - +/** + * Course Deviation Indicator display. Provides a visual representation + * of the vessel's course deviation from the planned route. + */ class CDI : public wxWindow { public: CDI(wxWindow *parent, wxWindowID id, long style, const wxString &name); @@ -62,9 +62,10 @@ class CDI : public wxWindow { DECLARE_EVENT_TABLE() }; -//---------------------------------------------------------------------------- -// AnnunText -//---------------------------------------------------------------------------- +/** + * Annunciator Text display. Displays labeled values for various + * navigation data points in the console. + */ class AnnunText : public wxWindow { public: AnnunText(wxWindow *parent, wxWindowID id, const wxString &LegendElement, @@ -100,9 +101,10 @@ class AnnunText : public wxWindow { DECLARE_EVENT_TABLE() }; -//---------------------------------------------------------------------------- -// ConsoleCanvas -//---------------------------------------------------------------------------- +/** + * Main console display canvas. Primary class for the navigation console + * in OpenCPN. Manages and displays various navigation data points and controls. + */ class ConsoleCanvas : public wxFrame { public: ConsoleCanvas(wxWindow *frame); diff --git a/gui/include/gui/conn_params_panel.h b/gui/include/gui/conn_params_panel.h index 6aa4ef62f6..7b18107dd4 100644 --- a/gui/include/gui/conn_params_panel.h +++ b/gui/include/gui/conn_params_panel.h @@ -38,6 +38,10 @@ class options; +/** + * Panel for displaying and editing connection parameters. Shows the details of a specific connection + * and allows for enabling/disabling and editing of the connection parameters. + */ class ConnectionParamsPanel : public wxPanel { public: ConnectionParamsPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, @@ -53,7 +57,7 @@ class ConnectionParamsPanel : public wxPanel { void CreateControls(void); void OnEnableCBClick(wxCommandEvent &event); void Update(ConnectionParams *ConnectionParams); - void SetEnableCheckbox(bool value){ m_cbEnable->SetValue(value); } + void SetEnableCheckbox(bool value) { m_cbEnable->SetValue(value); } bool GetSelected() { return m_bSelected; } int GetUnselectedHeight() { return m_unselectedHeight; } @@ -78,5 +82,4 @@ class ConnectionParamsPanel : public wxPanel { DECLARE_EVENT_TABLE() }; - #endif // __CONN_PARAMS_PANEL_H__ diff --git a/gui/include/gui/connection_edit.h b/gui/include/gui/connection_edit.h index 3c3a825d43..b3474e2fcd 100644 --- a/gui/include/gui/connection_edit.h +++ b/gui/include/gui/connection_edit.h @@ -41,9 +41,10 @@ class options; class ConnectionParamsPanel; -//---------------------------------------------------------------------------- -// ConnectionEditDialog -//---------------------------------------------------------------------------- +/** + * Dialog for editing connection parameters. Provides an interface for + * creating new connections or editing existing connection parameters in detail. + */ class ConnectionEditDialog : public wxDialog { public: const wxString DEFAULT_TCP_PORT = "10110"; diff --git a/gui/include/gui/connections_dialog.h b/gui/include/gui/connections_dialog.h index 03b115adcf..f93c9054c5 100644 --- a/gui/include/gui/connections_dialog.h +++ b/gui/include/gui/connections_dialog.h @@ -40,9 +40,10 @@ class options; class ConnectionParamsPanel; -//---------------------------------------------------------------------------- -// ConnectionsDialog -//---------------------------------------------------------------------------- +/** + * Main dialog for managing data connections. Provides the main interface + * for viewing, adding, editing, and removing data connections in OpenCPN. + */ class ConnectionsDialog : public wxEvtHandler { public: ConnectionsDialog(); @@ -58,7 +59,7 @@ class ConnectionsDialog : public wxEvtHandler { void OnEditDatasourceClick(wxCommandEvent &event); void OnRemoveDatasourceClick(wxCommandEvent &event); - void OnShowGpsWindowCheckboxClick(wxCommandEvent& event); + void OnShowGpsWindowCheckboxClick(wxCommandEvent &event); void EnableConnection(ConnectionParams *conn, bool value); void OnPriorityDialog(wxCommandEvent &event); @@ -69,7 +70,7 @@ class ConnectionsDialog : public wxEvtHandler { void UpdateDatastreams(); void OnSize(wxSizeEvent &ev); -//private: + // private: wxScrolledWindow *m_container; options *m_parent; ConnectionParams *mSelectedConnection; @@ -81,7 +82,7 @@ class ConnectionsDialog : public wxEvtHandler { wxCheckBox *m_cbGarminUploadHost; wxCheckBox *m_cbFurunoGP3X, *m_cbNMEADebug, *m_cbFilterSogCog, *m_cbInput; wxCheckBox *m_cbAPBMagnetic; - wxButton *m_ButtonPriorityDialog; + wxButton *m_ButtonPriorityDialog; wxBoxSizer *boxSizerConnections; wxBoxSizer *m_bSizerOuterContainer; wxStaticBoxSizer *m_sbSizerLB; @@ -92,8 +93,6 @@ class ConnectionsDialog : public wxEvtHandler { #else wxScrolledWindow *m_scrollWinConnections; #endif - }; - -#endif //_CONNECT_DIALOG_H +#endif //_CONNECT_DIALOG_H diff --git a/gui/include/gui/crashprint.h b/gui/include/gui/crashprint.h index 3e0179f6f4..afd9647256 100644 --- a/gui/include/gui/crashprint.h +++ b/gui/include/gui/crashprint.h @@ -11,9 +11,9 @@ #ifndef _WX_CRASHPRINT_H_ #define _WX_CRASHPRINT_H_ -//#ifdef __GNUG__ -// #pragma implementation "crashprint.h" -//#endif +// #ifdef __GNUG__ +// #pragma implementation "crashprint.h" +// #endif //---------------------------------------------------------------------------- // information @@ -29,29 +29,27 @@ //============================================================================ const int maxBtCount = 100; -//---------------------------------------------------------------------------- -//! - -//---------------------------------------------------------------------------- -//! wxCrashPrint +/** + * Handles crash reporting in wxWidgets applications. + */ class wxCrashPrint { public: //! constructor wxCrashPrint(int flags = 0, const wxString &fname = wxEmptyString); //! destructor - ~wxCrashPrint(){}; + ~wxCrashPrint() {}; // format and print report void Report(); private: //! variables - int m_flags; - wxString m_fname; + int m_flags; ///< Flags controlling the crash report behavior. + wxString m_fname; ///< Filename to save the crash report to. - void *m_btBuffer[maxBtCount]; - char **m_btStrings; + void *m_btBuffer[maxBtCount]; ///< Buffer for storing backtrace information. + char **m_btStrings; ///< Strings containing backtrace information. }; #endif // _WX_CRASHPRINT_H_ diff --git a/gui/include/gui/displays.h b/gui/include/gui/displays.h index da1435caaa..dd3ff8fc52 100644 --- a/gui/include/gui/displays.h +++ b/gui/include/gui/displays.h @@ -41,9 +41,11 @@ struct OCPN_MonitorInfo { size_t width; /// @brief Height of the monitor in pixels size_t height; - /// @brief Width of the monitor in physical pixels, on eg. Apple Retina displays this value differs + /// @brief Width of the monitor in physical pixels, on eg. Apple Retina + /// displays this value differs size_t width_px; - /// @brief Height of the monitor in physical pixels, on eg. Apple Retina displays this value differs + /// @brief Height of the monitor in physical pixels, on eg. Apple Retina + /// displays this value differs size_t height_px; /// @brief Scaling factor in percent size_t scale; @@ -54,9 +56,10 @@ extern size_t g_num_monitors; /// @brief Current monitor displaying the main application frame extern size_t g_current_monitor; /// @brief ratio to convert between DIP and physical pixels -/// This is important while using OpenGL canvas on macOS with Retina displays, where this ratio is 2.0 +/// This is important while using OpenGL canvas on macOS with Retina displays, +/// where this ratio is 2.0 extern double g_current_monitor_dip_px_ratio; -/// @brief Information about the monitors connected to the system +/// @brief Information about the monitors connected to the system extern std::vector g_monitor_info; /// @brief Enumerate the monitors connected to the system diff --git a/gui/include/gui/download_mgr.h b/gui/include/gui/download_mgr.h index 804ab85491..ce8ea9826c 100644 --- a/gui/include/gui/download_mgr.h +++ b/gui/include/gui/download_mgr.h @@ -35,6 +35,9 @@ // Accepted by PluginDownloadDialog, reloads plugin list. wxDECLARE_EVENT(EVT_PLUGINS_RELOAD, wxCommandEvent); +/** + * Dialog for downloading plugins. + */ class PluginDownloadDialog : public wxDialog { public: PluginDownloadDialog(wxWindow* parent); @@ -42,8 +45,9 @@ class PluginDownloadDialog : public wxDialog { wxWindow* GetRealParent() { return m_parent; } }; -/** Add progress and final message dialogs to the basic Downloader. */ - +/** + * Downloader with progress and final message dialogs. + */ class GuiDownloader : public Downloader { private: long m_downloaded; diff --git a/gui/include/gui/dychart.h b/gui/include/gui/dychart.h index d803cff703..f015e93702 100644 --- a/gui/include/gui/dychart.h +++ b/gui/include/gui/dychart.h @@ -38,7 +38,7 @@ // Profiling support -//#include "/usr/include/valgrind/callgrind.h" +// #include "/usr/include/valgrind/callgrind.h" // Chart cacheing policy defaults @@ -92,14 +92,14 @@ // Home Base, used if the config file lat/lon seems bogus or missing -//#define START_LAT 35.1025 // New Bern (Ver 1.0) -//#define START_LON -77.0342 +// #define START_LAT 35.1025 // New Bern (Ver 1.0) +// #define START_LON -77.0342 -//#define START_LAT 26.783 // Green Turtle Key (Ver 1.2) -//#define START_LON -77.333 +// #define START_LAT 26.783 // Green Turtle Key (Ver 1.2) +// #define START_LON -77.333 -//#define START_LAT 25.786 // Miami Beach (Ver 1.2.2) -//#define START_LON -80.148 +// #define START_LAT 25.786 // Miami Beach (Ver 1.2.2) +// #define START_LON -80.148 #define START_LAT 33.358 // Georgetown, SC (Ver 1.2.4) #define START_LON -79.282 @@ -138,7 +138,7 @@ //---------------------------------------------------------------------------- #define USE_CPL -//#include "gdal/cpl_port.h" +// #include "gdal/cpl_port.h" #ifndef NULL #define NULL 0 @@ -164,25 +164,24 @@ #endif #if defined(__OCPN__ANDROID__) - #include - #include // this is a cut-down version of gl.h - #include +#include +#include // this is a cut-down version of gl.h +#include #else - #ifdef ocpnUSE_GL - #if defined(__MSVC__) - #include "glew.h" - #elif defined(__WXOSX__) - #include - #include - typedef void (* _GLUfuncptr)(); - #define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 - #elif defined(__WXQT__) || defined(__WXGTK__) - #include - #include - #endif - #endif +#ifdef ocpnUSE_GL +#if defined(__MSVC__) +#include "glew.h" +#elif defined(__WXOSX__) +#include +#include +typedef void (*_GLUfuncptr)(); +#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 +#elif defined(__WXQT__) || defined(__WXGTK__) +#include +#include +#endif +#endif #endif - /* #if defined(_WIN32) || defined(_WIN64) @@ -211,7 +210,6 @@ #endif */ - #ifdef __OCPN__ANDROID__ #include "qdebug.h" #endif diff --git a/gui/include/gui/emboss_data.h b/gui/include/gui/emboss_data.h index 0417725e76..210e33ed0b 100644 --- a/gui/include/gui/emboss_data.h +++ b/gui/include/gui/emboss_data.h @@ -25,6 +25,12 @@ #ifndef __EMBOSS_DATA_H__ #define __EMBOSS_DATA_H__ +/** + * Stores emboss effect data for textures. + * + * Encapsulates data for applying emboss effects to textures in OpenCPN, + * enhancing the visual appearance of charts or UI elements with a 3D-like effect. + */ class emboss_data { public: emboss_data() { diff --git a/gui/include/gui/glChartCanvas.h b/gui/include/gui/glChartCanvas.h index 24630c7401..8390faad69 100644 --- a/gui/include/gui/glChartCanvas.h +++ b/gui/include/gui/glChartCanvas.h @@ -66,7 +66,6 @@ class OCPN_GLCaps { bool bCanDoVBO; bool bCanDoFBO; bool bCanDoGLSL; - }; GLboolean QueryExtension(const char *extName); @@ -89,7 +88,7 @@ class ocpnGLOptions { class glTestCanvas : public wxGLCanvas { public: glTestCanvas(wxWindow *parent); - ~glTestCanvas(){}; + ~glTestCanvas() {}; }; class ocpnDC; @@ -97,6 +96,11 @@ class emboss_data; class Route; class ChartBaseBSB; +/** + * OpenGL chart rendering canvas. Implements OpenGL-based rendering of charts + * and overlays. Handles initialization of OpenGL context, rendering loop, + * and interface with chart objects for drawing. + */ class glChartCanvas : public wxGLCanvas { public: static bool CanClipViewport(const ViewPort &vp); @@ -115,8 +119,9 @@ class glChartCanvas : public wxGLCanvas { void SetColorScheme(ColorScheme cs); void RenderTextures(ocpnDC &dc, float *coords, float *uvCoords, int nVertex, ViewPort *vp); - static void RenderSingleTexture(ocpnDC &dc, float *coords, float *uvCoords, ViewPort *vp, - float dx, float dy, float angle); + static void RenderSingleTexture(ocpnDC &dc, float *coords, float *uvCoords, + ViewPort *vp, float dx, float dy, + float angle); void RenderColorRect(wxRect r, wxColor &color); static bool s_b_useScissorTest; @@ -200,6 +205,9 @@ class glChartCanvas : public wxGLCanvas { protected: void RenderS57TextOverlay(ViewPort &VPoint); void RenderMBTilesOverlay(ViewPort &VPoint); + void RenderSingleMBTileOverlay(int dbIndex, bool bOVerlay, ViewPort &VPoint, + OCPNRegion &screen_region, + LLRegion &screenLLRegion); void RenderScene(bool bRenderCharts = true, bool bRenderOverlays = true); void RenderGLAlertMessage(); @@ -216,7 +224,7 @@ class glChartCanvas : public wxGLCanvas { void RenderCharts(ocpnDC &dc, const OCPNRegion &rect_region); void RenderNoDTA(ViewPort &vp, const LLRegion ®ion, int transparency = 255); - //void RenderNoDTA(ViewPort &vp, ChartBase *chart); + // void RenderNoDTA(ViewPort &vp, ChartBase *chart); void RenderWorldChart(ocpnDC &dc, ViewPort &vp, wxRect &rect, bool &world_view); diff --git a/gui/include/gui/glTextureManager.h b/gui/include/gui/glTextureManager.h index 6689cf5051..ba90c76d7e 100644 --- a/gui/include/gui/glTextureManager.h +++ b/gui/include/gui/glTextureManager.h @@ -39,8 +39,8 @@ WX_DECLARE_LIST(ProgressInfoItem, ProgressInfoList); class ProgressInfoItem { public: - ProgressInfoItem(){}; - ~ProgressInfoItem(){}; + ProgressInfoItem() {}; + ~ProgressInfoItem() {}; wxString file_path; wxString msgx; diff --git a/gui/include/gui/gshhs.h b/gui/include/gui/gshhs.h index 794d038fb2..68e68e4b60 100644 --- a/gui/include/gui/gshhs.h +++ b/gui/include/gui/gshhs.h @@ -43,7 +43,7 @@ #include #include "model/ocpn_types.h" -//#include "ocpndc.h" +// #include "ocpndc.h" #include "viewport.h" #include "model/cutil.h" #include "poly_math.h" @@ -131,8 +131,9 @@ class GshhsPolyCell { void DrawPolygonFilled(ocpnDC &pnt, contour_list *poly, double dx, ViewPort &vp, wxColor const &color); #ifdef ocpnUSE_GL - void DrawPolygonFilledGL(ocpnDC &pnt, contour_list *p, float_2Dpt **pv, int *pvc, - ViewPort &vp, wxColor const &color, bool idl); + void DrawPolygonFilledGL(ocpnDC &pnt, contour_list *p, float_2Dpt **pv, + int *pvc, ViewPort &vp, wxColor const &color, + bool idl); #endif void DrawPolygonContour(ocpnDC &pnt, contour_list *poly, double dx, ViewPort &vp); diff --git a/gui/include/gui/gui_lib.h b/gui/include/gui/gui_lib.h index c7e01065f0..de707daaf5 100644 --- a/gui/include/gui/gui_lib.h +++ b/gui/include/gui/gui_lib.h @@ -1,4 +1,4 @@ - /************************************************************************** +/************************************************************************** * Copyright (C) 2010 by David S. Register * * * * This program is free software; you can redistribute it and/or modify * @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * **************************************************************************/ - /** \file gui_lib.h General purpose GUI support. */ +/** \file gui_lib.h General purpose GUI support. */ #ifndef GUI_LIB_H__ #define GUI_LIB_H__ @@ -36,7 +36,6 @@ class CopyableText : public wxTextCtrl { CopyableText(wxWindow* parent, const char* text); }; - wxFont* GetOCPNScaledFont(wxString item, int default_size = 0); wxFont GetOCPNGUIScaledFont(wxString item); @@ -93,7 +92,9 @@ class OCPN_TimedHTMLMessageDialog : public wxDialog { void OnClose(wxCloseEvent& event); void OnTimer(wxTimerEvent& evt); void RecalculateSize(void); - void OnHtmlLinkClicked( wxHtmlLinkEvent& event ) { wxLaunchDefaultBrowser(event.GetLinkInfo().GetHref()); } + void OnHtmlLinkClicked(wxHtmlLinkEvent& event) { + wxLaunchDefaultBrowser(event.GetLinkInfo().GetHref()); + } private: int m_style; @@ -110,19 +111,19 @@ class OCPN_TimedHTMLMessageDialog : public wxDialog { class TimedPopupWin : public wxWindow { public: - TimedPopupWin(wxWindow *parent, int timeout = -1); + TimedPopupWin(wxWindow* parent, int timeout = -1); ~TimedPopupWin(); - void OnPaint(wxPaintEvent &event); + void OnPaint(wxPaintEvent& event); - void SetBitmap(wxBitmap &bmp); - wxBitmap *GetBitmap() { return m_pbm; } - void OnTimer(wxTimerEvent &event); + void SetBitmap(wxBitmap& bmp); + wxBitmap* GetBitmap() { return m_pbm; } + void OnTimer(wxTimerEvent& event); bool IsActive() { return isActive; } void IsActive(bool state) { isActive = state; } private: - wxBitmap *m_pbm; + wxBitmap* m_pbm; wxTimer m_timer_timeout; int m_timeout_sec; bool isActive; @@ -130,15 +131,14 @@ class TimedPopupWin : public wxWindow { DECLARE_EVENT_TABLE() }; - //----------------------------------------------------------------------- // Dummy Text Control for global key events //----------------------------------------------------------------------- class DummyTextCtrl : public wxTextCtrl { public: - DummyTextCtrl(wxWindow *parent, wxWindowID id); - void OnChar(wxKeyEvent &event); - void OnMouseEvent(wxMouseEvent &event); + DummyTextCtrl(wxWindow* parent, wxWindowID id); + void OnChar(wxKeyEvent& event); + void OnMouseEvent(wxMouseEvent& event); wxTimer m_MouseWheelTimer; int m_mouse_wheel_oneshot; @@ -147,5 +147,4 @@ class DummyTextCtrl : public wxTextCtrl { DECLARE_EVENT_TABLE() }; - #endif // GUI_LIB_H__ diff --git a/gui/include/gui/iENCToolbar.h b/gui/include/gui/iENCToolbar.h index 5cb126f9ce..26d20ad101 100644 --- a/gui/include/gui/iENCToolbar.h +++ b/gui/include/gui/iENCToolbar.h @@ -35,8 +35,11 @@ #define STATE_TIMER 3689 +/** + * Floating toolbar for iENC (International Electronic Navigational Chart) functionality. + * Extends ocpnFloatingToolbarDialog to provide iENC-specific operations like density control and range adjustment. + */ class iENCToolbar : public ocpnFloatingToolbarDialog { - public: iENCToolbar(wxWindow *parent, wxPoint position, long orient, float size_factor); diff --git a/gui/include/gui/mbtiles.h b/gui/include/gui/mbtiles.h index bccef46709..8849846123 100644 --- a/gui/include/gui/mbtiles.h +++ b/gui/include/gui/mbtiles.h @@ -61,7 +61,7 @@ class Database; } class GLShaderProgram; - +class MbtTilesThread; //----------------------------------------------------------------------------- // Helper classes //----------------------------------------------------------------------------- @@ -110,6 +110,7 @@ class ChartMBTiles : public ChartBase { double GetPPM() { return m_ppm_avg; } double GetZoomFactor() { return m_zoomScaleFactor; } + MBTilesType GetTileType() { return m_TileType; } protected: // Methods @@ -131,6 +132,7 @@ class ChartMBTiles : public ChartBase { double m_ppm_avg; // Calculated true scale factor of the 1X chart, // pixels per meter + MBTilesType m_TileType; int m_b_cdebug; @@ -138,10 +140,10 @@ class ChartMBTiles : public ChartBase { TileCache *m_tileCache; LLRegion m_minZoomRegion; wxBitmapType m_imageType; + int m_last_clean_zoom; double m_zoomScaleFactor; - MBTilesType m_Type; MBTilesScheme m_Scheme; SQLite::Database *m_pDB; @@ -151,7 +153,7 @@ class ChartMBTiles : public ChartBase { GLShaderProgram *m_tile_shader_program; uint32_t m_tileCount; MbtTilesThread *m_workerThread; - void StartThread(); + bool StartThread(); void StopThread(); private: diff --git a/gui/include/gui/n0183_ctx_factory.h b/gui/include/gui/n0183_ctx_factory.h index a059868681..aa84df8c83 100644 --- a/gui/include/gui/n0183_ctx_factory.h +++ b/gui/include/gui/n0183_ctx_factory.h @@ -34,31 +34,33 @@ #include "model/comm_n0183_output.h" static bool ConfirmOverwrite() { - int r = OCPNMessageBox(NULL, _("Overwrite Garmin device route number 1?"), - _("OpenCPN Message"), - wxOK | wxCANCEL | wxICON_QUESTION); + int r = + OCPNMessageBox(NULL, _("Overwrite Garmin device route number 1?"), + _("OpenCPN Message"), wxOK | wxCANCEL | wxICON_QUESTION); return r == wxID_OK; } - -static N0183DlgCtx GetDialogCtx(SendToGpsDlg* dialog) { +static N0183DlgCtx GetDialogCtx(SendToGpsDlg* dialog) { N0183DlgCtx dlg_ctx; dlg_ctx.set_value = [dialog](int v) { - if (!dialog || !dialog->GetProgressGauge()) return; - dialog->GetProgressGauge()->SetValue(v); - dialog->GetProgressGauge()->Refresh(); - dialog->GetProgressGauge()->Update(); + if (!dialog || !dialog->GetProgressGauge()) return; + dialog->GetProgressGauge()->SetValue(v); + dialog->GetProgressGauge()->Refresh(); + dialog->GetProgressGauge()->Update(); }; dlg_ctx.set_range = [dialog](int r) { - if (!dialog || !dialog->GetProgressGauge()) return; - dialog->GetProgressGauge()->SetRange(r); }; + if (!dialog || !dialog->GetProgressGauge()) return; + dialog->GetProgressGauge()->SetRange(r); + }; dlg_ctx.pulse = [dialog](void) { - if (!dialog || !dialog->GetProgressGauge()) return; - dialog->GetProgressGauge()->Pulse(); }; - dlg_ctx.set_message = - [dialog](const std::string& s) { dialog->SetMessage(wxString(s)); }; + if (!dialog || !dialog->GetProgressGauge()) return; + dialog->GetProgressGauge()->Pulse(); + }; + dlg_ctx.set_message = [dialog](const std::string& s) { + dialog->SetMessage(wxString(s)); + }; dlg_ctx.confirm_overwrite = []() { return ConfirmOverwrite(); }; return dlg_ctx; } -#endif // _N0183_DLG_CTX_FACTORY_H__ +#endif // _N0183_DLG_CTX_FACTORY_H__ diff --git a/gui/include/gui/navutil.h b/gui/include/gui/navutil.h index 2e56ce8814..5ec770a97b 100644 --- a/gui/include/gui/navutil.h +++ b/gui/include/gui/navutil.h @@ -37,7 +37,7 @@ #endif #include "bbox.h" -//#include "chcanv.h" +// #include "chcanv.h" #include "chartdbs.h" // nclude "RoutePoint.h" #include "vector2D.h" @@ -45,7 +45,6 @@ #include "ocpndc.h" #include "model/navutil_base.h" - extern bool LogMessageOnce(const wxString &msg); extern double fromUsrDistance(double usr_distance, int unit = -1); extern double fromUsrSpeed(double usr_speed, int unit = -1); @@ -63,8 +62,7 @@ void DimeControl(wxWindow *ctrl); void DimeControl(wxWindow *ctrl, wxColour col, wxColour col1, wxColour back_color, wxColour text_color, wxColour uitext, wxColour udkrd, wxColour gridline); -wxColor GetDimedColor(const wxColor& c); - +wxColor GetDimedColor(const wxColor &c); class Route; class NavObjectCollection; @@ -111,18 +109,16 @@ void UI_ImportGPX(wxWindow *parent, bool islayer = false, bool ExportGPXRoutes(wxWindow *parent, RouteList *pRoutes, const wxString suggestedName = _T("routes")); -bool ExportGPXTracks(wxWindow *parent, std::vector *pRoutes, +bool ExportGPXTracks(wxWindow *parent, std::vector *pRoutes, const wxString suggestedName = _T("tracks")); bool ExportGPXWaypoints(wxWindow *parent, RoutePointList *pRoutePoints, const wxString suggestedName = _T("waypoints")); - class MouseZoom { public: - /** Convert a slider scale 1-100 value to configuration value 1.02..3.0. */ static double ui_to_config(int slider_pos) { - return (2.0/100) * static_cast(slider_pos) + 1.02; + return (2.0 / 100) * static_cast(slider_pos) + 1.02; } /** Convert configuration 1.02..3.0 value to slider scale 1..100. */ @@ -131,7 +127,6 @@ class MouseZoom { } }; - //---------------------------------------------------------------------------- // Config //---------------------------------------------------------------------------- @@ -188,5 +183,4 @@ class MyConfig : public wxFileConfig { void SwitchInlandEcdisMode(bool Switch); - #endif diff --git a/gui/include/gui/ocpn_app.h b/gui/include/gui/ocpn_app.h index 70fbd43f1a..54f7c7b3d4 100644 --- a/gui/include/gui/ocpn_app.h +++ b/gui/include/gui/ocpn_app.h @@ -45,7 +45,7 @@ class Track; class MyApp : public wxApp { public: MyApp(); - ~MyApp(){}; + ~MyApp() {}; bool OnInit() override; int OnExit() override; @@ -78,7 +78,6 @@ class MyApp : public wxApp { DECLARE_EVENT_TABLE() private: - /** Remote command deemed to be run from actual argc/argv. */ struct ParsedCmdline { CmdlineAction action; @@ -94,7 +93,6 @@ class MyApp : public wxApp { void InitRestListeners(); ObsListener rest_activate_listener; ObsListener rest_reverse_listener; - }; wxDECLARE_APP(MyApp); diff --git a/gui/include/gui/ocpn_fontdlg.h b/gui/include/gui/ocpn_fontdlg.h new file mode 100644 index 0000000000..8fa2b8c383 --- /dev/null +++ b/gui/include/gui/ocpn_fontdlg.h @@ -0,0 +1,91 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: ocpn_fontdlg.h +// Purpose: Generic font dialog for OpenCPN +// Author: Julian Smart +// Modified by: David S Register +// Created: 04/01/98 +// Copyright: (c) Julian Smart, David S Register +// Licence: wxWindows licence + +#ifndef _OCPN_GENERIC_FONTDLGG_H +#define _OCPN_GENERIC_FONTDLGG_H + +#include "wx/gdicmn.h" +#include "wx/font.h" + +#define USE_SPINCTRL_FOR_POINT_SIZE 0 + +/* + * FONT DIALOG + */ + +class WXDLLIMPEXP_FWD_CORE wxChoice; +class WXDLLIMPEXP_FWD_CORE wxText; +class WXDLLIMPEXP_FWD_CORE wxCheckBox; +class WXDLLIMPEXP_FWD_CORE OCPNFontPreviewer; + +enum { + wxID_FONT_UNDERLINE = 3000, + wxID_FONT_STYLE, + wxID_FONT_WEIGHT, + wxID_FONT_FAMILY, + wxID_FONT_COLOUR, + wxID_FONT_SIZE +}; + +class WXDLLIMPEXP_CORE ocpnGenericFontDialog : public wxFontDialogBase { +public: + ocpnGenericFontDialog() { Init(); } + ocpnGenericFontDialog(wxWindow *parent) : wxFontDialogBase(parent) { Init(); } + ocpnGenericFontDialog(wxWindow *parent, const wxFontData &data) + : wxFontDialogBase(parent, data) { + Init(); + } + virtual ~ocpnGenericFontDialog(); + + virtual int ShowModal() override; + + // Internal functions + void OnCloseWindow(wxCloseEvent &event); + + virtual void CreateWidgets(); + virtual void InitializeFont(); + + void OnChangeFont(wxCommandEvent &event); + +#if USE_SPINCTRL_FOR_POINT_SIZE + void OnChangeSize(wxSpinEvent &event); +#endif + +protected: + virtual bool DoCreate(wxWindow *parent) override; + +private: + // common part of all ctors + void Init(); + + void DoChangeFont(); + + wxFont m_dialogFont; + + wxChoice *m_familyChoice; + wxChoice *m_styleChoice; + wxChoice *m_weightChoice; + wxChoice *m_colourChoice; + wxCheckBox *m_underLineCheckBox; + +#if USE_SPINCTRL_FOR_POINT_SIZE + wxSpinCtrl *m_pointSizeSpin; +#else + wxChoice *m_pointSizeChoice; +#endif + + OCPNFontPreviewer *m_previewer; + bool m_useEvents; + + // static bool fontDialogCancelled; + wxDECLARE_EVENT_TABLE(); + wxDECLARE_DYNAMIC_CLASS(ocpnGenericFontDialog); +}; + +#endif // _OCPN_GENERIC_FONTDLGG_H diff --git a/gui/include/gui/ocpn_frame.h b/gui/include/gui/ocpn_frame.h index 7e67201385..898e13a92e 100644 --- a/gui/include/gui/ocpn_frame.h +++ b/gui/include/gui/ocpn_frame.h @@ -63,14 +63,13 @@ void ApplyLocale(void); void LoadS57(); - // Fwd definitions class ChartCanvas; class ocpnFloatingToolbarDialog; class OCPN_MsgEvent; class options; class Track; -//class OCPN_ThreadMessageEvent; +// class OCPN_ThreadMessageEvent; class wxHtmlWindow; class ArrayOfCDI; @@ -82,8 +81,6 @@ class ArrayOfCDI; #define ID_CM93ZOOMG 102 - - // Command identifiers for wxCommandEvents coming from the outside world. // Removed from enum to facilitate constant definition // @@ -96,7 +93,6 @@ class ArrayOfCDI; #define ID_CMD_SOUND_FINISHED 306 // NOLINTEND - #ifdef __ANDROID__ #define STAT_FIELD_COUNT 2 #define STAT_FIELD_TICK -1 @@ -116,7 +112,6 @@ class ArrayOfCDI; // Define a constant GPS signal watchdog timeout value #define GPS_TIMEOUT_SECONDS 10 - #define MAX_COG_AVERAGE_SECONDS 60 #define MAX_COGSOG_FILTER_SECONDS 60 //---------------------------------------------------------------------------- @@ -146,8 +141,11 @@ class OCPN_ThreadMessageEvent : public wxEvent { std::string m_string; }; +/** + * Main application frame. Top-level window frame for OpenCPN that manages + * overall application state, menus, toolbars, and child windows like chart canvases. + */ class MyFrame : public wxFrame { - public: MyFrame(wxFrame *frame, const wxString &title, const wxPoint &pos, const wxSize &size, long style); @@ -233,9 +231,9 @@ class MyFrame : public wxFrame { void ToggleChartOutlines(ChartCanvas *cc); void ToggleENCText(ChartCanvas *cc); void ToggleSoundings(ChartCanvas *cc); - #if 0 +#if 0 void ToggleRocks(void); - #endif +#endif bool ToggleLights(ChartCanvas *cc); void ToggleAnchor(ChartCanvas *cc); void ToggleAISDisplay(ChartCanvas *cc); @@ -412,5 +410,4 @@ class MyFrame : public wxFrame { DECLARE_EVENT_TABLE() }; - #endif // _OFRAME_H diff --git a/gui/include/gui/ocpn_pixel.h b/gui/include/gui/ocpn_pixel.h index d8a583effc..b7917ea8cb 100644 --- a/gui/include/gui/ocpn_pixel.h +++ b/gui/include/gui/ocpn_pixel.h @@ -31,7 +31,7 @@ #ifndef _OCPN_PIXEL_H_ #define _OCPN_PIXEL_H_ -//#include "dychart.h" // for configuration stuff +// #include "dychart.h" // for configuration stuff wxImage Image_Rotate(wxImage &base_image, double angle, const wxPoint ¢re_of_rotation, bool interpolating, @@ -46,28 +46,28 @@ wxImage Image_Rotate(wxImage &base_image, double angle, // Only one of the following must be selected // with due regard for the system type -//#define __PIX_CACHE_WXIMAGE__ // a safe default -//#define __PIX_CACHE_DIBSECTION__ // for MSW -//#define __PIX_CACHE_X11IMAGE__ // for -//X11/Universal, requires ocpnUSE_ocpnBitmap +// #define __PIX_CACHE_WXIMAGE__ // a safe default +// #define __PIX_CACHE_DIBSECTION__ // for MSW +// #define __PIX_CACHE_X11IMAGE__ // for +// X11/Universal, requires ocpnUSE_ocpnBitmap // I use these shortcuts.... #ifdef __WXX11__ #define __PIX_CACHE_WXIMAGE__ -//#define __PIX_CACHE_X11IMAGE__ +// #define __PIX_CACHE_X11IMAGE__ #endif #ifdef __WXGTK__ #define __PIX_CACHE_WXIMAGE__ -//#define __PIX_CACHE_X11IMAGE__ -//#define __PIX_CACHE_PIXBUF__ +// #define __PIX_CACHE_X11IMAGE__ +// #define __PIX_CACHE_PIXBUF__ #endif #ifdef __WXMSW__ #define __PIX_CACHE_WXIMAGE__ -//#define __PIX_CACHE_DIBSECTION__ -//#define ocpnUSE_DIBSECTION -//#define ocpnUSE_ocpnBitmap +// #define __PIX_CACHE_DIBSECTION__ +// #define ocpnUSE_DIBSECTION +// #define ocpnUSE_ocpnBitmap #endif #ifdef __WXOSX__ diff --git a/gui/include/gui/ocpn_print.h b/gui/include/gui/ocpn_print.h index dfd2428632..f83782ccc3 100644 --- a/gui/include/gui/ocpn_print.h +++ b/gui/include/gui/ocpn_print.h @@ -26,10 +26,10 @@ #ifndef _OCPN_PRINT_H__ #define _OCPN_PRINT_H__ -#include -#include -#include -#include +#include +#include +#include +#include class MyPrintout : public wxPrintout { public: diff --git a/gui/include/gui/ocpndc.h b/gui/include/gui/ocpndc.h index 8e4d2850c8..0545e6f6b0 100644 --- a/gui/include/gui/ocpndc.h +++ b/gui/include/gui/ocpndc.h @@ -39,7 +39,7 @@ #include "TexFont.h" #include "viewport.h" #ifdef ocpnUSE_GL - #include "shaders.h" +#include "shaders.h" #endif class ViewPort; @@ -55,6 +55,11 @@ void DrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, class wxGLCanvas; class glChartCanvas; +/** + * Device context class that can use either wxDC or OpenGL for drawing. + * Provides a unified interface for drawing operations, abstracting the underlying + * context. Allows seamless switching between contexts and offers various drawing methods. + */ class ocpnDC { public: ocpnDC(glChartCanvas &canvas); @@ -86,9 +91,9 @@ class ocpnDC { void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, bool b_hiqual = true); void DrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, - bool b_hiqual); - void DrawGLThickLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPen pen, bool b_hiqual); + bool b_hiqual); + void DrawGLThickLines(int n, wxPoint points[], wxCoord xoffset, + wxCoord yoffset, wxPen pen, bool b_hiqual); void StrokeLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); void StrokeLine(wxPoint a, wxPoint b) { StrokeLine(a.x, a.y, b.x, b.y); } @@ -125,7 +130,7 @@ class ocpnDC { void DestroyClippingRegion() {} wxDC *GetDC() const { return dc; } - void SetDPIFactor(double factor){ m_dpi_factor = factor; } + void SetDPIFactor(double factor) { m_dpi_factor = factor; } void SetVP(ViewPort vp); #ifdef ocpnUSE_GL diff --git a/gui/include/gui/options.h b/gui/include/gui/options.h index d9232c339b..5448bfe07e 100644 --- a/gui/include/gui/options.h +++ b/gui/include/gui/options.h @@ -72,7 +72,7 @@ class wxGenericDirCtrl; class MyConfig; class ChartGroupsUI; -//class ConnectionParams; +// class ConnectionParams; class PluginListPanel; class ChartGroupArray; class ChartGroup; @@ -377,15 +377,16 @@ class options : private Uncopyable, void ClearConfigList(); void BuildConfigList(); void OnConfigMouseSelected(wxMouseEvent &event); - void OnDialogInit(wxInitDialogEvent& event); - + void OnDialogInit(wxInitDialogEvent &event); bool GetNeedNew() { return m_bneedNew; } void SetNeedNew(bool bnew) { m_bneedNew = bnew; } int GetScrollRate() { return m_scrollRate; } - void SetForceNewToolbarOnCancel(bool val) { m_bForceNewToolbaronCancel = val; } + void SetForceNewToolbarOnCancel(bool val) { + m_bForceNewToolbaronCancel = val; + } - wxArrayString *GetSerialArray(){ return m_pSerialArray; } + wxArrayString *GetSerialArray() { return m_pSerialArray; } // Should we show tooltips? static bool ShowToolTips(void); @@ -425,8 +426,9 @@ class options : private Uncopyable, wxTextCtrl *pCmdSoundString; wxChoice *m_pShipIconType, *m_pcTCDatasets; - wxSlider *m_pSlider_Zoom_Raster, *m_pSlider_GUI_Factor, *m_pSlider_Chart_Factor, - *m_pSlider_Ship_Factor, *m_pSlider_Text_Factor, *m_pSlider_ENCText_Factor; + wxSlider *m_pSlider_Zoom_Raster, *m_pSlider_GUI_Factor, + *m_pSlider_Chart_Factor, *m_pSlider_Ship_Factor, *m_pSlider_Text_Factor, + *m_pSlider_ENCText_Factor; wxSlider *m_pMouse_Zoom_Slider; wxSlider *m_pSlider_Zoom_Vector; wxSlider *m_pSlider_CM93_Zoom; @@ -447,7 +449,6 @@ class options : private Uncopyable, void OnCanvasConfigSelectClick(int ID, bool selected); - bool b_haveWMM; bool b_oldhaveWMM; ColorScheme m_cs; @@ -491,9 +492,9 @@ class options : private Uncopyable, int m_nCharWidthMax; wxBoxSizer *boxSizerCharts; wxScrolledWindow *m_scrollWinChartList; - wxScrolledWindow* chartPanelWin; - wxBoxSizer* cmdButtonSizer; - wxStaticBox* loadedBox; + wxScrolledWindow *chartPanelWin; + wxBoxSizer *cmdButtonSizer; + wxStaticBox *loadedBox; std::vector panelVector; wxArrayString activeChartList; @@ -661,7 +662,7 @@ class options : private Uncopyable, ChartGroupsUI *groupsPanel; wxImageList *m_topImgList; - wxCheckBox* m_persist_active_route_chkbox; + wxCheckBox *m_persist_active_route_chkbox; wxScrolledWindow *m_pNMEAForm; void resetMarStdList(bool bsetConfig, bool bsetStd); @@ -688,7 +689,7 @@ class options : private Uncopyable, wxSize m_sliderSize; bool m_bneedNew; - std::shared_ptrcomm_dialog; + std::shared_ptr comm_dialog; DECLARE_EVENT_TABLE() }; @@ -716,7 +717,7 @@ class CanvasConfigSelect : public wxPanel { DECLARE_EVENT_TABLE() }; -class ChartGroupsUI : public wxScrolledWindow { +class ChartGroupsUI : public wxScrolledWindow { public: ChartGroupsUI(wxWindow *parent); ~ChartGroupsUI(void); diff --git a/gui/include/gui/piano.h b/gui/include/gui/piano.h index b7ff2eb21f..2af5fa74a5 100644 --- a/gui/include/gui/piano.h +++ b/gui/include/gui/piano.h @@ -27,7 +27,6 @@ #ifndef __statwin_H__ #define __statwin_H__ - //---------------------------------------------------------------------------- // constants //---------------------------------------------------------------------------- @@ -43,10 +42,7 @@ WX_DECLARE_OBJARRAY(wxRect, RectArray); class MyFrame; class ChartCanvas; -enum { - PIANO_MODE_COMPOSITE = 0, - PIANO_MODE_LEGACY -}; +enum { PIANO_MODE_COMPOSITE = 0, PIANO_MODE_LEGACY }; //---------------------------------------------------------------------------- // PianoKeyElement @@ -63,8 +59,6 @@ class PianoKeyElement { std::vector dbindex_list; }; - - //---------------------------------------------------------------------------- // Piano //---------------------------------------------------------------------------- @@ -79,7 +73,8 @@ class Piano : public wxEvtHandler { void FormatKeys(void); bool MouseEvent(wxMouseEvent &event); void SetColorScheme(ColorScheme cs); - void SetKeyArray(std::vector ¢er_array, std::vector &full_array); + void SetKeyArray(std::vector ¢er_array, + std::vector &full_array); void SetActiveKey(int iactive) { m_iactive = iactive; } void SetActiveKeyArray(std::vector array); void SetNoshowIndexArray(std::vector array); @@ -88,7 +83,7 @@ class Piano : public wxEvtHandler { void SetSkewIndexArray(std::vector array); void SetTmercIndexArray(std::vector array); void SetPolyIndexArray(std::vector array); - int GetPianoMode() { return m_piano_mode;} + int GetPianoMode() { return m_piano_mode; } std::vector GetActiveKeyArray() { return m_active_index_array; } @@ -131,7 +126,7 @@ class Piano : public wxEvtHandler { int GetnKeys() { return m_nRegions; } private: - void SetPianoMode(int new_mode) {m_piano_mode = new_mode;} + void SetPianoMode(int new_mode) { m_piano_mode = new_mode; } void DrawGLSL(int y); void BuildGLTexture(); diff --git a/gui/include/gui/pluginmanager.h b/gui/include/gui/pluginmanager.h index 98219d104a..14d70e1890 100644 --- a/gui/include/gui/pluginmanager.h +++ b/gui/include/gui/pluginmanager.h @@ -439,14 +439,14 @@ class PluginListPanel : public wxScrolledWindow { PluginPanel* m_PluginSelected; wxString m_selectedName; int m_pluginSpacer; - std::atomic_flag m_is_loading; //!< recursive lock. + std::atomic_flag m_is_loading; //!< recursive lock. }; /** Invokes client browser on plugin info_url when clicked. */ class WebsiteButton : public wxPanel { public: WebsiteButton(wxWindow* parent, const char* url); - ~WebsiteButton(){}; + ~WebsiteButton() {}; void SetURL(std::string url) { m_url = url; } protected: @@ -467,7 +467,7 @@ class PluginPanel : public wxPanel { const wxSize& size, PluginMetadata plugin); /** Construct an entry reflecting a safe-loaded "uninstall-only" item */ - PluginPanel(wxPanel* parent, const std::string& name); + PluginPanel(wxPanel* parent, const std::string& name); ~PluginPanel(); @@ -526,7 +526,7 @@ class S52PLIB_Context { LUP = NULL; }; - ~S52PLIB_Context(){}; + ~S52PLIB_Context() {}; BoundingBox BBObj; // lat/lon BBox of the rendered object bool bBBObj_valid; // set after the BBObj has been calculated once. diff --git a/gui/include/gui/printtable.h b/gui/include/gui/printtable.h index 8b2bf88797..a49ffe8482 100644 --- a/gui/include/gui/printtable.h +++ b/gui/include/gui/printtable.h @@ -145,7 +145,7 @@ class PrintCell { public: // Constructor with content to print and device - PrintCell(){}; + PrintCell() {}; // Constructor with content to print and device void Init(const wxString& _content, wxDC* _dc, int _width, int _cellpadding, diff --git a/gui/include/gui/priority_gui.h b/gui/include/gui/priority_gui.h index 0cb4d4e6c1..38d1d0aa79 100644 --- a/gui/include/gui/priority_gui.h +++ b/gui/include/gui/priority_gui.h @@ -41,18 +41,17 @@ class PriorityDlg : public wxDialog { virtual ~PriorityDlg(); private: - void OnMoveUpClick(wxCommandEvent& event); - void OnMoveDownClick(wxCommandEvent& event); - void OnRefreshClick(wxCommandEvent& event); - void OnClearClick(wxCommandEvent& event); - void OnItemSelected(wxCommandEvent& event); + void OnMoveUpClick(wxCommandEvent &event); + void OnMoveDownClick(wxCommandEvent &event); + void OnRefreshClick(wxCommandEvent &event); + void OnClearClick(wxCommandEvent &event); + void OnItemSelected(wxCommandEvent &event); void ProcessMove(wxTreeItemId, int dir); void Populate(); - void AddLeaves(const std::vector &map_list, - size_t map_index, std::string map_name, - wxTreeItemId leaf_parent); + void AddLeaves(const std::vector &map_list, size_t map_index, + std::string map_name, wxTreeItemId leaf_parent); void AdjustSatPriority(); void AdjustCOGSOGPriority(); @@ -69,5 +68,4 @@ class PriorityDlg : public wxDialog { wxFont *m_pF; }; - -#endif //_PRIORITY_DIALOG_H +#endif //_PRIORITY_DIALOG_H diff --git a/gui/include/gui/rest_server_gui.h b/gui/include/gui/rest_server_gui.h index 4aa67550de..1d13600f7d 100644 --- a/gui/include/gui/rest_server_gui.h +++ b/gui/include/gui/rest_server_gui.h @@ -38,7 +38,7 @@ // Constants for Dialog #define ID_STGDIALOG 10005 -#define SYMBOL_STG_STYLE \ +#define SYMBOL_STG_STYLE \ wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | wxCLOSE_BOX #define SYMBOL_STG_TITLE _("Send to GPS") @@ -58,26 +58,23 @@ class AcceptObjectDialog : public wxDialog { AcceptObjectDialog(wxWindow* parent, const wxString& caption, const wxString& msg1, const wxString msg2); AcceptObjectDialog(wxWindow* parent, wxWindowID id, const wxString& caption, - const wxString& hint, const wxPoint& pos, const wxSize& size, - long style, const wxString& msg1, const wxString& msg2); + const wxString& hint, const wxPoint& pos, + const wxSize& size, long style, const wxString& msg1, + const wxString& msg2); ~AcceptObjectDialog(); - bool Create(wxWindow* parent, wxWindowID id, - const wxString& caption, - const wxString& hint, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& msg1, const wxString& msg2); + bool Create(wxWindow* parent, wxWindowID id, const wxString& caption, + const wxString& hint, const wxPoint& pos, const wxSize& size, + long style, const wxString& msg1, const wxString& msg2); - void SetMessage(const wxString &message); - void SetCheck1Message(const wxString &message); + void SetMessage(const wxString& message); + void SetCheck1Message(const wxString& message); - bool GetCheck1Value(){ return m_pCheck1->GetValue(); } + bool GetCheck1Value() { return m_pCheck1->GetValue(); } private: - void CreateControls(const wxString& hint, - const wxString& msg1, const wxString& msg); + void CreateControls(const wxString& hint, const wxString& msg1, + const wxString& msg); void OnCancelClick(wxCommandEvent& event); void OnOKClick(wxCommandEvent& event); @@ -85,11 +82,10 @@ class AcceptObjectDialog : public wxDialog { wxButton* m_CancelButton; wxButton* m_OKButton; wxStaticText* premtext; - wxCheckBox *m_pCheck1; + wxCheckBox* m_pCheck1; wxString m_checkbox1_msg; }; - class PINCreateDialog : public wxDialog { DECLARE_DYNAMIC_CLASS(PINCreateDialog) DECLARE_EVENT_TABLE() @@ -98,13 +94,12 @@ class PINCreateDialog : public wxDialog { PINCreateDialog(); PINCreateDialog(wxWindow* parent, wxWindowID id, const wxString& caption, - const wxString& hint, const wxPoint& pos, const wxSize& size, - long style); + const wxString& hint, const wxPoint& pos, const wxSize& size, + long style); ~PINCreateDialog(); static RestServerDlgCtx GetDlgCtx(); - wxDialog* Initiate(const std::string& msg, const std::string& text1); void DeInit(); @@ -114,10 +109,10 @@ class PINCreateDialog : public wxDialog { const wxPoint& pos = SYMBOL_STG_POSITION, const wxSize& size = SYMBOL_STG_SIZE, long style = SYMBOL_STG_STYLE); - void SetMessage(const wxString &message); - void SetText1Message(const wxString &message); + void SetMessage(const wxString& message); + void SetText1Message(const wxString& message); - wxString GetText1Value(){ return m_pText1->GetValue(); } + wxString GetText1Value() { return m_pText1->GetValue(); } private: void CreateControls(const wxString& hint); @@ -128,7 +123,7 @@ class PINCreateDialog : public wxDialog { wxButton* m_CancelButton; wxButton* m_OKButton; wxStaticText* premtext; - wxTextCtrl *m_pText1; + wxTextCtrl* m_pText1; wxString m_checkbox1_msg; }; diff --git a/gui/include/gui/route_ctx_factory.h b/gui/include/gui/route_ctx_factory.h index 415f0324ec..ce27ad2c20 100644 --- a/gui/include/gui/route_ctx_factory.h +++ b/gui/include/gui/route_ctx_factory.h @@ -32,39 +32,38 @@ #include "model/track.h" extern WayPointman* pWayPointMan; -extern Routeman *g_pRouteMan; +extern Routeman* g_pRouteMan; extern std::vector g_TrackList; RouteCtx RouteCtxFactory() { - RouteCtx ctx; - ctx.find_route_by_guid = - [](wxString guid) { - if (!g_pRouteMan) return static_cast(0); - return g_pRouteMan->FindRouteByGUID(guid); }; - ctx.find_track_by_guid = - [](wxString guid) { - if (!g_pRouteMan) return static_cast(0); - return g_pRouteMan->FindTrackByGUID(guid); }; - ctx.find_wpt_by_guid = - [](wxString guid) { - if (!pWayPointMan) return static_cast(0); - return pWayPointMan->FindWaypointByGuid(guid.ToStdString()); }; - ctx.delete_route = - [](Route* route) { - if (!g_pRouteMan) return; - g_pRouteMan->DeleteRoute(route, NavObjectChanges::getInstance()); }; - ctx.delete_track = - [](Track* track) { - auto it = std::find(g_TrackList.begin(), g_TrackList.end(), track); - if (it != g_TrackList.end()) { - g_TrackList.erase(it); - } - delete track; - }; - ctx.delete_waypoint = - [](RoutePoint* wpt) { - if (!pWayPointMan) return; - pWayPointMan->DestroyWaypoint(wpt); }; - return ctx; + RouteCtx ctx; + ctx.find_route_by_guid = [](wxString guid) { + if (!g_pRouteMan) return static_cast(0); + return g_pRouteMan->FindRouteByGUID(guid); + }; + ctx.find_track_by_guid = [](wxString guid) { + if (!g_pRouteMan) return static_cast(0); + return g_pRouteMan->FindTrackByGUID(guid); + }; + ctx.find_wpt_by_guid = [](wxString guid) { + if (!pWayPointMan) return static_cast(0); + return pWayPointMan->FindWaypointByGuid(guid.ToStdString()); + }; + ctx.delete_route = [](Route* route) { + if (!g_pRouteMan) return; + g_pRouteMan->DeleteRoute(route, NavObjectChanges::getInstance()); + }; + ctx.delete_track = [](Track* track) { + auto it = std::find(g_TrackList.begin(), g_TrackList.end(), track); + if (it != g_TrackList.end()) { + g_TrackList.erase(it); + } + delete track; + }; + ctx.delete_waypoint = [](RoutePoint* wpt) { + if (!pWayPointMan) return; + pWayPointMan->DestroyWaypoint(wpt); + }; + return ctx; } -#endif // _ROUTE_CTX_FACTORY_H__ +#endif // _ROUTE_CTX_FACTORY_H__ diff --git a/gui/include/gui/route_gui.h b/gui/include/gui/route_gui.h index 593fe1bcda..904fce18dd 100644 --- a/gui/include/gui/route_gui.h +++ b/gui/include/gui/route_gui.h @@ -39,7 +39,7 @@ class RouteGui { public: - RouteGui(Route& route) : m_route(route) {} + RouteGui(Route &route) : m_route(route) {} virtual void Draw(ocpnDC &dc, ChartCanvas *canvas, const LLBBox &box); void DrawPointWhich(ocpnDC &dc, ChartCanvas *canvas, int iPoint, wxPoint *rpn); @@ -58,7 +58,7 @@ class RouteGui { SendToGpsDlg *dialog); private: - Route& m_route; + Route &m_route; }; -#endif // _ROUTE_GUI_H +#endif // _ROUTE_GUI_H diff --git a/gui/include/gui/route_point_gui.h b/gui/include/gui/route_point_gui.h index e10d2ae7a6..7bf9fcf920 100644 --- a/gui/include/gui/route_point_gui.h +++ b/gui/include/gui/route_point_gui.h @@ -36,9 +36,9 @@ class RoutePointGui { public: - RoutePointGui(RoutePoint& point) : m_point(point) { /*ReLoadIcon();*/ } + RoutePointGui(RoutePoint &point) : m_point(point) { /*ReLoadIcon();*/ } - void Draw(ocpnDC& dc, ChartCanvas* canvas, wxPoint* rpn = 0, + void Draw(ocpnDC &dc, ChartCanvas *canvas, wxPoint *rpn = 0, bool boverride_viz = false); void CalculateDCRect(wxDC &dc, ChartCanvas *canvas, wxRect *prect); bool IsVisibleSelectable(ChartCanvas *canvas, bool boverrideViz = false); @@ -52,20 +52,19 @@ class RoutePointGui { void ReLoadIcon(void); void EnableDragHandle(bool bEnable); int GetIconImageIndex(); - wxBitmap* GetIconBitmap() { + wxBitmap *GetIconBitmap() { if (m_point.m_IconIsDirty) ReLoadIcon(); return m_point.m_pbmIcon; } #ifdef ocpnUSE_GL - void DrawGL(ViewPort &vp, ChartCanvas* canvas, ocpnDC &dc, + void DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, bool use_cached_screen_coords = false, bool vizOverride = false); #endif private: wxPoint2DDouble computeDragHandlePoint(ChartCanvas *canvas); - RoutePoint& m_point; + RoutePoint &m_point; }; - -#endif // _ROUTE_POINT_GUI_H +#endif // _ROUTE_POINT_GUI_H diff --git a/gui/include/gui/routeman_gui.h b/gui/include/gui/routeman_gui.h index 8e192fc33a..2f7b128b32 100644 --- a/gui/include/gui/routeman_gui.h +++ b/gui/include/gui/routeman_gui.h @@ -35,15 +35,13 @@ class RoutemanGui { static RoutemanDlgCtx GetDlgCtx(); void DeleteAllTracks(); - void DeleteTrack(Track *pTrack); + void DeleteTrack(Track* pTrack); bool UpdateProgress(); - private: void DoAdvance(void); Routeman& m_routeman; }; - -#endif // _ROUTEMAN_GUI_H +#endif // _ROUTEMAN_GUI_H diff --git a/gui/include/gui/routemanagerdialog.h b/gui/include/gui/routemanagerdialog.h index 07d6a4b4f9..5479f553ea 100644 --- a/gui/include/gui/routemanagerdialog.h +++ b/gui/include/gui/routemanagerdialog.h @@ -69,7 +69,8 @@ class RouteManagerDialog : public wxFrame { void UpdateLists(); void OnTabSwitch(wxNotebookEvent &event); - static void WptShowPropertiesDialog(std::vector wpts, wxWindow *parent); + static void WptShowPropertiesDialog(std::vector wpts, + wxWindow *parent); void TrackToRoute(Track *track); private: diff --git a/gui/include/gui/s57chart.h b/gui/include/gui/s57chart.h index 8f8bda985b..d0a84c3b80 100644 --- a/gui/include/gui/s57chart.h +++ b/gui/include/gui/s57chart.h @@ -65,7 +65,7 @@ extern "C" bool s57_GetChartExtent(const wxString &FullPath, Extent *pext); void s57_DrawExtendedLightSectors(ocpnDC &temp_dc, ViewPort &VPoint, std::vector §orlegs); void s57_DrawExtendedLightSectorsGL(ocpnDC &temp_dc, ViewPort &VPoint, - std::vector §orlegs); + std::vector §orlegs); bool s57_CheckExtendedLightSectors(ChartCanvas *cc, int mx, int my, ViewPort &VPoint, std::vector §orlegs); @@ -109,9 +109,21 @@ WX_DECLARE_OBJARRAY(S57Obj, ArrayOfS57Obj); WX_DECLARE_LIST(ObjRazRules, ListOfObjRazRules); -//---------------------------------------------------------------------------- -// s57 Chart object class -//---------------------------------------------------------------------------- +/** + * Represents an S57 format electronic navigational chart in OpenCPN. + * + * S57 is an international standard for encoding and exchanging digital hydrographic data. + * These vector charts contain maritime information + * including depths, buoys, lights, and other navigational features. + * + * Key features of S57 charts and this class: + * - Vector data: Allows for smooth scaling and rotation without loss of quality + * - Rich feature set: Includes detailed information about various maritime objects + * - Layered display: Supports showing/hiding different types of information + * - SENC support: Can create and use System ENC (SENC) files for faster loading + * - Render options: Supports various rendering modes including OpenGL + * - Object queries: Allows for detailed queries of chart objects + */ class s57chart : public ChartBase { public: s57chart(); @@ -198,7 +210,7 @@ class s57chart : public ChartBase { // DEPCNT VALDCO array access bool GetNearestSafeContour(double safe_cnt, double &next_safe_cnt); - virtual std::list *GetAssociatedObjects(S57Obj *obj); + virtual std::list *GetAssociatedObjects(S57Obj *obj); virtual std::unordered_map &Get_ve_hash(void) { return m_ve_hash; @@ -337,7 +349,7 @@ class s57chart : public ChartBase { ChartPlugInWrapper *target_plugin_chart, s57chart *Chs57, ListOfObjRazRules *rule_list, - std::list *pi_rule_list, + std::list *pi_rule_list, std::vector §orlegs); void CreateChartContext(); void PopulateObjectsWithContext(); @@ -385,7 +397,6 @@ class s57chart : public ChartBase { bool m_btex_mem; char m_usage_char; - int m_LineVBO_name; std::unordered_map m_ve_hash; diff --git a/gui/include/gui/safe_mode_gui.h b/gui/include/gui/safe_mode_gui.h index f4292647af..0f7bbbee96 100644 --- a/gui/include/gui/safe_mode_gui.h +++ b/gui/include/gui/safe_mode_gui.h @@ -18,4 +18,4 @@ namespace safe_mode { */ void check_last_start(); -} +} // namespace safe_mode diff --git a/gui/include/gui/shaders.h b/gui/include/gui/shaders.h index 4e6ea1c784..04de15131c 100644 --- a/gui/include/gui/shaders.h +++ b/gui/include/gui/shaders.h @@ -47,129 +47,125 @@ extern GLShaderProgram *pring_shader_program[2]; extern GLint texture_2DA_shader_program; -extern const GLchar* preamble; +extern const GLchar *preamble; -class GLShaderProgram -{ +/** + * Wrapper class for OpenGL shader programs. Encapsulates an OpenGL shader program, + * providing methods for compiling shaders, linking the program, and setting uniform variables. + */ +class GLShaderProgram { public: - GLShaderProgram() : programId_(0), linked_(false) { - programId_ = glCreateProgram(); - } - ~GLShaderProgram() { - glDeleteProgram(programId_) ; - } - - bool addShaderFromSource(std::string const &shaderSource, GLenum shaderType) { - char const *shaderCStr = shaderSource.c_str(); - GLuint shaderId = glCreateShader(shaderType); - - GLchar const* files[] = { preamble, shaderCStr }; - GLint lengths[] = { (GLint)strlen(preamble), (GLint)strlen(shaderCStr) }; - - glShaderSource(shaderId, 2, files, lengths); - - glCompileShader(shaderId); - glGetShaderiv(shaderId, GL_COMPILE_STATUS, &success); - if (!success) { - GLint logLength = 0; - glGetShaderiv(shaderId, GL_INFO_LOG_LENGTH, &logLength); - if (logLength > 0) { - auto log = std::unique_ptr(new char[logLength]); - glGetShaderInfoLog(shaderId, logLength, &logLength, log.get()); - printf("ERROR::SHADER::COMPILATION_FAILED\n%s\n", log.get()); + GLShaderProgram() : programId_(0), linked_(false) { + programId_ = glCreateProgram(); + } + ~GLShaderProgram() { glDeleteProgram(programId_); } + + bool addShaderFromSource(std::string const &shaderSource, GLenum shaderType) { + char const *shaderCStr = shaderSource.c_str(); + GLuint shaderId = glCreateShader(shaderType); + + GLchar const *files[] = {preamble, shaderCStr}; + GLint lengths[] = {(GLint)strlen(preamble), (GLint)strlen(shaderCStr)}; + + glShaderSource(shaderId, 2, files, lengths); + + glCompileShader(shaderId); + glGetShaderiv(shaderId, GL_COMPILE_STATUS, &success); + if (!success) { + GLint logLength = 0; + glGetShaderiv(shaderId, GL_INFO_LOG_LENGTH, &logLength); + if (logLength > 0) { + auto log = std::unique_ptr(new char[logLength]); + glGetShaderInfoLog(shaderId, logLength, &logLength, log.get()); + printf("ERROR::SHADER::COMPILATION_FAILED\n%s\n", log.get()); #ifdef USE_ANDROID_GLES2 - qDebug() << "SHADER COMPILE ERROR " << log.get(); - qDebug() << shaderCStr; + qDebug() << "SHADER COMPILE ERROR " << log.get(); + qDebug() << shaderCStr; #endif - } - return false; } - - glAttachShader(programId_, shaderId); - return true; + return false; } - bool linkProgram() { - glLinkProgram(programId_); - glGetProgramiv( programId_, GL_LINK_STATUS, &linkSuccess); //requesting the status - if (linkSuccess == GL_FALSE) { - GLint logLength = 0; - glGetShaderiv(programId_, GL_INFO_LOG_LENGTH, &logLength); - if (logLength > 0) { - auto log = std::unique_ptr(new char[logLength]); - glGetShaderInfoLog(programId_, logLength, &logLength, log.get()); - printf("ERROR::SHADER::LINK_FAILED\n%s\n", log.get()); - } - return false; + glAttachShader(programId_, shaderId); + return true; + } + + bool linkProgram() { + glLinkProgram(programId_); + glGetProgramiv(programId_, GL_LINK_STATUS, + &linkSuccess); // requesting the status + if (linkSuccess == GL_FALSE) { + GLint logLength = 0; + glGetShaderiv(programId_, GL_INFO_LOG_LENGTH, &logLength); + if (logLength > 0) { + auto log = std::unique_ptr(new char[logLength]); + glGetShaderInfoLog(programId_, logLength, &logLength, log.get()); + printf("ERROR::SHADER::LINK_FAILED\n%s\n", log.get()); } - linked_ = true; - return true; + return false; } - - - void Bind() { glUseProgram(programId_); } - void UnBind() { - glDisableVertexAttribArray(0); - glUseProgram(0); - } - - void SetUniform1f( const std::string &name, float value) { - GLint loc = getUniformLocation(name); - glUniform1f( loc, value); - } - void SetUniform2fv( const std::string &name, float *value) { - GLint loc = getUniformLocation(name); - glUniform2fv( loc, 1, value); - } - void SetUniform4fv( const std::string &name, float *value) { - GLint loc = getUniformLocation(name); - glUniform4fv( loc, 1, value); - } - void SetUniform1i( const std::string &name, GLint value) { - GLint loc = getUniformLocation(name); - glUniform1i( loc, value); - } - void SetUniformMatrix4fv( const std::string &name, float *value) { - GLint matloc = getUniformLocation(name); - glUniformMatrix4fv(matloc, 1, GL_FALSE, value); - } - - void SetAttributePointerf( const char *name, float *value ){ - GLint aloc = glGetAttribLocation(programId_, name); - glVertexAttribPointer(aloc, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), value); - glEnableVertexAttribArray(aloc); - - // Disable VBO's (vertex buffer objects) for attributes. - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - - } - - - - - GLuint programId() const { return programId_; } - bool isOK() const { return linked_; } + linked_ = true; + return true; + } + + void Bind() { glUseProgram(programId_); } + void UnBind() { + glDisableVertexAttribArray(0); + glUseProgram(0); + } + + void SetUniform1f(const std::string &name, float value) { + GLint loc = getUniformLocation(name); + glUniform1f(loc, value); + } + void SetUniform2fv(const std::string &name, float *value) { + GLint loc = getUniformLocation(name); + glUniform2fv(loc, 1, value); + } + void SetUniform4fv(const std::string &name, float *value) { + GLint loc = getUniformLocation(name); + glUniform4fv(loc, 1, value); + } + void SetUniform1i(const std::string &name, GLint value) { + GLint loc = getUniformLocation(name); + glUniform1i(loc, value); + } + void SetUniformMatrix4fv(const std::string &name, float *value) { + GLint matloc = getUniformLocation(name); + glUniformMatrix4fv(matloc, 1, GL_FALSE, value); + } + + void SetAttributePointerf(const char *name, float *value) { + GLint aloc = glGetAttribLocation(programId_, name); + glVertexAttribPointer(aloc, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), + value); + glEnableVertexAttribArray(aloc); + + // Disable VBO's (vertex buffer objects) for attributes. + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + } + + GLuint programId() const { return programId_; } + bool isOK() const { return linked_; } private: - std::unordered_map m_uniformLocationCache; - GLuint programId_; - bool linked_; - GLint success; - GLint linkSuccess; - - GLint getUniformLocation(const std::string &name) { - if(m_uniformLocationCache.find(name) != m_uniformLocationCache.end()) - return m_uniformLocationCache[name]; - - GLint loc = glGetUniformLocation(programId_, name.c_str()); - m_uniformLocationCache[name] = loc; - return loc; - } - + std::unordered_map m_uniformLocationCache; + GLuint programId_; + bool linked_; + GLint success; + GLint linkSuccess; + + GLint getUniformLocation(const std::string &name) { + if (m_uniformLocationCache.find(name) != m_uniformLocationCache.end()) + return m_uniformLocationCache[name]; + + GLint loc = glGetUniformLocation(programId_, name.c_str()); + m_uniformLocationCache[name] = loc; + return loc; + } }; - bool loadShaders(int index = 0); void reConfigureShaders(int index = 0); void unloadShaders(); diff --git a/gui/include/gui/shapefile_basemap.h b/gui/include/gui/shapefile_basemap.h index 60b703c1ac..0dab187312 100644 --- a/gui/include/gui/shapefile_basemap.h +++ b/gui/include/gui/shapefile_basemap.h @@ -37,7 +37,8 @@ #include "poly_math.h" #include "ocpndc.h" -#if (defined(OCPN_GHC_FILESYSTEM) || (defined(__clang_major__) && (__clang_major__ < 15))) +#if (defined(OCPN_GHC_FILESYSTEM) || \ + (defined(__clang_major__) && (__clang_major__ < 15))) // MacOS 1.13 #include namespace fs = ghc::filesystem; @@ -94,20 +95,23 @@ enum Quality { typedef std::vector contour; typedef std::vector contour_list; -/// @brief Basemap +/** + * Represents a basemap chart based on shapefile data. Handles loading and rendering + * of shapefile-based basemap charts. Supports different quality levels and provides methods for drawing filled polygons. + */ class ShapeBaseChart { public: ShapeBaseChart() = delete; ShapeBaseChart(const std::string &filename, const size_t &min_scale, const wxColor &color = *wxBLACK) - : _dmod(1), + : _dmod(1), _loading(false), _is_usable(false), _is_tiled(false), _min_scale(min_scale), _filename(filename), _reader(nullptr), - _color(color){ + _color(color) { _is_usable = fs::exists(filename); } @@ -132,7 +136,7 @@ class ShapeBaseChart { static const std::string ConstructPath(const std::string &dir, const std::string &quality_suffix) { return std::string(dir + fs::path::preferred_separator + "basemap_" + - quality_suffix + ".shp"); + quality_suffix + ".shp"); } bool CrossesLand(double &lat1, double &lon1, double &lat2, double &lon2); @@ -148,7 +152,8 @@ class ShapeBaseChart { void DoDrawPolygonFilledGL(ocpnDC &pnt, ViewPort &vp, const shp::Feature &feature); void DrawPolygonFilled(ocpnDC &pnt, ViewPort &vp); - void AddPointToTessList(shp::Point &point, ViewPort &vp, GLUtesselator *tobj, bool idl); + void AddPointToTessList(shp::Point &point, ViewPort &vp, GLUtesselator *tobj, + bool idl); std::string _filename; shp::ShapefileReader *_reader; @@ -161,11 +166,14 @@ class ShapeBaseChart { const std::pair &D); bool PolygonLineIntersect(const shp::Feature &feature, - const std::pair &A, - const std::pair &B); + const std::pair &A, + const std::pair &B); }; -/// @brief Set of basemaps at different resolutions +/** + * Manages a set of ShapeBaseChart objects at different resolutions. Maintains multiple + * basemap charts at varying quality levels and scales. Handles selection of the appropriate chart based on the current view scale. + */ class ShapeBaseChartSet { public: ShapeBaseChartSet(); @@ -176,10 +184,12 @@ class ShapeBaseChartSet { void RenderViewOnDC(ocpnDC &dc, ViewPort &vp); ShapeBaseChart &SelectBaseMap(const size_t &scale); - bool IsUsable() { return _basemap_map.size() > 0 && LowestQualityBaseMap().IsUsable(); } + bool IsUsable() { + return _basemap_map.size() > 0 && LowestQualityBaseMap().IsUsable(); + } bool CrossesLand(double lat1, double lon1, double lat2, double lon2) { - if(IsUsable()) { + if (IsUsable()) { return HighestQualityBaseMap().CrossesLand(lat1, lon1, lat2, lon2); } return false; diff --git a/gui/include/gui/ssfn.h b/gui/include/gui/ssfn.h new file mode 100644 index 0000000000..124367848b --- /dev/null +++ b/gui/include/gui/ssfn.h @@ -0,0 +1,1752 @@ +/* + * ssfn.h + * + * Copyright (C) 2019 bzt (bztsrc@gitlab) + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * @brief Scalable Screen Font renderer in a single ANSI C/C++ header + * + */ + +#ifndef _SSFN_H_ +#define _SSFN_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* if stdint.h was not included before us */ +#ifndef uint8_t +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +#endif + +/***** file format *****/ + +/* magic bytes */ +#define SSFN_MAGIC "SSFN" +#define SSFN_COLLECTION "SFNC" +#define SSFN_ENDMAGIC "NFSS" + +/* font family group */ +#define SSFN_FAMILY_SERIF 0 +#define SSFN_FAMILY_SANS 1 +#define SSFN_FAMILY_DECOR 2 +#define SSFN_FAMILY_MONOSPACE 3 +#define SSFN_FAMILY_HAND 4 + +/* font style flags */ +#define SSFN_STYLE_REGULAR 0 +#define SSFN_STYLE_BOLD 1 +#define SSFN_STYLE_ITALIC 2 + +/* file format features */ +#define SSFN_FEAT_HASBMAP 1 /* there's at least one bitmap fragment */ +#define SSFN_FEAT_HASCMAP \ + 2 /* there's at least one pixmap fragment or one color command, so a color \ + map too */ +#define SSFN_FEAT_HASHINT 4 /* there's at least one hinting fragment */ +#define SSFN_FEAT_KBIGLKP 8 /* big offsets in kerning look up table */ +#define SSFN_FEAT_KBIGCHR 16 /* big characters in kerning look up tables */ +#define SSFN_FEAT_KBIGCRD 32 /* big coordinates in kerning groups */ +#define SSFN_FEAT_HBIGCRD 64 /* bit coordinates in autohinting fragments */ + +/* contour commands for vector fragments */ +#define SSFN_CONTOUR_MOVE 0 +#define SSFN_CONTOUR_LINE 1 +#define SSFN_CONTOUR_QUAD 2 +#define SSFN_CONTOUR_CUBIC 3 +#define SSFN_CONTOUR_COLOR 4 + +/* bitmap and pixmap fragments and hinting grid info */ +#define SSFN_FRAG_BITMAP 0 +#define SSFN_FRAG_LBITMAP 1 +#define SSFN_FRAG_PIXMAP 2 +#define SSFN_FRAG_HINTING 3 + +/* glyph variants */ +#define SSFN_VARIANT_DEFAULT 0 /* default, also isolated glyphs */ +#define SSFN_VARIANT_LOCAL0 0 +#define SSFN_VARIANT_INITIAL \ + 1 /* currently not needed because contextual glyphs has their own UNICODE \ + code points, */ +#define SSFN_VARIANT_LOCAL1 \ + 1 /* so its only purpose is to store Serbian / Macedonian B D G P T */ +#define SSFN_VARIANT_MEDIAL 2 +#define SSFN_VARIANT_LOCAL2 2 +#define SSFN_VARIANT_FINAL 3 +#define SSFN_VARIANT_LOCAL3 3 +#define SSFN_VARIANT_LOCAL4 4 +#define SSFN_VARIANT_LOCAL5 5 +#define SSFN_VARIANT_LOCAL6 6 +#define SSFN_NUMVARIANTS 7 + +/* main SSFN header */ +typedef struct { + uint8_t magic[4]; /* SSFN magic bytes */ + uint32_t size; /* total size in bytes */ + uint8_t family; /* font family group */ + uint8_t style; /* font style, zero or OR'd SSFN_STYLE_BOLD and + SSFN_STYLE_ITALIC */ + uint8_t quality; /* quality, defines grid size, 0 - 8 */ + uint8_t features; /* feature flags, OR'd SSFN_FEAT_* */ + uint8_t revision; /* format revision, must be zero */ + uint8_t reserved0; /* must be zero */ + uint16_t reserved1; + uint16_t baseline; /* horizontal baseline in grid pixels */ + uint16_t underline; /* position of under line in grid pixels */ + uint16_t bbox_left; /* overall bounding box for all glyphs in grid pixels */ + uint16_t bbox_top; + uint16_t bbox_right; + uint16_t bbox_bottom; + uint32_t fragments_offs; /* offset of fragments table relative to magic */ + uint32_t characters_offs[SSFN_NUMVARIANTS]; /* offset of characters tables per + variant relative to magic */ + uint32_t kerning_offs; /* kerning table offset relative to magic */ +} ssfn_font_t; + +/***** renderer API *****/ +#define SSFN_FAMILY_ANY 0xff /* select the first loaded font */ +#define SSFN_FAMILY_BYNAME 0xfe /* select font by its unique name */ + +#define SSFN_STYLE_UNDERLINE 4 /* under line glyph */ +#define SSFN_STYLE_STHROUGH 8 /* strike through glyph */ +#define SSFN_STYLE_NOHINTING 0x40 /* no auto hinting grid */ +#define SSFN_STYLE_ABS_SIZE 0x80 /* use absolute size value */ + +#define SSFN_FRAG_CONTOUR 255 + +/* error codes */ +#define SSFN_OK 0 /* success */ +#define SSFN_ERR_ALLOC 1 /* allocation error */ +#define SSFN_ERR_NOFACE 2 /* no font face selected */ +#define SSFN_ERR_INVINP 3 /* invalid input */ +#define SSFN_ERR_BADFILE 4 /* bad SSFN file format */ +#define SSFN_ERR_BADSTYLE 5 /* bad style */ +#define SSFN_ERR_BADSIZE 6 /* bad size */ +#define SSFN_ERR_BADMODE 7 /* bad mode */ +#define SSFN_ERR_NOGLYPH 8 /* glyph (or kerning info) not found */ +#define SSFN_ERR_NOVARIANT 9 /* no such glyph variant */ + +/* rendering modes */ +#define SSFN_MODE_NONE \ + 0 /* just select the font to get the glyph (for kerning) */ +#define SSFN_MODE_OUTLINE 1 /* return the glyph's outlines */ +#define SSFN_MODE_BITMAP 2 /* render into bitmap */ +#define SSFN_MODE_ALPHA 3 /* render into alpha channel */ +#define SSFN_MODE_CMAP 4 /* render into color map indexed buffer */ + +/* grid fitting */ +#define SSFN_HINTING_THRESHOLD \ + 16 /* don't change unless you really know what you're doing */ + +/* returned bitmap struct */ +#define SSFN_DATA_MAX 65536 +typedef struct { + uint8_t mode; /* returned glyph's data format */ + uint8_t baseline; /* baseline of glyph, scaled to size */ + uint8_t w; /* width */ + uint8_t h; /* height */ + uint8_t adv_x; /* advance x */ + uint8_t adv_y; /* advance y */ + uint16_t pitch; /* data buffer bytes per line */ + uint32_t *cmap; /* pointer to color map */ + uint8_t data[SSFN_DATA_MAX]; /* data buffer */ +} ssfn_glyph_t; + +/* renderer context */ +typedef struct { + const ssfn_font_t **fnt[5]; /* font registry */ + const ssfn_font_t *s; /* explicitly selected font */ + const ssfn_font_t *f; /* font selected by best match */ + ssfn_glyph_t *ret; /* glyph to return */ + uint16_t *p; /* outline points */ + uint16_t *r[256]; /* raster for scanlines */ + uint16_t *h; /* auto hinting grid */ + int len[5]; /* number of fonts in registry */ + int mp; /* memory allocated for points */ + int np; /* how many points actually are there */ + int nr[256]; /* number of coordinates in each raster line */ + int err; /* returned error code */ + int family; /* required family */ + int style; /* required style */ + int size; /* required size */ + int mode; /* required mode */ + int variant; /* required variant */ + int g; /* shift value for grid size */ + int m, ix, u, uix, uax, lx, ly, mx, my; /* helper variables */ +} ssfn_t; + +/***** API function protoypes *****/ + +/* normal renderer */ +int ssfn_load(ssfn_t *ctx, + const ssfn_font_t *font); /* add an SSFN to context */ +int ssfn_select(ssfn_t *ctx, int family, char *name, int style, int size, + int mode); /* select font to use */ +int ssfn_variant(ssfn_t *ctx, + int variant); /* select glyph variant (optional) */ +uint32_t ssfn_utf8(char **str); /* decode UTF-8 sequence */ +ssfn_glyph_t *ssfn_render(ssfn_t *ctx, + uint32_t unicode); /* return allocated glyph bitmap */ +int ssfn_kern(ssfn_t *ctx, uint32_t unicode, uint32_t nextunicode, int *x, + int *y); /* get kerning values */ +int ssfn_bbox(ssfn_t *ctx, char *str, int usekern, int *w, + int *h); /* get bounding box of a rendered string */ +int ssfn_mem(ssfn_t *ctx); /* return how much memory is used */ +void ssfn_free(ssfn_t *ctx); /* free context */ +#define ssfn_lasterr(ctx) ((ssfn_t *)ctx)->err /* return last error code */ +#define ssfn_error(err) \ + (err >= 0 && err <= 9 ? ssfn_errstr[err] \ + : "Unknown error") /* return string for error code */ +extern const char *ssfn_errstr[]; + +/* simple renderer */ +int ssfn_putc(uint32_t unicode); /* render console bitmap font */ + +/***** renderer implementations *****/ + +#ifndef SSFN_NOIMPLEMENTATION +/*** normal renderer (ca. 22k, fully featured with error checking) ***/ + +#ifndef NULL +#define NULL (void *)0 +#endif +// # ifndef size_t +// typedef __SIZE_TYPE__ size_t; +// # endif +#ifndef ssfn_private +#define ssfn_private +#endif +// # ifndef inline +// # define inline __inline__ +// # endif + +/* Clang does not have built-in versions of these but gcc has */ +#ifndef SSFN_memcmp +#ifdef __builtin_memcmp +#define SSFN_memcmp __builtin_memcmp +#else +#define SSFN_memcmp memcmp +#endif +#endif + +#ifndef SSFN_memset +#ifdef __builtin_memset +#define SSFN_memset __builtin_memset +#else +#define SSFN_memset memset +#endif +#endif + +#ifndef SSFN_realloc +#ifdef __builtin_realloc +#define SSFN_realloc __builtin_realloc +#else +#define SSFN_realloc realloc +#endif +#endif + +#ifndef SSFN_free +#ifdef __builtin_free +#define SSFN_free __builtin_free +#else +#define SSFN_free free +#endif +#endif + +/** + * Error code strings + */ +const char *ssfn_errstr[] = {"", + "Memory allocation error", + "No font face found", + "Invalid input value", + "Bad file format", + "Invalid style", + "Invalid size", + "Invalid mode", + "Glyph not found", + "Glyph variant not found"}; + +/*** Private functions ***/ +/* f = file scale, g = grid 4095.15, o = screen point 255.255, i = screen pixel + * 255, c = ceil */ +#define _ssfn_i2g(x) ((x) ? (((x) << 16) - (1 << 15)) / ctx->m : 0) +#define _ssfn_g2o(x) (((x) * ctx->m + (1 << 7)) >> 8) +#define _ssfn_g2i(x) (((x) * ctx->m + (1 << 15)) >> 16) +#define _ssfn_g2ic(x) (((x) * ctx->m + (1 << 16) - 1) >> 16) +#define _ssfn_f2i(x) ((((x) << s) * ctx->m + (1 << 15)) >> 16) +#define _ssfn_o2i(x) (((x) + (1 << 7)) >> 8) +#define _ssfn_o2ic(x) ((x + (1 << 8) - 1) >> 8) +#define _ssfn_g2ox(x) ((x) >= (4095 << 4) ? _ssfn_g2o(x) : ctx->h[((x) >> 4)]) +#define _ssfn_g2ix(x) \ + ((x) >= (4095 << 4) ? _ssfn_g2i(x) : _ssfn_o2i(ctx->h[((x) >> 4)])) +#define _ssfn_g2ixc(x) \ + ((x) >= (4095 << 4) ? _ssfn_g2ic(x) : _ssfn_o2ic(ctx->h[((x) >> 4)])) +#define _ssfn_g2oy(y) (_ssfn_g2o(y)) +#define _ssfn_g2iy(y) (_ssfn_g2i(y)) +#define _ssfn_g2iyc(y) (_ssfn_g2ic(y)) +#define _ssfn_igg(y) (((4096 << 4) - (y)) >> (2)) +#define _ssfn_igi(y) \ + ((((4096 << 4) - (y)) * ctx->m + (1 << (15 + 3))) >> (16 + 3)) + +/* parse character table */ +ssfn_private uint8_t *_ssfn_c(const ssfn_font_t *font, uint32_t unicode, + int v) { + uint32_t i, j, l; + uint8_t *ptr; + + if (!font->characters_offs[v]) return NULL; + + ptr = (uint8_t *)font + font->characters_offs[v]; + l = (font->quality < 5 && font->characters_offs[v] < 65536) + ? 4 + : (font->characters_offs[v] < 1048576 ? 5 : 6); + + for (j = i = 0; i < 0x110000; i++) { + if (ptr[0] & 0x80) { + if (ptr[0] & 0x40) { + i += ptr[1] | ((ptr[0] & 0x3f) << 8); + ptr += 2; + } else { + i += ptr[0] & 0x3f; + ptr++; + } + } else { + if (i == unicode) return ptr; + ptr += ptr[0] * l + 10; + j++; + } + } + return NULL; +} + +/* add a line to contour */ +ssfn_private void _ssfn_l(ssfn_t *ctx, int x, int y, int l) { + if (x > (4096 << 4) - 16) x = (4096 << 4) - 16; + if (y > (4096 << 4) - 16) y = (4096 << 4) - 16; + if (x < -1 || y < -1 || (x == ctx->lx && y == ctx->ly)) return; + + if (ctx->np + 2 >= ctx->mp) { + ctx->mp += 512; + ctx->p = (uint16_t *)SSFN_realloc(ctx->p, ctx->mp * sizeof(uint16_t)); + if (!ctx->p) { + ctx->err = SSFN_ERR_ALLOC; + return; + } + } + if (!ctx->np || !l || _ssfn_g2i(ctx->p[ctx->np - 2]) != _ssfn_g2i(x) || + _ssfn_g2i(ctx->p[ctx->np - 1]) != _ssfn_g2i(y)) { + ctx->p[ctx->np++] = x; + ctx->p[ctx->np++] = y; + ctx->lx = x; + ctx->ly = y; + } + if ((ctx->style & 0x200) && x >= 0 && ctx->ix > x) ctx->ix = x; +} + +/* add a Bezier curve to contour */ +void _ssfn_b(ssfn_t *ctx, int x0, int y0, int x1, int y1, int x2, int y2, + int x3, int y3, int l) { + int m0x, m0y, m1x, m1y, m2x, m2y, m3x, m3y, m4x, m4y, m5x, m5y; + if (l < 8 && (x0 != x3 || y0 != y3)) { + m0x = ((x1 - x0) / 2) + x0; + m0y = ((y1 - y0) / 2) + y0; + m1x = ((x2 - x1) / 2) + x1; + m1y = ((y2 - y1) / 2) + y1; + m2x = ((x3 - x2) / 2) + x2; + m2y = ((y3 - y2) / 2) + y2; + m3x = ((m1x - m0x) / 2) + m0x; + m3y = ((m1y - m0y) / 2) + m0y; + m4x = ((m2x - m1x) / 2) + m1x; + m4y = ((m2y - m1y) / 2) + m1y; + m5x = ((m4x - m3x) / 2) + m3x; + m5y = ((m4y - m3y) / 2) + m3y; + _ssfn_b(ctx, x0, y0, m0x, m0y, m3x, m3y, m5x, m5y, l + 1); + _ssfn_b(ctx, m5x, m5y, m4x, m4y, m2x, m2y, x3, y3, l + 1); + } + _ssfn_l(ctx, x3, y3, l); +} + +/* rasterize contour */ +ssfn_private void _ssfn_r(ssfn_t *ctx) { + int i, k, l, m, n = 0, x, y, Y, M = 0; + uint16_t *r; + uint8_t *pix = ctx->ret->data; + + for (y = 0; y < ctx->ret->h; y++) { + Y = _ssfn_i2g(y); + r = ctx->r[y]; + for (n = 0, i = 0; i < ctx->np - 3; i += 2) { + if ((ctx->p[i] == 0xffff && ctx->p[i + 1] == 0xffff) || + (ctx->p[i + 2] == 0xffff && ctx->p[i + 3] == 0xffff)) + continue; + if ((ctx->p[i + 1] < Y && ctx->p[i + 3] >= Y) || + (ctx->p[i + 3] < Y && ctx->p[i + 1] >= Y)) { + if (_ssfn_g2iy(ctx->p[i + 1]) == _ssfn_g2iy(ctx->p[i + 3])) + x = (((int)ctx->p[i] + (int)ctx->p[i + 2]) >> 1); + else + x = ((int)ctx->p[i]) + ((Y - (int)ctx->p[i + 1]) * + ((int)ctx->p[i + 2] - (int)ctx->p[i]) / + ((int)ctx->p[i + 3] - (int)ctx->p[i + 1])); + if (y == ctx->u) { + if (x < ctx->uix) { + ctx->uix = x; + } + if (x > ctx->uax) { + ctx->uax = x; + } + } + x = _ssfn_g2ox(x - ctx->ix); + for (k = 0; k < n && x > r[k]; k++); + if (n >= ctx->nr[y]) { + ctx->nr[y] = (n < ctx->np) ? ctx->np : (n + 1) << 1; + ctx->r[y] = (uint16_t *)SSFN_realloc(ctx->r[y], (ctx->nr[y] << 1)); + if (!ctx->r[y]) { + ctx->err = SSFN_ERR_ALLOC; + return; + } + r = ctx->r[y]; + } + for (l = n; l > k; l--) r[l] = r[l - 1]; + r[k] = x; + n++; + } + } + if (n > 1 && n & 1) { + r[n - 2] = r[n - 1]; + n--; + } + ctx->nr[y] = n; + if (n) { + if (y > M) M = y; + k = y * ctx->ret->pitch; + for (i = 0; i < n - 1; i += 2) { + if (ctx->style & 0x100) { + l = (r[i] + r[i + 1]) >> 9; + if (ctx->mode == SSFN_MODE_BITMAP + ? (pix[k + (l >> 3)] & (1 << (l & 7)) ? 1 : 0) + : (pix[k + l] == 0xFF)) { + if (r[i] + 256 > r[i + 1]) + r[i] = r[i + 1] - 128; + else + r[i] += 256; + if (r[i + 1] - 256 > r[i]) r[i + 1] -= 256; + } else { + if (i >= n - 2 || r[i + 1] + 256 < r[i + 2]) r[i + 1] += 256; + } + } + l = ((r[i] + 128) >> 8); + m = ((r[i + 1] + 128) >> 8); + if (ctx->mode != SSFN_MODE_BITMAP && l + 1 < m) l++; + for (; l < m; l++) { + switch (ctx->mode) { + case SSFN_MODE_BITMAP: + pix[k + (l >> 3)] ^= 1 << (l & 7); + break; + case SSFN_MODE_ALPHA: + pix[k + l] ^= 0xFF; + break; + case SSFN_MODE_CMAP: + pix[k + l] ^= 0x0F; + break; + } + } + if (l + 1 > ctx->ret->w) ctx->ret->w = l + 1; + } + } + } + /* fix rounding errors */ + if (M + 1 == ctx->ret->baseline) { + ctx->ret->baseline--; + ctx->u--; + } +} + +/* anti-alias a contour */ +ssfn_private void _ssfn_a(ssfn_t *ctx) { + int i, x, y, x0, y0, x1, y1, sx, sy, dx, dy, m, o, p = ctx->ret->pitch; + uint8_t *pix = ctx->ret->data, e; + uint16_t *r; + + if (ctx->mode < SSFN_MODE_ALPHA || !ctx->p || ctx->np < 4) return; + + for (y = o = 0; y < ctx->ret->h; y++, o += p) { + if (ctx->nr[y] && (r = ctx->r[y])) { + for (i = 0; i < ctx->nr[y] - 1; i += 2) { + x = (r[i] + 128) >> 8; + e = ~((r[i] + 128) & 0xFF); + if (e == 127) + e = 255; + else { + if (x && pix[o + x - 1] > e) e = pix[o + x - 1]; + if (y && pix[o + x - p] > e) e = pix[o + x - p]; + } + if (ctx->mode == SSFN_MODE_CMAP) e = (e >> 4) | 0xF0; + if (e > pix[o + x]) pix[o + x] = e; + e = ((r[i + 1] + 128) & 0xFF); + if (e == 128) e = 255; + pix[o + ((r[i + 1] + 128) >> 8)] = + ctx->mode == SSFN_MODE_CMAP ? (e >> 4) | 0xF0 : e; + } + } + } + + for (i = 0; i < ctx->np - 3; i += 2) { + if ((ctx->p[i] == 0xffff && ctx->p[i + 1] == 0xffff) || + (ctx->p[i + 2] == 0xffff && ctx->p[i + 3] == 0xffff)) + continue; + + x0 = ctx->p[i] - ctx->ix; + y0 = ctx->p[i + 1]; + x1 = ctx->p[i + 2] - ctx->ix; + y1 = ctx->p[i + 3]; + sx = x1 >= x0 ? 1 : -1; + sy = y1 >= y0 ? 1 : -1; + dx = x1 - x0; + dy = y1 - y0; + if (sx * dx >= sy * dy && dx) { + for (x = x0, m = sx * dx; m > 0; m -= 16, x += sx * 16) { + y = _ssfn_g2oy(y0 + ((x - x0) * dy / dx)); + y += 128; + e = ~(y & 0xFF); + y >>= 8; + e >>= 1; + o = y * p + ((_ssfn_g2ox(x) + 128) >> 8); + if (ctx->mode == SSFN_MODE_CMAP) e = (e >> 4) | 0xF0; + if (e > pix[o]) pix[o] = e; + } + } + } +} + +/* parse a glyph */ +ssfn_private void _ssfn_g(ssfn_t *ctx, uint8_t *rg, int render) { + int i, j, nf, m, n, o, ox, oy, ol, t, x, y, a, b, c, d, w, h, s; + uint8_t *raw, *ra, *re, *pix = ctx->ret->data; + + ctx->lx = ctx->ly = ctx->mx = ctx->my = -1; + ol = (ctx->f->quality < 5 && ctx->f->characters_offs[ctx->variant] < 65536) + ? 4 + : ((ctx->f->characters_offs[ctx->variant] < 1048576) ? 5 : 6); + s = 16 - ctx->g; + nf = rg[0]; + rg += 10; + + for (h = 0; nf-- && !ctx->err; rg += ol) { + switch (ol) { + case 4: + o = ((rg[1] << 8) | rg[0]); + ox = rg[2]; + oy = rg[3]; + break; + case 5: + o = (((rg[2] & 0xF) << 16) | (rg[1] << 8) | rg[0]); + ox = (((rg[2] >> 4) & 3) << 8) | rg[3]; + oy = (((rg[2] >> 6) & 3) << 8) | rg[4]; + break; + default: + o = (((rg[3] & 0xF) << 24) | (rg[2] << 16) | (rg[1] << 8) | rg[0]); + ox = ((rg[3] & 0xF) << 8) | rg[4]; + oy = (((rg[3] >> 4) & 0xF) << 8) | rg[5]; + break; + } + ox <<= s; + oy <<= s; + raw = (uint8_t *)ctx->f + o; + if (raw[0] & 0x80) { + t = (raw[0] & 0x60) >> 5; + if (!render && t != SSFN_FRAG_HINTING) break; + switch (t) { + case SSFN_FRAG_LBITMAP: + x = ((((raw[0] >> 2) & 3) << 8) + raw[1]) + 1; + y = (((raw[0] & 3) << 8) | raw[2]) + 1; + raw += 3; + goto bitmap; + + case SSFN_FRAG_BITMAP: + x = (raw[0] & 0x1F) + 1; + y = raw[1] + 1; + raw += 2; + bitmap: + if (ctx->mode == SSFN_MODE_OUTLINE) { + x <<= 3; + outline: + ctx->lx = ctx->ly = -1; + x <<= s; + y <<= s; + if (ctx->style & 0x200) { + a = (((4096 << 4) - (oy)) >> (3)); + b = (((4096 << 4) - (oy + y)) >> (3)); + if (ctx->ix > ox + a) ctx->ix = ox + a; + } else + a = b = 0; + if (ctx->np) _ssfn_l(ctx, -1, -1, 0); + _ssfn_l(ctx, ox + a, oy, 0); + _ssfn_l(ctx, ox + x + a, oy, 0); + _ssfn_l(ctx, ox + x + b, oy + y, 0); + _ssfn_l(ctx, ox + b, oy + y, 0); + _ssfn_l(ctx, ox + a, oy, 0); + } else { + a = x << 3; + b = y << s; + c = _ssfn_g2i(oy); + n = _ssfn_g2i(ox); + w = _ssfn_g2i(x << (3 + s)); + h = _ssfn_g2i(b); + if (c + h >= ctx->ret->h) c = ctx->ret->h - h; /* due to rounding */ + c = t = c * ctx->ret->pitch; + for (j = 0; j < h; j++) { + o = (((j << 8) * (y << 8) / (h << 8)) >> 8) * x; + for (i = 0; i < w; i++) { + m = ((i << 8) * (a << 8) / (w << 8)) >> 8; + if (raw[o + (m >> 3)] & (1 << (m & 7))) { + d = n + + ((ctx->style & 0x200) ? _ssfn_igi(oy + (j << s) + 127) + : 0) + + i; + switch (ctx->mode) { + case SSFN_MODE_BITMAP: + pix[c + (d >> 3)] |= 1 << (d & 7); + d++; + if ((ctx->style & 0x100) && (d >> 3) < ctx->ret->pitch) { + pix[c + (d >> 3)] |= 1 << (d & 7); + d++; + if (ctx->size > 127 && (d >> 3) < ctx->ret->pitch) { + pix[c + (d >> 3)] |= 1 << (d & 7); + } + } + break; + case SSFN_MODE_CMAP: + case SSFN_MODE_ALPHA: + pix[c + (d++)] = 0xFF; + if ((ctx->style & 0x100) && d < ctx->ret->pitch) { + pix[c + (d++)] = 0xFF; + if (ctx->size > 127 && d < ctx->ret->pitch) { + pix[c + d] = 0xFF; + } + } + break; + } + if (d > ctx->ret->w) ctx->ret->w = d; + d = ox + _ssfn_i2g(d); + if ((ctx->style & 0x200) && ctx->ix > d) ctx->ix = d; + if (_ssfn_g2i(oy) + j == ctx->u) { + if (d < ctx->uix) { + ctx->uix = d; + } + if (d > ctx->uax) { + ctx->uax = d; + } + } + } + } + c += ctx->ret->pitch; + } + if (ctx->mode != SSFN_MODE_BITMAP && h > y && w > 1) { + m = (ctx->mode == SSFN_MODE_CMAP) ? 0xF0 : 0; + x = h / y; + for (a = x; a; a--) { + b = ctx->style & 0x100 ? (64 + (128 * a / x)) : (192 * a / x); + if (ctx->mode == SSFN_MODE_CMAP) b = (b >> 4) | 0xF0; + c = t + ctx->ret->pitch; + for (j = 1; j < h - 1; j++) { + for (i = 1; i < w - 1; i++) { + d = n + + ((ctx->style & 0x200) ? _ssfn_igi(oy + (j << s)) : 0) + + i; + if (pix[c + d] == m && + (pix[c + d - ctx->ret->pitch] > b || + pix[c + d + ctx->ret->pitch] > b) && + (pix[c + d - 1] > b || pix[c + d + 1] > b)) + pix[c + d] = b; + } + c += ctx->ret->pitch; + } + } + } + } + h = 0; + break; + + case SSFN_FRAG_PIXMAP: + x = (((raw[0] & 12) << 6) | raw[1]) + 1; + y = (((raw[0] & 3) << 8) | raw[2]) + 1; + n = ((raw[4] << 8) | raw[3]) + 1; + raw += 5; + if (ctx->mode == SSFN_MODE_OUTLINE) goto outline; + if (raw[-5] & 0x10) { + /* todo: direct ARGB values in pixmap fragment */ + } + a = x * y; + if (a >= (ctx->nr[0] << 1)) { + ctx->nr[0] = (a + 1) >> 1; + ctx->r[0] = (uint16_t *)SSFN_realloc(ctx->r[0], (ctx->nr[0] << 1)); + if (!ctx->r[0]) { + ctx->err = SSFN_ERR_ALLOC; + return; + } + } + ctx->ret->cmap = (uint32_t *)((uint8_t *)ctx->f + ctx->f->size - 964); + for (re = raw + n, ra = (uint8_t *)ctx->r[0], i = 0; + i < a && raw < re;) { + c = (raw[0] & 0x7F) + 1; + if (raw[0] & 0x80) { + for (j = 0; j < c; j++) ra[i++] = raw[1]; + raw += 2; + } else { + raw++; + for (j = 0; j < c; j++) ra[i++] = *raw++; + } + } + b = y << s; + c = _ssfn_g2i(oy); + n = _ssfn_g2i(ox); + w = _ssfn_g2i(x << s); + h = _ssfn_g2i(b); + if (c + h >= ctx->ret->h) c = ctx->ret->h - h; /* due to rounding */ + c = t = c * ctx->ret->pitch; + for (j = 0; j < h; j++) { + o = (((j << 8) * (y << 8) / (h << 8)) >> 8) * x; + for (i = 0; i < w; i++) { + m = ((i << 8) * (x << 8) / (w << 8)) >> 8; + if (ra[o + m] < 0xF0) { + d = n + + ((ctx->style & 0x200) ? _ssfn_igi(oy + (j << s) + 127) + : 0) + + i; + re = (uint8_t *)&ctx->ret->cmap[ra[o + m]]; + a = (re[0] + re[1] + re[2] + 255) >> 2; + switch (ctx->mode) { + case SSFN_MODE_BITMAP: + if (a > 127) pix[c + (d >> 3)] |= 1 << (d & 7); + break; + case SSFN_MODE_CMAP: + pix[c + d] = ra[o + m]; + break; + case SSFN_MODE_ALPHA: + a >>= 1; + a = ~a; + pix[c + d] = a; + break; + } + if (d > ctx->ret->w) ctx->ret->w = d; + } + } + c += ctx->ret->pitch; + } + h = 0; + break; + + case SSFN_FRAG_HINTING: + if (raw[0] & 0x10) { + n = ((raw[0] & 0xF) << 8) | raw[1]; + raw += 2; + } else { + n = raw[0] & 0xF; + raw++; + } + if (render || !ox) { + raw += n << (ctx->f->features & SSFN_FEAT_HBIGCRD ? 1 : 0); + continue; + } + y = 4096; + x = ((ox >> s) - 1) << (s - 4); + ctx->h[y++] = x; + for (n++; n-- && x < 4096;) { + x = raw[0]; + raw++; + if (ctx->f->features & SSFN_FEAT_HBIGCRD) { + x |= (raw[0] << 8); + raw++; + } + x <<= (s - 4); + ctx->h[y++] = x; + } + if (y < 4096) ctx->h[y++] = 65535; + h = 1; + break; + } + } else { + if (!render && h) break; + if (raw[0] & 0x40) { + n = ((raw[0] & 0x3F) << 8) | raw[1]; + raw += 2; + } else { + n = raw[0] & 0x3F; + raw++; + } + if (ctx->f->quality < 5) { + x = raw[0]; + y = raw[1]; + raw += 2; + } else { + x = ((raw[0] & 3) << 8) | raw[1]; + y = ((raw[0] & 0x30) << 4) | raw[2]; + raw += 3; + } + x <<= s; + y <<= s; + y += oy; + x += ox + (ctx->style & 0x200 ? _ssfn_igg(y) : 0); + if (render) { + if (ctx->np) { + _ssfn_l(ctx, ctx->mx, ctx->my, 0); + _ssfn_l(ctx, -1, -1, 0); + } + _ssfn_l(ctx, x, y, 0); + } + ctx->lx = ctx->mx = x; + ctx->ly = ctx->my = y; + for (n++; n--;) { + t = ctx->g < 8 ? (raw[0] >> 7) | ((raw[1] >> 6) & 2) : raw[0] & 3; + x = y = a = b = c = d = j = 0; + switch (ctx->g) { + case 4: + case 5: + case 6: + case 7: + x = raw[0] & 0x7F; + y = raw[1] & 0x7F; + switch (t) { + case 0: + raw += raw[0] & 4 ? 5 : 2; + break; + case 1: + raw += 2; + break; + case 2: + a = raw[2] & 0x7F; + b = raw[3] & 0x7F; + raw += 4; + break; + case 3: + a = raw[2] & 0x7F; + b = raw[3] & 0x7F; + c = raw[4] & 0x7F; + d = raw[5] & 0x7F; + raw += 6; + break; + } + break; + + case 8: + x = raw[1]; + y = raw[2]; + switch (t) { + case 0: + raw += raw[0] & 4 ? 5 : 2; + break; + case 1: + raw += 3; + break; + case 2: + a = raw[3]; + b = raw[4]; + raw += 5; + break; + case 3: + a = raw[3]; + b = raw[4]; + c = raw[5]; + d = raw[6]; + raw += 7; + break; + } + break; + + case 9: + x = ((raw[0] & 4) << 6) | raw[1]; + y = ((raw[0] & 8) << 5) | raw[2]; + switch (t) { + case 0: + raw += raw[0] & 4 ? 5 : 2; + break; + case 1: + raw += 3; + break; + case 2: + a = ((raw[0] & 16) << 4) | raw[3]; + b = ((raw[0] & 32) << 3) | raw[4]; + raw += 5; + break; + case 3: + a = ((raw[0] & 16) << 4) | raw[3]; + b = ((raw[0] & 32) << 3) | raw[4]; + c = ((raw[0] & 64) << 2) | raw[5]; + d = ((raw[0] & 128) << 1) | raw[6]; + raw += 7; + break; + } + break; + + default: + x = ((raw[0] & 12) << 6) | raw[1]; + y = ((raw[0] & 48) << 4) | raw[2]; + switch (t) { + case 0: + raw += raw[0] & 4 ? 5 : 2; + break; + case 1: + raw += 3; + break; + case 2: + a = ((raw[3] & 3) << 8) | raw[4]; + b = ((raw[3] & 12) << 6) | raw[5]; + raw += 6; + break; + case 3: + a = ((raw[3] & 3) << 8) | raw[4]; + b = ((raw[3] & 12) << 6) | raw[5]; + c = ((raw[3] & 48) << 4) | raw[6]; + d = ((raw[3] & 192) << 2) | raw[7]; + raw += 8; + break; + } + break; + } + x <<= s; + y <<= s; + a <<= s; + b <<= s; + c <<= s; + d <<= s; + x += ox; + y += oy; + a += ox; + b += oy; + c += ox; + d += oy; + if (ctx->style & 0x200) { + x += _ssfn_igg(y); + a += _ssfn_igg(b); + c += _ssfn_igg(d); + } + if (render) { + switch (t) { + case 0: /* this v1.0 renderer does not support colored contours */ + break; + case 1: + _ssfn_l(ctx, x, y, 0); + break; + case 2: + _ssfn_b(ctx, ctx->lx, ctx->ly, ((a - ctx->lx) >> 1) + ctx->lx, + ((b - ctx->ly) >> 1) + ctx->ly, ((x - a) >> 1) + a, + ((y - b) >> 1) + b, x, y, 0); + break; + case 3: + _ssfn_b(ctx, ctx->lx, ctx->ly, a, b, c, d, x, y, 0); + break; + } + } else if (t == 1 && x >= 0 && y >= 0) { + a = ((ctx->lx < x) ? x - ctx->lx : ctx->lx - x) >> 4; + b = ((ctx->ly < y) ? y - ctx->ly : ctx->ly - y) >> 4; + c = (ctx->lx + x) >> 5; + if (a < 2) + ctx->h[4096 + (!ctx->h[4096 + c] && c && ctx->h[4096 + c - 1] + ? c - 1 + : c)] += b; + } + ctx->lx = x; + ctx->ly = y; + } + } + } + + if (!render && !h) { + for (j = m = x = y = 0; j < 4096; j++) { + if (ctx->h[4096 + j] >= 4096 / SSFN_HINTING_THRESHOLD) { + if (!j) + m++; + else { + ctx->h[4096 + m++] = j - x; + x = j; + } + } + } + if (m < 4096) ctx->h[4096 + m] = 65535; + } +} + +/*** public API implementation ***/ + +/** + * Decode a color map pixel into ARGB + * + * @param p uint8_t color map pixel + * @param c uint32_t* pointer to color map + * @param fg uint32_t foreground color + * @return uint32_t ARGB pixel + */ +#define SSFN_CMAP_TO_ARGB(p, c, fg) \ + (p >= 0xF0 ? (uint32_t)((p << 28) | ((p & 0xF) << 24) | fg) : c[p]) + +/** + * Load a font or font collection into renderer context + * + * @param ctx rendering context + * @param font SSFN font or font collection in memory + * @return error code + */ +int ssfn_load(ssfn_t *ctx, const ssfn_font_t *font) { + ssfn_font_t *ptr, *end; + + if (!ctx || !font) { + if (ctx) ctx->err = SSFN_ERR_INVINP; + return SSFN_ERR_INVINP; + } + ctx->err = SSFN_OK; + if (!SSFN_memcmp(font->magic, SSFN_COLLECTION, 4)) { + end = (ssfn_font_t *)((uint8_t *)font + font->size); + for (ptr = (ssfn_font_t *)((uint8_t *)font + 8); ptr < end && !ctx->err; + ptr = (ssfn_font_t *)((uint8_t *)ptr + ptr->size)) + ssfn_load(ctx, ptr); + } else { + if (SSFN_memcmp(font->magic, SSFN_MAGIC, 4) || + SSFN_memcmp((uint8_t *)font + font->size - 4, SSFN_ENDMAGIC, 4) || + font->family > SSFN_FAMILY_HAND || font->fragments_offs > font->size || + font->characters_offs[0] > font->size || + font->kerning_offs > font->size || + font->fragments_offs >= font->characters_offs[0] || font->quality > 8) { + ctx->err = SSFN_ERR_BADFILE; + } else { + ctx->len[font->family]++; + ctx->fnt[font->family] = (const ssfn_font_t **)SSFN_realloc( + ctx->fnt[font->family], ctx->len[font->family] * sizeof(void *)); + if (!ctx->fnt[font->family]) + ctx->err = SSFN_ERR_ALLOC; + else + ctx->fnt[font->family][ctx->len[font->family] - 1] = font; + } + } + return ctx->err; +} + +/** + * Set up rendering parameters + * + * @param ctx rendering context + * @param family one of SSFN_FAMILY_* + * @param name NULL or UTF-8 string if family is SSFN_FAMILY_BYNAME + * @param style OR'd values of SSFN_STYLE_* + * @param size how big glyph it should render, 8 - 255 + * @param mode rendering mode, one of SSFN_MODE_* + * @return error code + */ +int ssfn_select(ssfn_t *ctx, int family, char *name, int style, int size, + int mode) { + int i, j, l; + + if (!ctx) return SSFN_ERR_INVINP; + if ((style & ~0xCF)) return (ctx->err = SSFN_ERR_BADSTYLE); + if (size < 8 || size > 255) return (ctx->err = SSFN_ERR_BADSIZE); + if (mode > SSFN_MODE_CMAP) return (ctx->err = SSFN_ERR_BADMODE); + + if (family == SSFN_FAMILY_BYNAME) { + if (!name || !name[0]) { + invinp: + return (ctx->err = SSFN_ERR_INVINP); + } + for (l = 0; name[l]; l++); + for (i = 0; i < 5; i++) { + for (j = 0; j < ctx->len[i]; j++) { + if (!SSFN_memcmp( + name, (uint8_t *)&ctx->fnt[i][j]->magic + sizeof(ssfn_font_t), + l)) { + ctx->s = ctx->fnt[i][j]; + goto familyfound; + } + } + } + noface: + return (ctx->err = SSFN_ERR_NOFACE); + } else { + if (family != SSFN_FAMILY_ANY) { + if (family > SSFN_FAMILY_HAND) goto invinp; + if (!ctx->len[family]) goto noface; + } + ctx->s = NULL; + } +familyfound: + ctx->np = ctx->mp = 0; + if (ctx->p) { + SSFN_free(ctx->p); + ctx->p = NULL; + } + ctx->f = NULL; + ctx->family = family; + ctx->style = style; + ctx->size = size; + ctx->mode = mode; + ctx->variant = 0; + return (ctx->err = SSFN_OK); +} + +/** + * Set glyph variant + * + * @param ctx rendering context + * @param variant one of SSFN_VARIANT_* defines + * @return error code + */ +int ssfn_variant(ssfn_t *ctx, int variant) { + if (!ctx) return SSFN_ERR_INVINP; + if (variant < 0 || variant > SSFN_NUMVARIANTS - 1) + return (ctx->err = SSFN_ERR_INVINP); + ctx->variant = variant; + return (ctx->err = SSFN_OK); +} + +/** + * Glyph renderer + * + * @param ctx rendering context + * @param unicode character to render + * @return newly allocated rasterized glyph + */ +ssfn_glyph_t *ssfn_render(ssfn_t *ctx, uint32_t unicode) { + ssfn_font_t **fl; + int i, j, s, h, p, m, n, bt, bl; + int l, k, x, y; + uint8_t *rg = NULL, c, d; + + if (!ctx) return NULL; + if (ctx->size < 8) { + ctx->err = SSFN_ERR_NOFACE; + return NULL; + } + ctx->err = SSFN_OK; + if (ctx->s) { + ctx->f = (ssfn_font_t *)ctx->s; + rg = _ssfn_c(ctx->f, unicode, ctx->variant); + if (!rg) rg = _ssfn_c(ctx->f, unicode, 0); + } else { + p = ctx->family; + k = ctx->variant; + again: + if (p == SSFN_FAMILY_ANY) { + n = 0; + m = 4; + } else + n = m = p; + for (; n <= m; n++) { + fl = (ssfn_font_t **)ctx->fnt[n]; + if (ctx->style & 3) { + /* check if we have a specific ctx->f for the requested style */ + for (i = 0; i < ctx->len[n]; i++) + if ((fl[i]->style & 3) == (ctx->style & 3) && + (rg = _ssfn_c(fl[i], unicode, k))) { + ctx->f = fl[i]; + break; + } + /* if bold italic was requested, check if we have at least bold or + * italic */ + if (!rg && (ctx->style & 3) == 3) + for (i = 0; i < ctx->len[n]; i++) + if ((fl[i]->style & 3) && (rg = _ssfn_c(fl[i], unicode, k))) { + ctx->f = fl[i]; + break; + } + } + /* last resort, get the first ctx->f which has a glyph for this unicode, + * no matter style */ + if (!rg) { + for (i = 0; i < ctx->len[n]; i++) + if ((rg = _ssfn_c(fl[i], unicode, k))) { + ctx->f = fl[i]; + break; + } + } + } + /* if glyph still not found, try any family group, finally only default + * variant */ + if (!rg) { + if (p != SSFN_FAMILY_ANY) { + p = SSFN_FAMILY_ANY; + goto again; + } + if (k) { + k = 0; + goto again; + } + } + } + if (!rg) { + ctx->err = ctx->variant ? SSFN_ERR_NOVARIANT : SSFN_ERR_NOGLYPH; + return NULL; + } + + ctx->style &= 0xFF; + if ((ctx->style & 1) && !(ctx->f->style & 1)) ctx->style |= 0x100; + if ((ctx->style & 2) && !(ctx->f->style & 2)) ctx->style |= 0x200; + if (ctx->f->family == SSFN_FAMILY_MONOSPACE) + ctx->style |= SSFN_STYLE_ABS_SIZE; + + ctx->g = 4 + ctx->f->quality; + ctx->np = 0; + + s = 16 - ctx->g; + if (ctx->mode == SSFN_MODE_OUTLINE) { + h = ctx->size; + p = 0; + } else { + if (!(((rg[2] & 0x0F) << 8) | rg[6]) || ctx->style & SSFN_STYLE_ABS_SIZE) + h = ctx->size; + else + h = (4096 << 4) * ctx->size / + ((ctx->f->baseline - ctx->f->bbox_top) << s); + p = (h + (ctx->style & 0x100 ? 2 : 0) + (ctx->style & 0x200 ? h >> 2 : 0)); + if (p > 255) { + p = h = 255; + if (ctx->style & 0x100) h -= 2; + if (ctx->style & 0x200) h = h * 4 / 5; + } + if (ctx->mode == SSFN_MODE_BITMAP) p = (p + 7) >> 3; + } + ctx->m = h; + + if (!ctx->h) + ctx->h = (uint16_t *)SSFN_realloc(NULL, 4096 * 2 * sizeof(uint16_t)); + if (!ctx->h) goto erralloc; + + if (!(ctx->style & SSFN_STYLE_NOHINTING)) { + SSFN_memset(&ctx->h[4096], 0, 4096 * sizeof(uint16_t)); + _ssfn_g(ctx, rg, 0); + } else + ctx->h[4096] = 65535; + + ctx->h[0] = 0; + for (i = j = k = x = y = m = 0; i < 4096 && j < 4095; i++) { + y = ctx->h[4096 + i] == 65535 ? 4095 - j : ctx->h[4096 + i]; + j += y; + if (j == x) { + ctx->h[j] = (((j << 4) * h + (1 << 15)) >> 16) << 8; + if (!y) j++; + } else { + y = _ssfn_g2o(y << 4); + m += y; + if ((i & 1) || y < 256) { + continue; + } + m &= ~0xFF; + n = ctx->h[x]; + for (l = 0; l + x <= j; l++) ctx->h[x + l] = n + ((m - n) * l / (j - x)); + } + x = j; + } + ctx->uix = _ssfn_g2ixc((((rg[2] & 0x0F) << 8) | rg[6]) << s); + ctx->uax = _ssfn_g2iyc((((rg[2] & 0xF0) << 4) | rg[7]) << s); + if (ctx->mode == SSFN_MODE_NONE) return NULL; + + bl = ((((rg[3] & 0x0F) << 8) | rg[8])) << s; + bt = ((((rg[3] & 0xF0) << 4) | rg[9])) << s; + i = p * h; + ctx->ret = (ssfn_glyph_t *)SSFN_realloc(NULL, i + 8 + sizeof(uint8_t *)); + if (!ctx->ret) { + erralloc: + ctx->err = SSFN_ERR_ALLOC; + return NULL; + } + SSFN_memset(&ctx->ret->data, ctx->mode == SSFN_MODE_CMAP ? 0xF0 : 0, i); + ctx->ret->cmap = NULL; + ctx->ret->mode = ctx->mode; + ctx->ret->pitch = p; + ctx->ret->w = 0; + ctx->ret->h = h; + ctx->ret->baseline = + (((ctx->f->baseline << s) - bt) * h + (1 << 16) - 1) >> 16; + ctx->u = ctx->ret->baseline + + ((((ctx->f->underline - ctx->f->baseline) << s) * h) >> 16); + + ctx->ret->adv_x = ctx->uix; + ctx->ret->adv_y = ctx->uax; + + ctx->ix = ctx->uix = 4096 << 4; + ctx->uax = 0; + _ssfn_g(ctx, rg, 1); + + if (!ctx->err) { + if (!(ctx->style & 0x200) || ctx->ix == 4096 << 4) ctx->ix = 0; + if (ctx->mode == SSFN_MODE_OUTLINE) { + if (ctx->np > p * h) { + ctx->ret = (ssfn_glyph_t *)SSFN_realloc( + ctx->ret, ctx->np + 8 + sizeof(uint8_t *)); + if (!ctx->ret) goto erralloc; + } + for (s = i = 0; i < ctx->np; i += 2) { + c = ctx->p[i + 0] == 0xffff ? 0xff : _ssfn_g2ix(ctx->p[i + 0] + bl); + d = ctx->p[i + 1] == 0xffff ? 0xff : _ssfn_g2iy(ctx->p[i + 1] + bt); + if (s < 2 || ctx->ret->data[s - 2] != c || ctx->ret->data[s - 1] != d) { + ctx->ret->data[s++] = c; + ctx->ret->data[s++] = d; + } + } + ctx->ret->pitch = s; + ctx->ret = + (ssfn_glyph_t *)SSFN_realloc(ctx->ret, s + 8 + sizeof(uint8_t *)); + if (!ctx->ret) goto erralloc; + } else { + _ssfn_r(ctx); + if (ctx->mode != SSFN_MODE_BITMAP) _ssfn_a(ctx); + if (ctx->style & SSFN_STYLE_STHROUGH) { + if (ctx->ret->w < ctx->ret->adv_x) ctx->ret->w = ctx->ret->adv_x; + SSFN_memset( + &ctx->ret->data[(ctx->ret->baseline - (ctx->size >> 2)) * p], 0xFF, + (ctx->size / 64 + 2) * p); + } + if (ctx->style & SSFN_STYLE_UNDERLINE) { + if (ctx->ret->w < ctx->ret->adv_x) ctx->ret->w = ctx->ret->adv_x; + if (ctx->uax > ctx->ix) ctx->uax = _ssfn_g2i(ctx->uax - ctx->ix); + if (ctx->uix != 4096 << 4) + ctx->uix = _ssfn_g2i(ctx->uix - ctx->ix); + else + ctx->uix = ctx->ret->w + 3; + m = ctx->u * p; + n = ctx->size > 127 ? 2 : 1; + while (n--) { + if (ctx->uix > 3) { + j = ctx->uix - 3; + if (ctx->mode == SSFN_MODE_BITMAP) + for (i = 0; i < j; i++) + ctx->ret->data[m + (i >> 3)] |= 1 << (i & 7); + else + SSFN_memset(&ctx->ret->data[m], 0xFF, j); + } + if (ctx->uax) { + j = ctx->uax + 2; + if (ctx->mode == SSFN_MODE_BITMAP) + for (i = j; i < ctx->ret->w; i++) + ctx->ret->data[m + (i >> 3)] |= 1 << (i & 7); + else + SSFN_memset(&ctx->ret->data[m + j], 0xFF, p - j); + } + m += p; + } + } + } + if (ctx->ret->adv_y) ctx->ret->baseline = ctx->ret->w >> 1; + } else if (ctx->ret) { + SSFN_free(ctx->ret); + ctx->ret = NULL; + } + return ctx->ret; +} + +/** + * Return kerning information + * + * @param ctx rendering context + * @param unicode current unicode character + * @param nextunicode next unicode character + * @param *x pointer to an integer + * @param *y pointer to an integer + * @return error code, and relative offsets adjusted to *x, *y + */ +int ssfn_kern(ssfn_t *ctx, uint32_t unicode, uint32_t nextunicode, int *x, + int *y) { + const ssfn_font_t *font; + uint32_t i, j, k, l, a, b, c; + uint8_t *ptr; + int m; + + if (!ctx || !x || !y) return SSFN_ERR_INVINP; + if (!ctx->f && !ctx->s) return (ctx->err = SSFN_ERR_NOFACE); + font = ctx->s ? ctx->s : ctx->f; + if (unicode && nextunicode && font->kerning_offs) { + ptr = (uint8_t *)font + font->kerning_offs; + a = font->features & SSFN_FEAT_KBIGLKP ? 4 : 3; + b = font->features & SSFN_FEAT_KBIGCHR; + c = font->features & SSFN_FEAT_KBIGCRD; + for (i = 0; i < 0x110000; i++) { + if (ptr[0] & 0x80) { + if (ptr[0] & 0x40) { + i += ptr[1] | ((ptr[0] & 0x3f) << 8); + ptr += 2; + } else { + i += ptr[0] & 0x3f; + ptr++; + } + } else { + m = ptr[0] & 0x7F; + if (unicode >= i && unicode <= i + m) { + ptr = (uint8_t *)font + font->kerning_offs + + ((a == 4 ? (ptr[3] << 16) : 0) | (ptr[2] << 8) | ptr[1]); + if (ptr[0] & 0x80) { + k = ptr[1] | ((ptr[0] & 0x7f) << 8); + ptr += 2; + } else { + k = ptr[0] & 0x7F; + ptr++; + } + for (m = 0, a = SSFN_ERR_NOGLYPH, i = j = 0; + i <= k && j <= nextunicode; i++) { + if (b) { + j = ptr[0] | (ptr[1] << 8) | ((ptr[2] & 0x7F) << 16); + l = ptr[2] & 0x80; + ptr += 3; + } else { + j = ptr[0] | ((ptr[1] & 0x7F) << 8); + l = ptr[1] & 0x80; + ptr += 2; + } + if (c) { + m = (short)(ptr[0] | (ptr[1] << 8)); + ptr += 2; + } else { + m = (signed char)ptr[0]; + ptr++; + } + if (j == nextunicode) { + a = SSFN_OK; + m = (((m) << (16 - ctx->g)) * ctx->m + (1 << 16) - 1) >> 16; + if (l) + *y += m; + else + *x += m; + } + } + return (ctx->err = a); + } + ptr += a; + i += m; + } + } + } + return (ctx->err = SSFN_ERR_NOGLYPH); +} + +/** + * Returns the bounding box of the rendered text + * + * @param ctx rendering context + * @param *str string + * @param usekern use kerning when calculating size + * @param *w pointer to an integer, returned width + * @param *h pointer to an integer, returned height + * @return error code, and bounding box size in *w, *h + */ +int ssfn_bbox(ssfn_t *ctx, char *str, int usekern, int *w, int *h) { + char *s; + int u, v, m; + + if (!ctx) return SSFN_ERR_INVINP; + if (!str || !w || !h) return (ctx->err = SSFN_ERR_INVINP); + *w = *h = 0; + m = ctx->mode; + ctx->mode = SSFN_MODE_NONE; + ctx->m = 0; + for (s = str, u = ssfn_utf8(&s); u;) { + ssfn_render(ctx, u); + if (ctx->err == SSFN_OK) { + *w += ctx->uix; + *h += ctx->uax; + } + v = ssfn_utf8(&s); + if (usekern) ssfn_kern(ctx, u, v, w, h); + u = v; + } + if (!*w) *w = ctx->m; + if (!*h) *h = ctx->m; + ctx->mode = m; + return ctx->err; +} + +/** + * Returns how much memory a context consumes + * + * @param ctx rendering context + * @return total memory used by that context + */ +int ssfn_mem(ssfn_t *ctx) { + int i, ret = sizeof(ssfn_t); + + if (!ctx) return 0; + + for (i = 0; i < 5; i++) ret += ctx->len[i] * sizeof(ssfn_font_t *); + if (ctx->p) ret += ctx->mp * sizeof(uint16_t); + for (i = 0; i < 256; i++) + if (ctx->r[i]) ret += ctx->nr[i] * sizeof(uint16_t); + if (ctx->h) ret += 8192 * sizeof(uint16_t); + return ret; +} + +/** + * Free renderer context + * + * @param ctx rendering context + */ +void ssfn_free(ssfn_t *ctx) { + int i; + + if (!ctx) return; + + for (i = 0; i < 5; i++) + if (ctx->fnt[i]) SSFN_free(ctx->fnt[i]); + if (ctx->p) SSFN_free(ctx->p); + for (i = 0; i < 256; i++) + if (ctx->r[i]) SSFN_free(ctx->r[i]); + if (ctx->h) SSFN_free(ctx->h); + SSFN_memset(ctx, 0, sizeof(ssfn_t)); +} + +#endif + +/*** this function goes for both renderers ***/ +#if !defined(SSFN_NOIMPLEMENTATION) || defined(SSFN_CONSOLEBITMAP_PALETTE) || \ + defined(SSFN_CONSOLEBITMAP_HICOLOR) || \ + defined(SSFN_CONSOLEBITMAP_TRUECOLOR) +/** + * Decode an UTF-8 multibyte, advance string pointer and return UNICODE. Watch + * out, no input checks + * + * @param **s pointer to an UTF-8 string pointer + * @return unicode, and *s moved to next multibyte sequence + */ +uint32_t ssfn_utf8(char **s) { + uint32_t c = **s; + + if ((**s & 128) != 0) { + if (!(**s & 32)) { + c = ((**s & 0x1F) << 6) | (*(*s + 1) & 0x3F); + *s += 1; + } else if (!(**s & 16)) { + c = ((**s & 0xF) << 12) | ((*(*s + 1) & 0x3F) << 6) | (*(*s + 2) & 0x3F); + *s += 2; + } else if (!(**s & 8)) { + c = ((**s & 0x7) << 18) | ((*(*s + 1) & 0x3F) << 12) | + ((*(*s + 2) & 0x3F) << 6) | (*(*s + 3) & 0x3F); + *s += 3; + } else + c = 0; + } + *s += 1; + return c; +} +#endif + +#if defined(SSFN_CONSOLEBITMAP_PALETTE) || \ + defined(SSFN_CONSOLEBITMAP_HICOLOR) || \ + defined(SSFN_CONSOLEBITMAP_TRUECOLOR) +/*** special console bitmap font renderer (ca. 1k, no dependencies, no memory + * allocation and no error checking) ***/ + +/** + * public variables to configure the renderer + */ +ssfn_font_t *ssfn_font; /* font buffer */ +uint8_t *ssfn_dst_ptr; /* screen buffer */ +uint32_t ssfn_dst_pitch; /* screen dimensions */ +uint32_t ssfn_dst_w = 0; +uint32_t ssfn_dst_h = 0; +uint32_t ssfn_fg; /* colors in screen's native format */ +#ifdef SSFN_CONSOLEBITMAP_CLEARBG +uint32_t ssfn_bg; +#endif +uint32_t ssfn_x; /* coordinate to draw to */ +uint32_t ssfn_y; +uint32_t ssfn_adv_x; /* advance values */ +uint32_t ssfn_adv_y; + +/** + * Minimal OS kernel console renderer + * + * @param unicode character to render + * @return error code + */ +int ssfn_putc(uint32_t unicode) { + uint32_t i, j, a, b, m, p, t; + uint8_t *rg, *o, *g, *s, *r, y, n; +#ifdef SSFN_CONSOLEBITMAP_CLEARBG + uint8_t w; +#endif + + t = (ssfn_font->quality < 5 && ssfn_font->characters_offs[0] < 65536) + ? 4 + : (ssfn_font->characters_offs[0] < 1048576 ? 5 : 6); + rg = (uint8_t *)ssfn_font + ssfn_font->characters_offs[0]; + ssfn_adv_x = ssfn_adv_y = 0; + + for (j = i = 0; i < 0x110000; i++) { + if (rg[0] & 0x80) { + n = (rg[0] & 0x3f); + if (rg[0] & 0x40) { + i += rg[1] | (n << 8); + rg++; + } else { + i += n; + } + rg++; + } else { + if (i == unicode) { + y = rg[9]; +#ifdef SSFN_CONSOLEBITMAP_CLEARBG + w = rg[4]; + j = 0; + if (ssfn_dst_w && (ssfn_x + w >= ssfn_dst_w)) w = ssfn_dst_w - ssfn_x; + s = ssfn_dst_ptr + (ssfn_y)*ssfn_dst_pitch; +#ifdef SSFN_CONSOLEBITMAP_PALETTE + s += ssfn_x; +#else +#ifdef SSFN_CONSOLEBITMAP_HICOLOR + s += ssfn_x << 1; +#else + s += ssfn_x << 2; +#endif +#endif +#endif + if ((ssfn_dst_w && (ssfn_x > ssfn_dst_w)) || + (ssfn_dst_h && (ssfn_y + ssfn_font->bbox_bottom >= ssfn_dst_h))) + return SSFN_ERR_INVINP; + n = rg[0]; + ssfn_adv_x = rg[6]; + ssfn_adv_y = rg[7]; + rg += 10; + while (n--) { +#ifndef SSFN_CONSOLEBITMAP_CLEARBG + s = ssfn_dst_ptr + (ssfn_y + y + rg[t - 1]) * ssfn_dst_pitch; +#ifdef SSFN_CONSOLEBITMAP_PALETTE + s += ssfn_x; +#else +#ifdef SSFN_CONSOLEBITMAP_HICOLOR + s += ssfn_x << 1; +#else + s += ssfn_x << 2; +#endif +#endif +#endif + o = (uint8_t *)ssfn_font; + a = ((rg[1] << 8) | rg[0]); + switch (t) { + case 4: + o += a; + break; + case 5: + o += ((rg[2] & 0xF) << 16) | a; + break; + default: + o += ((rg[3] & 0xF) << 24) | (rg[2] << 16) | a; + break; + } + p = ((o[0] & 0xF) + 1); + a = p << 3; + b = o[1] + 1; + o += 2; + if (ssfn_dst_w && (ssfn_x + a >= ssfn_dst_w)) a = ssfn_dst_w - ssfn_x; +#ifdef SSFN_CONSOLEBITMAP_CLEARBG + for (; j < y + rg[t - 1]; j++, s += ssfn_dst_pitch) + for (r = s, i = 0; i < w; i++) { +#ifdef SSFN_CONSOLEBITMAP_PALETTE + *((uint8_t *)r) = (uint8_t)ssfn_bg; + r++; +#else +#ifdef SSFN_CONSOLEBITMAP_HICOLOR + *((uint16_t *)r) = (uint16_t)ssfn_bg; + r += 2; +#else + *((uint32_t *)r) = (uint32_t)ssfn_bg; + r += 4; +#endif +#endif + } + b += j; +#else + j = 0; +#endif + for (; j < b; j++, s += ssfn_dst_pitch, o += p) { + for (g = o, r = s, m = 1, i = 0; i < a; i++, m <<= 1) { + if (m > 0x80) { + g++; + m = 1; + } +#ifndef SSFN_CONSOLEBITMAP_CLEARBG + if (*g & m) +#endif +#ifdef SSFN_CONSOLEBITMAP_PALETTE + *((uint8_t *)r) = (uint8_t)( +#ifdef SSFN_CONSOLEBITMAP_CLEARBG + *g & m ? ssfn_fg : ssfn_bg +#else + ssfn_bg +#endif + ); + r++; +#else +#ifdef SSFN_CONSOLEBITMAP_HICOLOR + *((uint16_t *)r) = (uint16_t)( +#ifdef SSFN_CONSOLEBITMAP_CLEARBG + *g & m ? ssfn_fg : ssfn_bg +#else + ssfn_fg +#endif + ); + r += 2; +#else + *((uint32_t *)r) = (uint32_t)( +#ifdef SSFN_CONSOLEBITMAP_CLEARBG + *g & m ? ssfn_fg : ssfn_bg +#else + ssfn_fg +#endif + ); + r += 4; +#endif +#endif + } + } + rg += t; + } +#ifdef SSFN_CONSOLEBITMAP_CLEARBG + for (; j <= ssfn_font->bbox_bottom; j++, s += ssfn_dst_pitch) + for (r = s, i = 0; i < w; i++) { +#ifdef SSFN_CONSOLEBITMAP_PALETTE + *((uint8_t *)r) = (uint8_t)ssfn_bg; + r++; +#else +#ifdef SSFN_CONSOLEBITMAP_HICOLOR + *((uint16_t *)r) = (uint16_t)ssfn_bg; + r += 2; +#else + *((uint32_t *)r) = (uint32_t)ssfn_bg; + r += 4; +#endif +#endif + } +#endif + ssfn_x += ssfn_adv_x; + ssfn_y += ssfn_adv_y; + return SSFN_OK; + } + rg += rg[0] * t + 10; + j++; + } + } + return SSFN_ERR_NOGLYPH; +} +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/gui/include/gui/styles.h b/gui/include/gui/styles.h index 5b0dbf5cbb..31d3a06b41 100644 --- a/gui/include/gui/styles.h +++ b/gui/include/gui/styles.h @@ -34,7 +34,7 @@ #include #include "model/ocpn_types.h" -//#include "tinyxml.h" +// #include "tinyxml.h" #include "color_types.h" enum StyleToolIconTypes { @@ -114,7 +114,7 @@ class Style { wxBitmap GetIcon(const wxString& name, int width = -1, int height = -1, bool bforceReload = false); wxBitmap GetIconScaled(const wxString& name, double scaleFactor, - bool bforceReload = false ); + bool bforceReload = false); wxBitmap GetToolIcon(const wxString& toolname, int iconType = TOOLICON_NORMAL, bool rollover = false, int width = -1, int height = -1); @@ -240,4 +240,4 @@ class StyleManager { } // namespace ocpnStyle -#endif // _STYLES_H__ +#endif // _STYLES_H__ diff --git a/gui/include/gui/tcmgr.h b/gui/include/gui/tcmgr.h index 02b09d2652..064b4fc41d 100644 --- a/gui/include/gui/tcmgr.h +++ b/gui/include/gui/tcmgr.h @@ -68,7 +68,7 @@ * spacing is greater than this value (in seconds). */ #define TIDE_TIME_STEP (TIDE_TIME_PREC) -#define TIDE_BAD_TIME ((time_t)-1) +#define TIDE_BAD_TIME ((time_t) - 1) //---------------------------------------------------------------------------- // Reference Station Data @@ -348,7 +348,7 @@ typedef struct { #define AMPLITUDE_EPSILON 0.00005 /* Rounding function. */ -#define NINT(a) ((a) < 0.0 ? (NV_INT32)((a)-0.5) : (NV_INT32)((a) + 0.5)) +#define NINT(a) ((a) < 0.0 ? (NV_INT32)((a) - 0.5) : (NV_INT32)((a) + 0.5)) /* Public function prototypes. */ @@ -598,7 +598,7 @@ NV_BOOL check_simple(TIDE_RECORD rec); #ifndef __TIDE_HEADER__ #define __TIDE_HEADER__ -//#include "tcd.h" +// #include "tcd.h" typedef struct { const NV_CHAR *keyphrase; diff --git a/gui/include/gui/thumbwin.h b/gui/include/gui/thumbwin.h index e4cf9602fa..8e475effca 100644 --- a/gui/include/gui/thumbwin.h +++ b/gui/include/gui/thumbwin.h @@ -38,7 +38,7 @@ #include #endif // precompiled headers -//#include "ocpn_pixel.h" +// #include "ocpn_pixel.h" //---------------------------------------------------------------------------- // constants @@ -50,9 +50,9 @@ class ChartBase; -//---------------------------------------------------------------------------- -// ThumbWin -//---------------------------------------------------------------------------- +/** + * Window for displaying chart thumbnails. + */ class ThumbWin : public wxWindow { public: ThumbWin(); diff --git a/gui/include/gui/toolbar.h b/gui/include/gui/toolbar.h index b22f566f8e..ad07f7d8e1 100644 --- a/gui/include/gui/toolbar.h +++ b/gui/include/gui/toolbar.h @@ -34,6 +34,9 @@ class ocpnFloatingToolbarDialog; +/** + * Container for toolbar item properties. + */ class ToolbarItemContainer { public: ToolbarItemContainer(); @@ -93,11 +96,9 @@ enum { class ToolTipWin; class ocpnToolBarTool; -// ---------------------------------------------------------------------------- -// ocpnToolBarSimple is a generic toolbar implementation in pure wxWidgets -// Adapted from wxToolBarSimple( deprecated ) -// ---------------------------------------------------------------------------- - +/** + * Generic toolbar implementation in pure wxWidgets adapted from wxToolBarSimple (deprecated). + */ class ocpnToolBarSimple : public wxEvtHandler { public: // ctors and dtor @@ -106,10 +107,8 @@ class ocpnToolBarSimple : public wxEvtHandler { ocpnToolBarSimple(ocpnFloatingToolbarDialog *parent, wxWindowID winid, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxNO_BORDER, - int orient = wxTB_HORIZONTAL) + long style = wxNO_BORDER, int orient = wxTB_HORIZONTAL) : m_one_shot(500) { - Init(); Create(parent, winid, pos, size, style, orient); @@ -117,8 +116,7 @@ class ocpnToolBarSimple : public wxEvtHandler { bool Create(ocpnFloatingToolbarDialog *parent, wxWindowID winid, const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxNO_BORDER, + const wxSize &size = wxDefaultSize, long style = wxNO_BORDER, int orient = wxTB_HORIZONTAL); virtual ~ocpnToolBarSimple(); @@ -126,8 +124,8 @@ class ocpnToolBarSimple : public wxEvtHandler { virtual void SetToggledBackgroundColour(wxColour c) { m_toggle_bg_color = c; }; - virtual void SetBackgroundColour(wxColour c) {m_background_color = c; } - virtual wxColour GetBackgroundColour() { return m_background_color;} + virtual void SetBackgroundColour(wxColour c) { m_background_color = c; } + virtual wxColour GetBackgroundColour() { return m_background_color; } virtual void SetColorScheme(ColorScheme cs); // event handlers @@ -166,8 +164,8 @@ class ocpnToolBarSimple : public wxEvtHandler { virtual void DoPluginToolUp(); - bool IsDirty(){ return m_dirty; } - void SetDirty( bool value ){ m_dirty = value; } + bool IsDirty() { return m_dirty; } + void SetDirty(bool value) { m_dirty = value; } size_t GetToolsCount() const { return m_tools.GetCount(); } void SetToolShowCount(int count) { m_nShowTools = count; } @@ -184,7 +182,7 @@ class ocpnToolBarSimple : public wxEvtHandler { m_tbenableRolloverBitmaps = enable; } - wxBitmap &GetBitmap(){ return m_bitmap; } + wxBitmap &GetBitmap() { return m_bitmap; } // get the control with the given id or return NULL virtual wxControl *FindControl(int toolid); @@ -285,7 +283,7 @@ class ocpnToolBarSimple : public wxEvtHandler { // the list of all our tools wxToolBarToolsList m_tools; - ocpnFloatingToolbarDialog * m_parentContainer; + ocpnFloatingToolbarDialog *m_parentContainer; // the maximum number of toolbar rows/columns int m_maxRows; @@ -369,6 +367,7 @@ class ocpnToolBarSimple : public wxEvtHandler { bool m_tbenableRolloverBitmaps; wxBitmap m_bitmap; + private: DECLARE_EVENT_TABLE() }; @@ -380,8 +379,10 @@ class ocpnToolBarSimple : public wxEvtHandler { #define FADE_TIMER 2 #define DESTROY_TIMER 3 -class ocpnFloatingToolbarDialog : public wxEvtHandler{ - +/** + * Floating toolbar dialog for OpenCPN. + */ +class ocpnFloatingToolbarDialog : public wxEvtHandler { public: ocpnFloatingToolbarDialog(wxWindow *parent, wxPoint position, long orient, float size_factor); @@ -537,6 +538,7 @@ class ocpnFloatingToolbarDialog : public wxEvtHandler{ int m_auxOffsetY; unsigned int m_texture; + wxImage m_toolbar_image; }; //--------------------------------------------------------------------------- @@ -560,8 +562,8 @@ class ToolbarChoicesDialog : public wxDialog { public: /// Constructors ToolbarChoicesDialog(); - ToolbarChoicesDialog(wxWindow *parent, ocpnFloatingToolbarDialog *sponsor, wxWindowID id = -1, - const wxString &caption = _T(""), + ToolbarChoicesDialog(wxWindow *parent, ocpnFloatingToolbarDialog *sponsor, + wxWindowID id = -1, const wxString &caption = _T(""), const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = SYMBOL_ToolbarChoices_STYLE); diff --git a/gui/include/gui/track_gui.h b/gui/include/gui/track_gui.h index a74b803b6a..d4f922e09e 100644 --- a/gui/include/gui/track_gui.h +++ b/gui/include/gui/track_gui.h @@ -36,24 +36,24 @@ class TrackPointGui { public: - TrackPointGui(const TrackPoint& point) : m_point(point) {} + TrackPointGui(const TrackPoint &point) : m_point(point) {} void Draw(ChartCanvas *cc, ocpnDC &dc); + private: - const TrackPoint& m_point; + const TrackPoint &m_point; }; - class TrackGui { public: - TrackGui(Track& track) : m_track(track) {} - void Draw(ChartCanvas* cc, ocpnDC& dc, ViewPort& VP, const LLBBox& box); + TrackGui(Track &track) : m_track(track) {} + void Draw(ChartCanvas *cc, ocpnDC &dc, ViewPort &VP, const LLBBox &box); protected: void Segments(ChartCanvas *cc, std::list > &pointlists, const LLBBox &box, double scale); private: - Track& m_track; + Track &m_track; void GetPointLists(ChartCanvas *cc, std::list > &pointlists, ViewPort &VP, const LLBBox &box); @@ -65,7 +65,6 @@ class TrackGui { void AddPointToLists(ChartCanvas *cc, std::list > &pointlists, int &last, int n); - }; -#endif // _TRACK_GUI_H +#endif // _TRACK_GUI_H diff --git a/gui/include/gui/udev_rule_mgr.h b/gui/include/gui/udev_rule_mgr.h index 5b17971a76..038c074567 100644 --- a/gui/include/gui/udev_rule_mgr.h +++ b/gui/include/gui/udev_rule_mgr.h @@ -23,7 +23,6 @@ * Only making anything useful on Linux. */ - #ifndef UDEV_RULE_MGR_H__ #define UDEV_RULE_MGR_H__ diff --git a/gui/include/gui/viewport.h b/gui/include/gui/viewport.h index 38b73db453..99ce62db3c 100644 --- a/gui/include/gui/viewport.h +++ b/gui/include/gui/viewport.h @@ -75,27 +75,77 @@ typedef enum ColorScheme #define INVALID_COORD (-2147483647 - 1) -//---------------------------------------------------------------------------- -// ViewPort Definition -//---------------------------------------------------------------------------- +/** + * Represents the view port for chart display in OpenCPN. Encapsulates all parameters + * that define the current view of the chart, including position, scale, rotation, + * and projection type. Provides methods for coordinate conversions and viewport manipulations. + */ class ViewPort { public: ViewPort(); + /** + * Convert latitude and longitude to pixel coordinates. + * + * @param lat Latitude in degrees + * @param lon Longitude in degrees + * @return wxPoint Pixel coordinates + */ wxPoint GetPixFromLL(double lat, double lon); + /** + * @brief Convert pixel coordinates to latitude and longitude + * @param p Pixel coordinates + * @param lat Pointer to store resulting latitude + * @param lon Pointer to store resulting longitude + */ void GetLLFromPix(const wxPoint &p, double *lat, double *lon) { GetLLFromPix(wxPoint2DDouble(p), lat, lon); } + /** + * @brief Convert pixel coordinates to latitude and longitude using double precision + * @param p Pixel coordinates as wxPoint2DDouble + * @param lat Pointer to store resulting latitude + * @param lon Pointer to store resulting longitude + */ void GetLLFromPix(const wxPoint2DDouble &p, double *lat, double *lon); + /** + * @brief Convert latitude and longitude to pixel coordinates with double precision + * @param lat Latitude in degrees + * @param lon Longitude in degrees + * @return wxPoint2DDouble Pixel coordinates + */ wxPoint2DDouble GetDoublePixFromLL(double lat, double lon); LLRegion GetLLRegion(const OCPNRegion ®ion); + /** + * @brief Get the intersection of the viewport with a given region + * @param region OCPNRegion to intersect with + * @param llregion LLRegion to use for the intersection + * @param chart_native_scale Native scale of the chart + * @return OCPNRegion Resulting intersected region + */ OCPNRegion GetVPRegionIntersect(const OCPNRegion ®ion, const LLRegion &llregion, int chart_native_scale); + + /** + * @brief Get the intersection of the viewport with a polygon defined by lat/lon points + * @param Region OCPNRegion to intersect with + * @param nPoints Number of points in the polygon + * @param llpoints Array of lat/lon points defining the polygon + * @param chart_native_scale Native scale of the chart + * @param ppoints Array to store resulting pixel coordinates + * @return OCPNRegion Resulting intersected region + */ OCPNRegion GetVPRegionIntersect(const OCPNRegion &Region, int nPoints, float *llpoints, int chart_native_scale, wxPoint *ppoints); + /** + * @brief Get the viewport rectangle intersecting with a set of lat/lon points + * @param n Number of points + * @param llpoints Array of lat/lon points + * @return wxRect Intersecting rectangle + */ wxRect GetVPRectIntersect(size_t n, float *llpoints); ViewPort BuildExpandedVP(int width, int height); @@ -142,28 +192,23 @@ class ViewPort { bool b_MercatorProjectionOverride; wxRect rv_rect; -//#ifdef USE_ANDROID_GLES2 + // #ifdef USE_ANDROID_GLES2 float vp_matrix_transform[16]; float norm_transform[16]; -//#endif - - bool operator==(const ViewPort& rhs) const - { - return (clat == rhs.clat) - && (clon == rhs.clon) - && (view_scale_ppm == rhs.view_scale_ppm) - && (skew == rhs.skew) - && (rotation == rhs.rotation) - && (tilt == rhs.tilt) - && (chart_scale == rhs.chart_scale) - && (ref_scale == rhs.ref_scale) - && (pix_width == rhs.pix_width) - && (pix_height == rhs.pix_height) - && (b_quilt == rhs.b_quilt) - && (b_FullScreenQuilt == rhs.b_FullScreenQuilt) - && (m_projection_type == rhs.m_projection_type) - && (b_MercatorProjectionOverride == rhs.b_MercatorProjectionOverride); + // #endif + + bool operator==(const ViewPort &rhs) const { + return (clat == rhs.clat) && (clon == rhs.clon) && + (view_scale_ppm == rhs.view_scale_ppm) && (skew == rhs.skew) && + (rotation == rhs.rotation) && (tilt == rhs.tilt) && + (chart_scale == rhs.chart_scale) && (ref_scale == rhs.ref_scale) && + (pix_width == rhs.pix_width) && (pix_height == rhs.pix_height) && + (b_quilt == rhs.b_quilt) && + (b_FullScreenQuilt == rhs.b_FullScreenQuilt) && + (m_projection_type == rhs.m_projection_type) && + (b_MercatorProjectionOverride == rhs.b_MercatorProjectionOverride); } + private: LLBBox vpBBox; // An un-skewed rectangular lat/lon bounding box // which contains the entire vieport diff --git a/gui/include/gui/waypointman_gui.h b/gui/include/gui/waypointman_gui.h index 8bb22b55bc..91ede92011 100644 --- a/gui/include/gui/waypointman_gui.h +++ b/gui/include/gui/waypointman_gui.h @@ -31,7 +31,7 @@ class WayPointmanGui { public: - WayPointmanGui(WayPointman& waypoint_man) : m_waypoint_man(waypoint_man) {} + WayPointmanGui(WayPointman &waypoint_man) : m_waypoint_man(waypoint_man) {} void SetColorScheme(ColorScheme cs, double displayDPmm); void ReloadAllIcons(double displayDPmm); @@ -46,13 +46,11 @@ class WayPointmanGui { private: MarkIcon *ProcessLegacyIcon(wxString fileName, const wxString &key, - const wxString &description, - double displayDPmm); + const wxString &description, double displayDPmm); MarkIcon *ProcessExtendedIcon(wxImage &image, const wxString &key, const wxString &description); wxRect CropImageOnAlpha(wxImage &image); - WayPointman& m_waypoint_man; + WayPointman &m_waypoint_man; }; - -#endif // _WAYPOINT_GUI_H__ +#endif // _WAYPOINT_GUI_H__ diff --git a/gui/include/gui/wiz_ui.h b/gui/include/gui/wiz_ui.h index 6f9652a73a..4d80a4e11c 100644 --- a/gui/include/gui/wiz_ui.h +++ b/gui/include/gui/wiz_ui.h @@ -64,8 +64,7 @@ const std::vector known_usb_devices = { class FirstUseWizImpl : public FirstUseWiz { public: - FirstUseWizImpl(wxWindow* parent, MyConfig *pConfig, - wxWindowID id = wxID_ANY, + FirstUseWizImpl(wxWindow* parent, MyConfig* pConfig, wxWindowID id = wxID_ANY, const wxString& title = _("OpenCPN Initial Configuration"), const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, @@ -98,16 +97,15 @@ class FirstUseWizImpl : public FirstUseWiz { void EnumerateGPSD(); private: - MyConfig *m_pConfig; + MyConfig* m_pConfig; std::vector m_detected_connections; NMEA0183Flavor SeemsN0183(std::string& data); bool SeemsN2000(std::string& data); - inline void SetControlEnable(int id, bool state) - { - wxWindow *win = wxWindow::FindWindowById(id); - if(win) win->Enable(state); + inline void SetControlEnable(int id, bool state) { + wxWindow* win = wxWindow::FindWindowById(id); + if (win) win->Enable(state); } }; -#endif //_WIZ_UI_H__ \ No newline at end of file +#endif //_WIZ_UI_H__ diff --git a/gui/include/gui/wiz_ui_proto.h b/gui/include/gui/wiz_ui_proto.h index 9d3b9c3991..3f29376c92 100644 --- a/gui/include/gui/wiz_ui_proto.h +++ b/gui/include/gui/wiz_ui_proto.h @@ -31,62 +31,65 @@ #include #include #include -WX_DEFINE_ARRAY_PTR( wxWizardPageSimple*, WizardPages ); +WX_DEFINE_ARRAY_PTR(wxWizardPageSimple*, WizardPages); /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// /// Class FirstUseWiz /////////////////////////////////////////////////////////////////////////////// -class FirstUseWiz : public wxWizard -{ - private: +class FirstUseWiz : public wxWizard { +private: +protected: + wxScrolledWindow* m_swLangUnits; + wxStaticText* m_stDepth; + wxChoice* m_cDepth; + wxStaticText* m_stDistance; + wxChoice* m_cDistance; + wxStaticText* m_stSpeed; + wxChoice* m_cSpeed; + wxStaticText* m_stWind; + wxChoice* m_cWind; + wxStaticText* m_stPosition; + wxChoice* m_cPosition; + wxCheckBox* m_cbShowTrue; + wxCheckBox* m_cbShowMagnetic; + wxRichTextCtrl* m_rtLangUnitInfo; + wxScrolledWindow* m_swConnections; + wxStaticText* m_stSources; + wxCheckListBox* m_clSources; + wxButton* m_btnRescanSources; + wxRichTextCtrl* m_rtConnectionInfo; + wxScrolledWindow* m_swCharts; + wxStaticText* m_stAddCharts; + wxListBox* m_lbChartsDirs; + wxButton* m_btnAddChartDir; + wxRichTextCtrl* m_rtChartDirInfo; + wxHtmlWindow* m_htmlWinFinish; - protected: - wxScrolledWindow* m_swLangUnits; - wxStaticText* m_stDepth; - wxChoice* m_cDepth; - wxStaticText* m_stDistance; - wxChoice* m_cDistance; - wxStaticText* m_stSpeed; - wxChoice* m_cSpeed; - wxStaticText* m_stWind; - wxChoice* m_cWind; - wxStaticText* m_stPosition; - wxChoice* m_cPosition; - wxCheckBox* m_cbShowTrue; - wxCheckBox* m_cbShowMagnetic; - wxRichTextCtrl* m_rtLangUnitInfo; - wxScrolledWindow* m_swConnections; - wxStaticText* m_stSources; - wxCheckListBox* m_clSources; - wxButton* m_btnRescanSources; - wxRichTextCtrl* m_rtConnectionInfo; - wxScrolledWindow* m_swCharts; - wxStaticText* m_stAddCharts; - wxListBox* m_lbChartsDirs; - wxButton* m_btnAddChartDir; - wxRichTextCtrl* m_rtChartDirInfo; - wxHtmlWindow* m_htmlWinFinish; + // Virtual event handlers, override them in your derived class + virtual void OnInitDialog(wxInitDialogEvent& event) { event.Skip(); } + virtual void OnWizardCancel(wxWizardEvent& event) { event.Skip(); } + virtual void OnWizardFinished(wxWizardEvent& event) { event.Skip(); } + virtual void OnWizardHelp(wxWizardEvent& event) { event.Skip(); } + virtual void OnWizardPageChanged(wxWizardEvent& event) { event.Skip(); } + virtual void OnWizardPageChanging(wxWizardEvent& event) { event.Skip(); } + virtual void OnWizardPageShown(wxWizardEvent& event) { event.Skip(); } + virtual void m_btnRescanSourcesOnButtonClick(wxCommandEvent& event) { + event.Skip(); + } + virtual void m_btnAddChartDirOnButtonClick(wxCommandEvent& event) { + event.Skip(); + } - // Virtual event handlers, override them in your derived class - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - virtual void OnWizardCancel( wxWizardEvent& event ) { event.Skip(); } - virtual void OnWizardFinished( wxWizardEvent& event ) { event.Skip(); } - virtual void OnWizardHelp( wxWizardEvent& event ) { event.Skip(); } - virtual void OnWizardPageChanged( wxWizardEvent& event ) { event.Skip(); } - virtual void OnWizardPageChanging( wxWizardEvent& event ) { event.Skip(); } - virtual void OnWizardPageShown( wxWizardEvent& event ) { event.Skip(); } - virtual void m_btnRescanSourcesOnButtonClick( wxCommandEvent& event ) { event.Skip(); } - virtual void m_btnAddChartDirOnButtonClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - FirstUseWiz( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("OpenCPN Initial Configuration"), const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP ); - WizardPages m_pages; - - ~FirstUseWiz(); +public: + FirstUseWiz(wxWindow* parent, wxWindowID id = wxID_ANY, + const wxString& title = _("OpenCPN Initial Configuration"), + const wxBitmap& bitmap = wxNullBitmap, + const wxPoint& pos = wxDefaultPosition, + long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | + wxSTAY_ON_TOP); + WizardPages m_pages; + ~FirstUseWiz(); }; - diff --git a/gui/src/AISTargetAlertDialog.cpp b/gui/src/AISTargetAlertDialog.cpp index 4c76a32242..18ef70e47e 100644 --- a/gui/src/AISTargetAlertDialog.cpp +++ b/gui/src/AISTargetAlertDialog.cpp @@ -209,7 +209,7 @@ void AISTargetAlertDialog::CreateControls() { // Also used to close a DSC Alert wxString acktext = _("&Acknowledge"); bool show_ack_button = false; - if (m_bjumpto && m_bcreateWP) { //DSC Alert only + if (m_bjumpto && m_bcreateWP) { // DSC Alert only acktext = _("&Close Alert"); show_ack_button = true; } @@ -242,7 +242,7 @@ void AISTargetAlertDialog::UpdateText() { if (GetAlertText()) { // Capture current scroll position int x, y; - m_pAlertTextCtl->GetViewStart( &x, &y); + m_pAlertTextCtl->GetViewStart(&x, &y); wxFont *dFont = FontMgr::Get().GetFont(_("AISTargetAlert"), 12); wxString face = dFont->GetFaceName(); @@ -360,9 +360,9 @@ void AISTargetAlertDialog::OnClose(wxCloseEvent &event) { void AISTargetAlertDialog::OnIdAckClick(wxCommandEvent &event) { // Acknowledge the Alert, and dismiss the dialog if (m_pdecoder) { - auto td = m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); + auto td = m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); if (td) { - if (AIS_ALERT_SET == td->n_alert_state ) { + if (AIS_ALERT_SET == td->n_alert_state) { td->m_ack_time = wxDateTime::Now(); td->b_in_ack_timeout = true; } @@ -379,7 +379,7 @@ void AISTargetAlertDialog::OnIdAckClick(wxCommandEvent &event) { } void AISTargetAlertDialog::OnIdCreateWPClick(wxCommandEvent &event) { if (m_pdecoder) { - auto td = m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); + auto td = m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); if (td) { RoutePoint *pWP = new RoutePoint(td->Lat, td->Lon, g_default_wp_icon, wxEmptyString, wxEmptyString); @@ -403,16 +403,14 @@ void AISTargetAlertDialog::OnIdCreateWPClick(wxCommandEvent &event) { void AISTargetAlertDialog::OnIdSilenceClick(wxCommandEvent &event) { // Set the suppress audio flag if (m_pdecoder) { - auto td = - m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); + auto td = m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); if (td) td->b_suppress_audio = true; } } void AISTargetAlertDialog::OnIdJumptoClick(wxCommandEvent &event) { if (m_pdecoder) { - auto td = - m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); + auto td = m_pdecoder->Get_Target_Data_From_MMSI(Get_Dialog_MMSI()); if (td) gFrame->JumpToPosition(gFrame->GetFocusCanvas(), td->Lat, td->Lon, gFrame->GetFocusCanvas()->GetVPScale()); diff --git a/gui/src/AISTargetListDialog.cpp b/gui/src/AISTargetListDialog.cpp index 055dc01948..91e12f80bf 100644 --- a/gui/src/AISTargetListDialog.cpp +++ b/gui/src/AISTargetListDialog.cpp @@ -65,8 +65,7 @@ END_EVENT_TABLE() static bool g_bsort_once; -static int ItemCompare(AisTargetData *pAISTarget1, - AisTargetData *pAISTarget2) { +static int ItemCompare(AisTargetData *pAISTarget1, AisTargetData *pAISTarget2) { wxString s1, s2; double n1 = 0.; double n2 = 0.; @@ -152,7 +151,8 @@ static int ItemCompare(AisTargetData *pAISTarget1, s1 = _("-"); if ((t1->Class == AIS_ATON) || (t1->Class == AIS_BASE) || - (t1->Class == AIS_CLASS_B) || (t1->Class == AIS_METEO)) s1 = _T("-"); + (t1->Class == AIS_CLASS_B) || (t1->Class == AIS_METEO)) + s1 = _T("-"); if ((t2->NavStatus <= 15) && (t2->NavStatus >= 0)) { if (t2->Class == AIS_SART) { @@ -166,7 +166,8 @@ static int ItemCompare(AisTargetData *pAISTarget1, s2 = _("-"); if ((t2->Class == AIS_ATON) || (t2->Class == AIS_BASE) || - (t2->Class == AIS_CLASS_B) || (t2->Class == AIS_METEO)) s2 = _T("-"); + (t2->Class == AIS_CLASS_B) || (t2->Class == AIS_METEO)) + s2 = _T("-"); break; } @@ -704,11 +705,12 @@ void AISTargetListDialog::CreateControls() { bsRouteButtonsInner->Add(m_pButtonJumpTo, 0, wxEXPAND | wxALL, 2); m_pButtonJumpTo_Close = - new wxButton(winr, wxID_ANY, _("Center-Info-Close"), wxDefaultPosition, - wxDefaultSize, wxBU_AUTODRAW); + new wxButton(winr, wxID_ANY, _("Center-Info-Close"), wxDefaultPosition, + wxDefaultSize, wxBU_AUTODRAW); m_pButtonJumpTo_Close->Connect( - wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(AISTargetListDialog::OnTargetScrollToClose), NULL, this); + wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(AISTargetListDialog::OnTargetScrollToClose), NULL, + this); bsRouteButtonsInner->Add(m_pButtonJumpTo_Close, 0, wxEXPAND | wxALL, 2); m_pButtonCreateWpt = @@ -849,7 +851,8 @@ void AISTargetListDialog::UpdateButtons() { m_pButtonInfo->Enable(enable); if (m_pdecoder && item != -1) { - auto pAISTargetSel = m_pdecoder->Get_Target_Data_From_MMSI(m_pMMSI_array->Item(item)); + auto pAISTargetSel = + m_pdecoder->Get_Target_Data_From_MMSI(m_pMMSI_array->Item(item)); if (pAISTargetSel && (!pAISTargetSel->b_positionOnceValid)) enable = false; } m_pButtonJumpTo->Enable(enable); @@ -883,7 +886,8 @@ void AISTargetListDialog::OnTargetQuery(wxCommandEvent &event) { if (selItemID == -1) return; if (m_pdecoder) { - auto pAISTarget = m_pdecoder->Get_Target_Data_From_MMSI(m_pMMSI_array->Item(selItemID)); + auto pAISTarget = + m_pdecoder->Get_Target_Data_From_MMSI(m_pMMSI_array->Item(selItemID)); if (pAISTarget) DoTargetQuery(pAISTarget->MMSI); } } @@ -1033,7 +1037,7 @@ void AISTargetListDialog::CenterToTarget(bool close) { std::shared_ptr pAISTarget = NULL; if (m_pdecoder) pAISTarget = - m_pdecoder->Get_Target_Data_From_MMSI(m_pMMSI_array->Item(selItemID)); + m_pdecoder->Get_Target_Data_From_MMSI(m_pMMSI_array->Item(selItemID)); if (pAISTarget) { double scale = gFrame->GetFocusCanvas()->GetVPScale(); @@ -1042,7 +1046,7 @@ void AISTargetListDialog::CenterToTarget(bool close) { if (close) { // Set a resonable (1:5000) chart scale to see the target. if (scale < 0.7) { // Don't zoom if already close. - ChartCanvas* cc = gFrame->GetFocusCanvas(); + ChartCanvas *cc = gFrame->GetFocusCanvas(); double factor = cc->GetScaleValue() / 5000.0; cc->DoZoomCanvas(factor, false); } @@ -1066,7 +1070,8 @@ void AISTargetListDialog::OnLimitRange(wxCommandEvent &event) { UpdateAISTargetList(); } -std::shared_ptr AISTargetListDialog::GetpTarget(unsigned int list_item) { +std::shared_ptr AISTargetListDialog::GetpTarget( + unsigned int list_item) { if (m_pdecoder) return m_pdecoder->Get_Target_Data_From_MMSI( m_pMMSI_array->Item(list_item)); @@ -1107,8 +1112,7 @@ void AISTargetListDialog::UpdateAISTargetList(void) { b_add = true; // Do not show any "lost" targets in the list. - if (pAISTarget->b_lost) - b_add = false; + if (pAISTarget->b_lost) b_add = false; if (b_add) { m_pMMSI_array->Add(pAISTarget->MMSI); diff --git a/gui/src/AISTargetQueryDialog.cpp b/gui/src/AISTargetQueryDialog.cpp index c10672f018..70d249cda7 100644 --- a/gui/src/AISTargetQueryDialog.cpp +++ b/gui/src/AISTargetQueryDialog.cpp @@ -47,7 +47,7 @@ extern ColorScheme global_color_scheme; extern wxString g_default_wp_icon; extern MyConfig *pConfig; extern RouteManagerDialog *pRouteManagerDialog; -extern std::vector g_TrackList; +extern std::vector g_TrackList; extern OCPNPlatform *g_Platform; extern MyFrame *gFrame; @@ -171,7 +171,7 @@ void AISTargetQueryDialog::OnIdTrkCreateClick(wxCommandEvent &event) { if (wxID_YES == OCPNMessageBox( - NULL, + gFrame, _("The recently captured track of this target has been " "recorded.\nDo you want to continue recording until the end " "of the current OpenCPN session?"), @@ -368,21 +368,26 @@ void AISTargetQueryDialog::AdjustBestSize(AisTargetData *td) { m_adjustedFontSize--; } - target_x = szv.x * 12/10; // Making the winfow a bit wider than absolutely nesessary gives a little better results in real world + target_x = szv.x * 12 / + 10; // Making the winfow a bit wider than absolutely nesessary + // gives a little better results in real world } else { wxSize szv = m_pQueryTextCtl->GetVirtualSize(); int csz = g_Platform->getDisplaySize().x * 8 / 10; if ((szv.x) < csz) { if (szv.x > m_pQueryTextCtl->GetSize().x) target_x = szv.x; // * 11/10; } - target_x = szv.x * 12/10; // Making the winfow a bit wider than absolutely nesessary gives a little better results in real world + target_x = szv.x * 12 / + 10; // Making the winfow a bit wider than absolutely nesessary + // gives a little better results in real world } #ifdef __ANDROID__ // Now adjust the font size used for the control buttons. // This adjustment makes sure that the two horizontal buttons are not wider // than the platform display allows. This may be a problem on phones, - // but probably never on normal computer displays. some platforms also don't support this at all + // but probably never on normal computer displays. some platforms also don't + // support this at all if (m_createWptBtn && m_createTrkBtn) { wxSize psz = g_Platform->getDisplaySize(); @@ -425,8 +430,7 @@ void AISTargetQueryDialog::AdjustBestSize(AisTargetData *td) { wxSize szyv = m_pQueryTextCtl->GetVirtualSize(); int csz = g_Platform->getDisplaySize().y * 85 / 100; if ((szyv.y + yb) < csz) { - if (szyv.y > m_pQueryTextCtl->GetSize().y) - target_y = szyv.y * 12 / 10 + yb; + if (szyv.y > m_pQueryTextCtl->GetSize().y) target_y = szyv.y * 12 / 10 + yb; } else { target_y = csz; } diff --git a/gui/src/AboutFrame.cpp b/gui/src/AboutFrame.cpp index bec2faafdf..b95530ab16 100644 --- a/gui/src/AboutFrame.cpp +++ b/gui/src/AboutFrame.cpp @@ -71,7 +71,7 @@ AboutFrame::AboutFrame(wxWindow* parent, wxWindowID id, const wxString& title, bSizerAuthors1 = new wxBoxSizer(wxHORIZONTAL); m_staticTextCopyYears = - new wxStaticText(m_scrolledWindowAbout, wxID_ANY, _("(c) 2000-2023"), + new wxStaticText(m_scrolledWindowAbout, wxID_ANY, "(c) 2000-2024", wxDefaultPosition, wxDefaultSize, 0); m_staticTextCopyYears->Wrap(-1); bSizerAuthors1->Add(m_staticTextCopyYears, 0, wxALL, 5); diff --git a/gui/src/AboutFrameImpl.cpp b/gui/src/AboutFrameImpl.cpp index 4fbca7d9df..7d4935ab49 100644 --- a/gui/src/AboutFrameImpl.cpp +++ b/gui/src/AboutFrameImpl.cpp @@ -42,13 +42,12 @@ AboutFrameImpl::AboutFrameImpl(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : AboutFrame(parent, id, title, pos, size, style) { - - if(strlen(DEBIAN_PPA_VERSION)) - m_staticTextVersion->SetLabel(wxString(DEBIAN_PPA_VERSION)); + if (strlen(DEBIAN_PPA_VERSION)) + m_staticTextVersion->SetLabel(wxString(DEBIAN_PPA_VERSION)); else - m_staticTextVersion->SetLabel(PACKAGE_VERSION); + m_staticTextVersion->SetLabel(PACKAGE_VERSION); - m_staticTextCopyYears->SetLabel("\u00A9 2000-2023"); + m_staticTextCopyYears->SetLabel("\u00A9 2000-2024"); m_hyperlinkIniFile->SetLabel(g_Platform->GetConfigFileName()); m_hyperlinkIniFile->SetURL(g_Platform->GetConfigFileName()); m_hyperlinkLogFile->SetLabel(g_Platform->GetLogFileName()); @@ -65,14 +64,20 @@ AboutFrameImpl::AboutFrameImpl(wxWindow* parent, wxWindowID id, g_Platform->GetSharedDataDir().c_str()), wxBITMAP_TYPE_ANY); - m_hyperlinkHelp->SetURL(wxString::Format( - "file://%sdoc/help_en_US.html", g_Platform->GetSharedDataDir().c_str())); + wxString target = wxString::Format("%sdoc/local/toc_flat.html", + g_Platform->GetSharedDataDir().c_str()); + + if (!::wxFileExists(target)) + target = wxString::Format("%sdoc/help_web.html", + g_Platform->GetSharedDataDir().c_str()); + + target.Prepend("file://"); + + m_hyperlinkHelp->SetURL(target); #if wxUSE_WEBVIEW && defined(HAVE_WEBVIEW) - m_htmlWinHelp->LoadURL(wxString::Format( - "file://%sdoc/help_en_US.html", g_Platform->GetSharedDataDir().c_str())); + m_htmlWinHelp->LoadURL(target); #else - m_htmlWinHelp->LoadFile(wxString::Format( - "%s/doc/help_en_US.html", g_Platform->GetSharedDataDir().c_str())); + m_htmlWinHelp->LoadFile(target); #endif m_bitmapLogo->SetBitmap(logo); @@ -88,7 +93,7 @@ AboutFrameImpl::AboutFrameImpl(wxWindow* parent, wxWindowID id, void AboutFrameImpl::OnLinkHelp(wxHyperlinkEvent& event) { #ifdef __WXGTK__ - wxString testFile = wxString::Format("/%s/doc/help_en_US.html", + wxString testFile = wxString::Format("/%s/doc/help_web.html", g_Platform->GetSharedDataDir().c_str()); if (!::wxFileExists(testFile)) { wxString msg = _("OpenCPN Help documentation is not available locally."); diff --git a/gui/src/AdapterInfo.cpp b/gui/src/AdapterInfo.cpp index 8922b865d7..208f9b1100 100644 --- a/gui/src/AdapterInfo.cpp +++ b/gui/src/AdapterInfo.cpp @@ -8,94 +8,86 @@ #pragma comment(lib, "iphlpapi.lib") #pragma comment(lib, "ws2_32.lib") - AdapterInfo::AdapterInfo() { - QueryAdapterInfo(); - } - - void AdapterInfo::QueryAdapterInfo() { - PIP_ADAPTER_INFO pAdapterInfo; - PIP_ADAPTER_INFO pAdapter = NULL; - DWORD dwRetVal = 0; - - ULONG ulOutBufLen = sizeof(IP_ADAPTER_INFO); - pAdapterInfo = (IP_ADAPTER_INFO*)malloc(sizeof(IP_ADAPTER_INFO)); - if (pAdapterInfo == NULL) { - std::cerr << "Error allocating memory needed to call GetAdaptersinfo\n"; - return; - } - - // Make an initial call to GetAdaptersInfo to get the necessary size into ulOutBufLen - if (GetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) { - free(pAdapterInfo); - pAdapterInfo = (IP_ADAPTER_INFO*)malloc(ulOutBufLen); - if (pAdapterInfo == NULL) { - std::cerr << "Error allocating memory needed to call GetAdaptersinfo\n"; - return; - } - } - - if ((dwRetVal = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == NO_ERROR) { - pAdapter = pAdapterInfo; - while (pAdapter) { - - if (pAdapter->GatewayList.IpAddress.String[0] != '0') { // Check if gateway is defined - IPAddress = pAdapter->IpAddressList.IpAddress.String; - NetMask = pAdapter->IpAddressList.IpMask.String; - GateWay = pAdapter->GatewayList.IpAddress.String; - break; - } - - pAdapter = pAdapter->Next; - } - } - else { - std::cerr << "GetAdaptersInfo failed with error: " << dwRetVal << "\n"; - } - - if (pAdapterInfo) { - free(pAdapterInfo); - } - - } +AdapterInfo::AdapterInfo() { QueryAdapterInfo(); } + +void AdapterInfo::QueryAdapterInfo() { + PIP_ADAPTER_INFO pAdapterInfo; + PIP_ADAPTER_INFO pAdapter = NULL; + DWORD dwRetVal = 0; + + ULONG ulOutBufLen = sizeof(IP_ADAPTER_INFO); + pAdapterInfo = (IP_ADAPTER_INFO*)malloc(sizeof(IP_ADAPTER_INFO)); + if (pAdapterInfo == NULL) { + std::cerr << "Error allocating memory needed to call GetAdaptersinfo\n"; + return; + } - std::string AdapterInfo::longToIp(unsigned long ip) { - return std::to_string((ip >> 24) & 0xFF) + "." + - std::to_string((ip >> 16) & 0xFF) + "." + - std::to_string((ip >> 8) & 0xFF) + "." + - std::to_string(ip & 0xFF); + // Make an initial call to GetAdaptersInfo to get the necessary size into + // ulOutBufLen + if (GetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) { + free(pAdapterInfo); + pAdapterInfo = (IP_ADAPTER_INFO*)malloc(ulOutBufLen); + if (pAdapterInfo == NULL) { + std::cerr << "Error allocating memory needed to call GetAdaptersinfo\n"; + return; + } } - unsigned long AdapterInfo::ipToLong(const std::string& ip) { - unsigned long ipBytes[4] = { 0 }; - int count = sscanf_s(ip.c_str(), "%lu.%lu.%lu.%lu", &ipBytes[3], &ipBytes[2], &ipBytes[1], &ipBytes[0]); - if (count != 4) { - std::cerr << "Error parsing IP address." << std::endl; - return 0; - } - return (ipBytes[3] << 24) | (ipBytes[2] << 16) | (ipBytes[1] << 8) | ipBytes[0]; - } + if ((dwRetVal = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == NO_ERROR) { + pAdapter = pAdapterInfo; + while (pAdapter) { + if (pAdapter->GatewayList.IpAddress.String[0] != + '0') { // Check if gateway is defined + IPAddress = pAdapter->IpAddressList.IpAddress.String; + NetMask = pAdapter->IpAddressList.IpMask.String; + GateWay = pAdapter->GatewayList.IpAddress.String; + break; + } + + pAdapter = pAdapter->Next; + } + } else { + std::cerr << "GetAdaptersInfo failed with error: " << dwRetVal << "\n"; + } -std::string AdapterInfo::CalculateBroadcastAddress(const std::string& ip, const std::string& netmask) { - unsigned long ipLong = ipToLong(ip); - unsigned long netmaskLong = ipToLong(netmask); - unsigned long wildcardMask = ~netmaskLong; - unsigned long broadcastAddress = ipLong | wildcardMask; - return longToIp(broadcastAddress); - } + if (pAdapterInfo) { + free(pAdapterInfo); + } +} + +std::string AdapterInfo::longToIp(unsigned long ip) { + return std::to_string((ip >> 24) & 0xFF) + "." + + std::to_string((ip >> 16) & 0xFF) + "." + + std::to_string((ip >> 8) & 0xFF) + "." + std::to_string(ip & 0xFF); +} + +unsigned long AdapterInfo::ipToLong(const std::string& ip) { + unsigned long ipBytes[4] = {0}; + int count = sscanf_s(ip.c_str(), "%lu.%lu.%lu.%lu", &ipBytes[3], &ipBytes[2], + &ipBytes[1], &ipBytes[0]); + if (count != 4) { + std::cerr << "Error parsing IP address." << std::endl; + return 0; + } + return (ipBytes[3] << 24) | (ipBytes[2] << 16) | (ipBytes[1] << 8) | + ipBytes[0]; +} + +std::string AdapterInfo::CalculateBroadcastAddress(const std::string& ip, + const std::string& netmask) { + unsigned long ipLong = ipToLong(ip); + unsigned long netmaskLong = ipToLong(netmask); + unsigned long wildcardMask = ~netmaskLong; + unsigned long broadcastAddress = ipLong | wildcardMask; + return longToIp(broadcastAddress); +} std::string AdapterInfo::GetBroadcastAddress() { - return CalculateBroadcastAddress(IPAddress, NetMask); + return CalculateBroadcastAddress(IPAddress, NetMask); +} - } +std::string AdapterInfo::GetIPAddress() { return IPAddress; } - std::string AdapterInfo::GetIPAddress() { - return IPAddress; - } +std::string AdapterInfo::GetNetMask() { return NetMask; } - std::string AdapterInfo::GetNetMask() { - return NetMask; - } - - std::string AdapterInfo::GetGateWay() { - return GateWay; - } +std::string AdapterInfo::GetGateWay() { return GateWay; } diff --git a/gui/src/CanvasOptions.cpp b/gui/src/CanvasOptions.cpp index a1de365fff..48f9133f6c 100644 --- a/gui/src/CanvasOptions.cpp +++ b/gui/src/CanvasOptions.cpp @@ -49,7 +49,7 @@ //------------------------------------------------------------------------------ // External Static Storage //------------------------------------------------------------------------------ -extern s52plib *ps52plib; +extern s52plib* ps52plib; // Helper utilities @@ -75,7 +75,7 @@ CanvasOptions::CanvasOptions(wxWindow* parent) long mstyle = wxNO_BORDER | wxFRAME_NO_TASKBAR; #ifdef __WXOSX__ - mstyle |= wxSTAY_ON_TOP; + mstyle |= wxSTAY_ON_TOP; #endif wxDialog::Create(parent, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, @@ -310,12 +310,12 @@ CanvasOptions::CanvasOptions(wxWindow* parent) wxCommandEventHandler(CanvasOptions::OnOptionChange), NULL, this); pCBENCDataQuality = - new wxCheckBox(pDisplayPanel, IDCO_ENCDATAQUALITY_CHECKBOX, - _("Show chart data quality")); + new wxCheckBox(pDisplayPanel, IDCO_ENCDATAQUALITY_CHECKBOX, + _("Show chart data quality")); boxENC->Add(pCBENCDataQuality, verticalInputFlags); pCBENCDataQuality->Connect( - wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(CanvasOptions::OnOptionChange), NULL, this); + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(CanvasOptions::OnOptionChange), NULL, this); // spacer boxENC->Add(0, interGroupSpace); @@ -358,6 +358,8 @@ void CanvasOptions::RefreshControlValues(void) { ChartCanvas* parentCanvas = wxDynamicCast(m_parent, ChartCanvas); if (!parentCanvas) return; + m_bmode_change_while_hidden = !wxWindow::IsShown(); + // Control options // pCBToolbar->SetValue(parentCanvas->GetToolbarEnable()); @@ -450,7 +452,6 @@ void CanvasOptions::RefreshControlValues(void) { // All NAVAID text options are gated by global "Show Text" pCBENCLightDesc->Enable(pCDOENCText->GetValue()); pCBENCBuoyLabels->Enable(pCDOENCText->GetValue()); - } void CanvasOptions::SetENCAvailable(bool avail) { @@ -544,28 +545,28 @@ void CanvasOptions::UpdateCanvasOptions(void) { b_needReLoad = true; } - if (pCBENCDataQuality->GetValue() != - parentCanvas->GetShowENCDataQual()) { + if (pCBENCDataQuality->GetValue() != parentCanvas->GetShowENCDataQual()) { parentCanvas->SetShowENCDataQual(pCBENCDataQuality->GetValue()); b_needReLoad = true; } // If pCBENCDataQuality is true, Force PLIB "Chart Information Objects" true. - if (pCBENCDataQuality->GetValue()){ - if (ps52plib) - ps52plib->m_bShowMeta = true; + if (pCBENCDataQuality->GetValue()) { + if (ps52plib) ps52plib->m_bShowMeta = true; parentCanvas->UpdateCanvasS52PLIBConfig(); } - int newMode = NORTH_UP_MODE; - if (pCBCourseUp->GetValue()) - newMode = COURSE_UP_MODE; - else if (pCBHeadUp->GetValue()) - newMode = HEAD_UP_MODE; + if (!m_bmode_change_while_hidden) { + int newMode = NORTH_UP_MODE; + if (pCBCourseUp->GetValue()) + newMode = COURSE_UP_MODE; + else if (pCBHeadUp->GetValue()) + newMode = HEAD_UP_MODE; - if (newMode != parentCanvas->GetUpMode()) { - parentCanvas->SetUpMode(newMode); - b_needReLoad = true; + if (newMode != parentCanvas->GetUpMode()) { + parentCanvas->SetUpMode(newMode); + b_needReLoad = true; + } } if (pCBLookAhead->GetValue() != parentCanvas->GetLookahead()) { diff --git a/gui/src/ChInfoWin.cpp b/gui/src/ChInfoWin.cpp index 67c9483c4d..a79ced6394 100644 --- a/gui/src/ChInfoWin.cpp +++ b/gui/src/ChInfoWin.cpp @@ -54,8 +54,7 @@ ChInfoWin::ChInfoWin(wxWindow* parent) { SetFont(*dFont); int ststyle = wxALIGN_LEFT | wxST_NO_AUTORESIZE; - m_pInfoTextCtl = new wxStaticText(this, -1, _T ( "" ), - wxDefaultPosition, + m_pInfoTextCtl = new wxStaticText(this, -1, _T ( "" ), wxDefaultPosition, wxDefaultSize, ststyle); dbIndex = -1; @@ -94,7 +93,8 @@ void ChInfoWin::SetBitmap() { m_pInfoTextCtl->SetBackgroundColour(GetGlobalColor(_T ( "UIBCK" ))); m_pInfoTextCtl->SetForegroundColour(GetGlobalColor(_T ( "UITX1" ))); - m_pInfoTextCtl->SetSize(GetCharWidth(), 1, m_size.x - 2 * GetCharWidth(), m_size.y - 2); + m_pInfoTextCtl->SetSize(GetCharWidth(), 1, m_size.x - 2 * GetCharWidth(), + m_size.y - 2); m_pInfoTextCtl->SetLabel(m_string); wxPoint top_position = diff --git a/gui/src/ConfigMgr.cpp b/gui/src/ConfigMgr.cpp index 8b4409d2ae..a8679146a5 100644 --- a/gui/src/ConfigMgr.cpp +++ b/gui/src/ConfigMgr.cpp @@ -39,7 +39,7 @@ #include "dychart.h" #include -//#include +// #include #include #include #include @@ -463,7 +463,8 @@ ConfigPanel::ConfigPanel(OCPNConfigObject *config, wxWindow *parent, SetMinSize(wxSize(-1, 6 * GetCharHeight())); - SetBackgroundColour(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW)); + SetBackgroundColour( + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW)); // Connect(wxEVT_LEFT_DOWN, // wxMouseEventHandler(ConfigPanel::OnConfigPanelMouseSelected), NULL, this); } @@ -501,7 +502,10 @@ ConfigMgr::ConfigMgr() { LoadCatalog(); } -ConfigMgr::~ConfigMgr() { configList->Clear(); delete configList; } +ConfigMgr::~ConfigMgr() { + configList->Clear(); + delete configList; +} void ConfigMgr::Init() { m_configDir = g_Platform->GetPrivateDataDir(); @@ -912,7 +916,7 @@ bool ConfigMgr::SaveTemplate(wxString fileName) { for (const auto &mm : g_config_display_size_mm) { st0.Append(wxString::Format(_T ( "%zu," ), mm)); } - st0.RemoveLast(); //Strip last comma + st0.RemoveLast(); // Strip last comma conf->Write(_T ( "DisplaySizeMM" ), st0); conf->Write(_T ( "DisplaySizeManual" ), g_config_display_size_manual); @@ -1167,22 +1171,22 @@ bool ConfigMgr::CheckTemplateGUID(wxString GUID) { return rv; } -#define CHECK_INT(s, t) \ - read_int = *t; \ +#define CHECK_INT(s, t) \ + read_int = *t; \ if (!conf.Read(s, &read_int)) wxLogMessage(s); \ if ((int)*t != read_int) return false; #define CHECK_STR(s, t) \ val = t; \ - conf.Read(s, &val); \ + conf.Read(s, &val); \ if (!t.IsSameAs(val)) return false; #define CHECK_STRP(s, t) \ - conf.Read(s, &val); \ + conf.Read(s, &val); \ if (!t->IsSameAs(val)) return false; #define CHECK_FLT(s, t, eps) \ - conf.Read(s, &val); \ + conf.Read(s, &val); \ val.ToDouble(&dval); \ if (fabs(dval - *t) > eps) return false; @@ -1342,8 +1346,9 @@ bool ConfigMgr::CheckTemplate(wxString fileName) { // 2 = "Kilometers", 3 = "Meters" CHECK_INT(_T ( "SpeedFormat" ), &g_iSpeedFormat); // 0 = "kts"), 1 = "mph", 2 = "km/h", 3 = "m/s" - CHECK_INT(_T ( "WindSpeedFormat" ), - &g_iWindSpeedFormat); // 0 = "knots"), 1 = "m/s", 2 = "Mph", 3 = "km/h" + CHECK_INT( + _T ( "WindSpeedFormat" ), + &g_iWindSpeedFormat); // 0 = "knots"), 1 = "m/s", 2 = "Mph", 3 = "km/h" // LIVE ETA OPTION CHECK_INT(_T ( "LiveETA" ), &g_bShowLiveETA); @@ -1598,14 +1603,14 @@ bool ConfigMgr::CheckTemplate(wxString fileName) { // S57 template items -#define CHECK_BFN(s, t) \ - conf.Read(s, &read_int); \ - bval = t; \ - bval0 = read_int != 0; \ +#define CHECK_BFN(s, t) \ + conf.Read(s, &read_int); \ + bval = t; \ + bval0 = read_int != 0; \ if (bval != bval0) return false; -#define CHECK_IFN(s, t) \ - conf.Read(s, &read_int); \ +#define CHECK_IFN(s, t) \ + conf.Read(s, &read_int); \ if (read_int != t) return false; #define CHECK_FFN(s, t) \ diff --git a/gui/src/FontMgr.cpp b/gui/src/FontMgr.cpp index d4b75e21eb..885dd6ab86 100644 --- a/gui/src/FontMgr.cpp +++ b/gui/src/FontMgr.cpp @@ -49,10 +49,9 @@ class OCPNwxFontList { void FreeAll(void); private: - bool isCached(font_cache_record& record, int pointSize, wxFontFamily family, - wxFontStyle style, wxFontWeight weight, - bool underline, const wxString &facename, - wxFontEncoding encoding); + bool isCached(font_cache_record &record, int pointSize, wxFontFamily family, + wxFontStyle style, wxFontWeight weight, bool underline, + const wxString &facename, wxFontEncoding encoding); std::vector m_fontVector; }; @@ -100,7 +99,6 @@ FontMgr::~FontMgr() { void FontMgr::SetLocale(wxString &newLocale) { s_locale = newLocale; } wxColour FontMgr::GetFontColor(const wxString &TextElement) const { - // Look thru the font list for a match MyFontDesc *pmfd; auto node = m_fontlist->GetFirst(); @@ -198,7 +196,7 @@ wxFont *FontMgr::GetFont(const wxString &TextElement, int user_default_size) { wxString nativefont = GetSimpleNativeFont(new_size, FaceName); wxFont *nf = wxFont::New(nativefont); - wxColor color = GetDefaultFontColor( TextElement); + wxColor color = GetDefaultFontColor(TextElement); MyFontDesc *pnewfd = new MyFontDesc(TextElement, configkey, nf, color); m_fontlist->Append(pnewfd); @@ -206,29 +204,29 @@ wxFont *FontMgr::GetFont(const wxString &TextElement, int user_default_size) { return pnewfd->m_font; } -wxColour FontMgr::GetDefaultFontColor( const wxString &TextElement ){ +wxColour FontMgr::GetDefaultFontColor(const wxString &TextElement) { wxColor defaultColor = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); // Special cases here - if(TextElement.IsSameAs( _("Console Legend")) ) - defaultColor = wxColour( 0, 255, 0); - else if(TextElement.IsSameAs( _("Console Value")) ) - defaultColor = wxColour( 0, 255, 0); - else if(TextElement.IsSameAs( _("Marks")) ) - defaultColor = wxColour( 0, 0, 0); - else if(TextElement.IsSameAs( _("RouteLegInfoRollover")) ) - defaultColor = wxColour( 0, 0, 0); - else if(TextElement.IsSameAs( _("AISRollover")) ) - defaultColor = wxColour( 0, 0, 0); - else if(TextElement.IsSameAs( _("ExtendedTideIcon")) ) - defaultColor = wxColour( 0, 0, 0); - else if(TextElement.IsSameAs( _("ChartTexts")) ) - defaultColor = wxColour( 0, 0, 0); - else if(TextElement.IsSameAs( _("AIS Target Name")) ) - defaultColor = wxColour( 0, 0, 0); + if (TextElement.IsSameAs(_("Console Legend"))) + defaultColor = wxColour(0, 255, 0); + else if (TextElement.IsSameAs(_("Console Value"))) + defaultColor = wxColour(0, 255, 0); + else if (TextElement.IsSameAs(_("Marks"))) + defaultColor = wxColour(0, 0, 0); + else if (TextElement.IsSameAs(_("RouteLegInfoRollover"))) + defaultColor = wxColour(0, 0, 0); + else if (TextElement.IsSameAs(_("AISRollover"))) + defaultColor = wxColour(0, 0, 0); + else if (TextElement.IsSameAs(_("ExtendedTideIcon"))) + defaultColor = wxColour(0, 0, 0); + else if (TextElement.IsSameAs(_("ChartTexts"))) + defaultColor = wxColour(0, 0, 0); + else if (TextElement.IsSameAs(_("AIS Target Name"))) + defaultColor = wxColour(0, 0, 0); #ifdef __WXMAC__ // Override, to adjust for light/dark mode - return wxColour(0,0,0); + return wxColour(0, 0, 0); #endif return defaultColor; @@ -391,10 +389,11 @@ wxFont *FontMgr::FindOrCreateFont(int point_size, wxFontFamily family, underline, facename, encoding); } -bool OCPNwxFontList::isCached(font_cache_record& record, int pointSize, wxFontFamily family, - wxFontStyle style, wxFontWeight weight, - bool underline, const wxString &facename, - wxFontEncoding encoding) { +bool OCPNwxFontList::isCached(font_cache_record &record, int pointSize, + wxFontFamily family, wxFontStyle style, + wxFontWeight weight, bool underline, + const wxString &facename, + wxFontEncoding encoding) { if (record.pointsize_req == pointSize && record.style_req == style && record.weight_req == weight && record.underline_req == underline) { bool same; @@ -439,10 +438,10 @@ wxFont *OCPNwxFontList::FindOrCreateFont(int pointSize, wxFontFamily family, #endif // !__WXOSX__ wxFont *font; - for (size_t i=0; i < m_fontVector.size() ; i++){ + for (size_t i = 0; i < m_fontVector.size(); i++) { font_cache_record record = m_fontVector[i]; if (isCached(record, pointSize, family, style, weight, underline, facename, - encoding)) + encoding)) return record.font; } @@ -450,8 +449,8 @@ wxFont *OCPNwxFontList::FindOrCreateFont(int pointSize, wxFontFamily family, // Support scaled HDPI displays automatically font = NULL; - wxFont fontTmp(OCPN_GetDisplayContentScaleFactor() * pointSize, - family, style, weight, underline, facename, encoding); + wxFont fontTmp(OCPN_GetDisplayContentScaleFactor() * pointSize, family, style, + weight, underline, facename, encoding); if (fontTmp.IsOk()) { font = new wxFont(fontTmp); font_cache_record record; @@ -468,7 +467,7 @@ wxFont *OCPNwxFontList::FindOrCreateFont(int pointSize, wxFontFamily family, void OCPNwxFontList::FreeAll(void) { wxFont *font; - for (size_t i=0; i < m_fontVector.size() ; i++){ + for (size_t i = 0; i < m_fontVector.size(); i++) { font_cache_record record = m_fontVector[i]; font = record.font; delete font; diff --git a/gui/src/MUIBar.cpp b/gui/src/MUIBar.cpp old mode 100755 new mode 100644 index 380665d8e2..fc56cd4124 --- a/gui/src/MUIBar.cpp +++ b/gui/src/MUIBar.cpp @@ -33,6 +33,7 @@ #endif // precompiled headers #include +#include "ssfn.h" #include "chcanv.h" #include "MUIBar.h" @@ -71,6 +72,9 @@ extern ocpnStyle::StyleManager* g_StyleManager; extern bool g_bShowMuiZoomButtons; extern bool g_bopengl; +ssfn_t ctx; /* the renderer context */ +ssfn_glyph_t* glyph; /* the returned rasterized bitmap */ + double getValue(int animationType, double t); // Helper classes @@ -212,8 +216,7 @@ void SetScaleDialog::OnSetScaleOKClick(wxCommandEvent& event) { // MUIButton //------------------------------------------------------------------------------ -class MUIButton { - +class MUIButton { wxSize DoGetBestSize() const; public: @@ -240,7 +243,7 @@ class MUIButton { void CreateControls(); void SetState(int state); - int GetState(){ return mState; } + int GetState() { return mState; } void SetColorScheme(ColorScheme cs); void OnSize(wxSizeEvent& event); @@ -250,7 +253,7 @@ class MUIButton { wxBitmap GetBitmapResource(const wxString& name); wxIcon GetIconResource(const wxString& name); - wxBitmap GetButtonBitmap(){ return m_bitmap; } + wxBitmap GetButtonBitmap() { return m_bitmap; } /// Should we show tooltips? static bool ShowToolTips(); @@ -280,7 +283,6 @@ MUIButton::MUIButton(wxWindow* parent, wxWindowID id, float scale_factor, const wxSize& size, long style) { Init(); - Create(parent, id, scale_factor, bitmap, bitmapState1, bitmapState2, pos, size, style); } @@ -302,7 +304,7 @@ bool MUIButton::Create(wxWindow* parent, wxWindowID id, float scale_factor, m_styleToolSize = wxSize(m_styleToolSize.x * 1.25, m_styleToolSize.y * 1.25); m_size = wxSize(m_styleToolSize.x * m_scaleFactor, - m_styleToolSize.y * m_scaleFactor); + m_styleToolSize.y * m_scaleFactor); CreateControls(); return true; @@ -316,20 +318,20 @@ void MUIButton::Init() { } void MUIButton::CreateControls() { -// this->SetForegroundColour(wxColour(255, 255, 255)); + // this->SetForegroundColour(wxColour(255, 255, 255)); -// wxColour backColor = GetGlobalColor(_T("GREY3")); -// SetBackgroundColour(backColor); + // wxColour backColor = GetGlobalColor(_T("GREY3")); + // SetBackgroundColour(backColor); -// this->SetFont(wxFont(8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, -// wxFONTWEIGHT_NORMAL, false, wxT("Tahoma"))); + // this->SetFont(wxFont(8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, + // wxFONTWEIGHT_NORMAL, false, wxT("Tahoma"))); } void MUIButton::SetColorScheme(ColorScheme cs) { #if 1 if (m_cs != cs) { wxColour backColor = GetGlobalColor(_T("GREY3")); - //SetBackgroundColour(backColor); + // SetBackgroundColour(backColor); ocpnStyle::Style* style = g_StyleManager->GetCurrentStyle(); @@ -426,7 +428,6 @@ void MUIButton::OnSize(wxSizeEvent& event) { } } - wxSize MUIButton::DoGetBestSize() const { // wxSize labelSize = wxDefaultSize; // GetTextExtent(m_Label, &labelSize.x, &labelSize.y); @@ -436,24 +437,122 @@ wxSize MUIButton::DoGetBestSize() const { m_styleToolSize.y * m_scaleFactor); } +//----------------------------------------------------------------------- +// SSFN Utils +//----------------------------------------------------------------------- +static std::unordered_map ssfn_glyph_map; + +/** + * Load a font + */ +ssfn_font_t* load_font(const char* filename) { + char* fontdata = NULL; + long int size; + FILE* f; +#if HAS_ZLIB + unsigned char hdr[2]; + gzFile g; +#endif + + f = fopen(filename, "rb"); + if (!f) { + fprintf(stderr, "unable to load %s\n", filename); + return NULL; + } + size = 0; +#if HAS_ZLIB + fread(&hdr, 2, 1, f); + if (hdr[0] == 0x1f && hdr[1] == 0x8b) { + fseek(f, -4L, SEEK_END); + fread(&size, 4, 1, f); + } else { + fseek(f, 0, SEEK_END); + size = ftell(f); + } + fclose(f); + g = gzopen(filename, "r"); +#else + fseek(f, 0, SEEK_END); + size = ftell(f); + fseek(f, 0, SEEK_SET); +#endif + if (!size) { + fprintf(stderr, "unable to load %s\n", filename); + exit(3); + } + fontdata = (char*)malloc(size); + if (!fontdata) { + fprintf(stderr, "memory allocation error\n"); + exit(2); + } +#if HAS_ZLIB + gzread(g, fontdata, size); + gzclose(g); +#else + fread(fontdata, size, 1, f); + fclose(f); +#endif + + return (ssfn_font_t*)fontdata; +} + +bool RenderGlyphToImageBuffer(unsigned char* buffer, ssfn_glyph_t* glyph, + int x_offset, int w, int h, int nominal_baseline, + wxColour& color, wxColour& back_color) { + unsigned char* src = glyph->data; + for (int i = 0; i < h; i++) { + for (int j = 0; j < glyph->w; j++) { + size_t index = i * w + j + x_offset; + index += (nominal_baseline - glyph->baseline) * w; + if (index > (size_t)h * (w - 1)) continue; + size_t didx = index * 3; + + size_t sidx = i * glyph->pitch + j; + unsigned char d = src[sidx]; + float dn = d / 256.; + buffer[didx] = (color.Red() * dn) + (back_color.Red() * (1 - dn)); + buffer[didx + 1] = (color.Green() * dn) + (back_color.Green() * (1 - dn)); + buffer[didx + 2] = (color.Blue() * dn) + (back_color.Blue() * (1 - dn)); + } + } + return true; +} +bool RenderStringToBuffer(unsigned char* buffer, std::string s, int wbox, + int hbox, int nominal_baseline, wxColour color, + wxColour& back_color) { + int xpos = 0; + for (unsigned int i = 0; i < s.size(); i++) { + char key = s[i]; + ssfn_glyph_t* glyph = 0; + // find the required glyph + if (auto findit = ssfn_glyph_map.find(key); + findit != ssfn_glyph_map.end()) { + glyph = findit->second; + } else { + glyph = ssfn_render(&ctx, key); + ssfn_glyph_map[key] = glyph; + } + RenderGlyphToImageBuffer(buffer, glyph, xpos, wbox, hbox, nominal_baseline, + color, back_color); + xpos += glyph->adv_x; + } + return true; +} //------------------------------------------------------------------------------ // MUITextButton //------------------------------------------------------------------------------ class MUITextButton { - public: MUITextButton(); - MUITextButton(wxWindow* parent, wxWindowID id = wxID_ANY, - float scale_factor = 1.0, - const wxString& text = wxEmptyString, + MUITextButton(wxWindow* parent, wxWindowID id, float scale_factor, + wxColor backColor, const wxString& text = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER); - bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, - float scale_factor = 1.0, + bool Create(wxWindow* parent, wxWindowID id, float scale_factor = 1.0, const wxString& text = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER); @@ -461,17 +560,16 @@ class MUITextButton { ~MUITextButton(); void Init(); - void CreateControls(); - + wxSize GetSize() { return m_size; } void SetState(int state); void SetColorScheme(ColorScheme cs); void OnSize(wxSizeEvent& event); void OnLeftDown(wxMouseEvent& event); void OnLeftUp(wxMouseEvent& event); - void SetText( const wxString &text); + void SetText(const wxString& text); - wxBitmap GetButtonBitmap(){ return m_bitmap; } + wxBitmap GetButtonBitmap() { return m_bitmap; } wxSize m_size; wxPoint m_position; @@ -485,25 +583,24 @@ class MUITextButton { float m_scaleFactor; wxSize m_styleToolSize; ColorScheme m_cs; - wxFont m_font; + int m_pixel_height; + int m_ssfn_status; + wxColor m_backgrounColor; }; - MUITextButton::MUITextButton() { Init(); } -MUITextButton::MUITextButton(wxWindow* parent, wxWindowID id, float scale_factor, - const wxString& text, - const wxPoint& pos, +MUITextButton::MUITextButton(wxWindow* parent, wxWindowID id, + float scale_factor, wxColor backColor, + const wxString& text, const wxPoint& pos, const wxSize& size, long style) { + m_backgrounColor = backColor; Init(); - - Create(parent, id, scale_factor, text, pos, size, style); } bool MUITextButton::Create(wxWindow* parent, wxWindowID id, float scale_factor, - const wxString& text, - const wxPoint& pos, + const wxString& text, const wxPoint& pos, const wxSize& size, long style) { m_text = text; @@ -511,71 +608,57 @@ bool MUITextButton::Create(wxWindow* parent, wxWindowID id, float scale_factor, m_styleToolSize = g_StyleManager->GetCurrentStyle()->GetToolSize(); - // Arbitrarily boost the MUITextButton default size above the style defined size. - // No good reason..... + // Arbitrarily boost the MUITextButton default size above the style defined + // size. No good reason..... m_styleToolSize = wxSize(m_styleToolSize.x * 1.25, m_styleToolSize.y * 1.25); int height_ref = m_styleToolSize.y; - // Really contorted logic to work around wxFont problems with Windows scaled displays, - // And the apparent failure of wxFont::Scale() - // Sorry... - int font_test_size = 12; - double target_size = 1.0; // Referenced to height of m_styleToolSize - wxFont *t_font = wxTheFontList->FindOrCreateFont( - font_test_size, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); - - int w, h; - wxScreenDC sdc; - //sdc.GetTextExtent("M", &w, &h, NULL, NULL, t_font); - h = t_font->GetPixelSize().y; - - double fraction = ((double)h) / (height_ref); - double new_font_size = font_test_size * (target_size /fraction); - new_font_size *= m_scaleFactor; - new_font_size *= m_scaleFactor; - -#ifdef __WXMSW__ - // No idea why this is required for MSW. Probably due to - // automatic font selection - new_font_size *= 0.6; -#endif - - m_font = *wxTheFontList->FindOrCreateFont(new_font_size, wxFONTFAMILY_MODERN, - wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD); -#ifndef __WXMSW__ - // Twek the font size on those platforms that correctly support wxFont::Scaled() - //sdc.GetTextExtent("M", &w, &h, NULL, NULL, &m_font); - //m_font = m_font.Scaled( 1.5 * target_size * (m_styleToolSize.y * m_scaleFactor) / h); -#endif - - wxCoord descent, exlead, gw, gh; - sdc.GetTextExtent(m_text, &gw, &gh, &descent, &exlead, &m_font); - - int min_width = gw * 1.2; - min_width *= OCPN_GetWinDIPScaleFactor(); - - m_size = wxSize(min_width, (m_styleToolSize.y * m_scaleFactor) - 1); + /* initialize the ssfn library, the context is zerod out */ + memset(&ctx, 0, sizeof(ssfn_t)); + wxString font_file = g_Platform->GetSharedDataDir() + "ssfndata/FreeSans.sfn"; + std::string sfont = font_file.ToStdString(); + ssfn_font_t* pssfn_font = NULL; + pssfn_font = load_font(sfont.c_str()); + if (pssfn_font) ssfn_load(&ctx, pssfn_font); + + m_pixel_height = height_ref / 2; + m_pixel_height *= m_scaleFactor; + + /* select the typeface to use */ + m_ssfn_status = + ssfn_select(&ctx, SSFN_FAMILY_SANS, NULL, /* family */ + SSFN_STYLE_REGULAR, m_pixel_height, /* style and size */ + SSFN_MODE_ALPHA /* rendering mode */ + ); + + int wbox = 20; + int hbox = 20; + + if (m_ssfn_status == SSFN_OK) { + std::string t = "1:888888"; + ssfn_bbox(&ctx, (char*)t.c_str(), 0, &wbox, &hbox); + } + m_size = wxSize(hbox * 1.5, m_styleToolSize.y); + m_size.y *= m_scaleFactor; - CreateControls(); return true; } - -MUITextButton::~MUITextButton() {} +MUITextButton::~MUITextButton() { + for (const auto& [key, value] : ssfn_glyph_map) { + free(value); + } + ssfn_glyph_map.clear(); +} void MUITextButton::Init() { mState = 0; m_cs = (ColorScheme)-1; // GLOBAL_COLOR_SCHEME_RGB; } -void MUITextButton::CreateControls() { - //wxColour backColor = GetGlobalColor(_T("GREY3")); - //SetBackgroundColour(backColor); -} - -void MUITextButton::SetText( const wxString &text){ - if (!m_text.IsSameAs(text)){ +void MUITextButton::SetText(const wxString& text) { + if (!m_text.IsSameAs(text)) { m_text = text; BuildBitmap(); } @@ -583,48 +666,53 @@ void MUITextButton::SetText( const wxString &text){ void MUITextButton::SetColorScheme(ColorScheme cs) { if (m_cs != cs) { - //wxColour backColor = GetGlobalColor(_T("GREY3")); - //SetBackgroundColour(backColor); + // wxColour backColor = GetGlobalColor(_T("GREY3")); + // SetBackgroundColour(backColor); m_cs = cs; } BuildBitmap(); } - -void MUITextButton::SetState(int state) { - mState = state; -} +void MUITextButton::SetState(int state) { mState = state; } void MUITextButton::OnSize(wxSizeEvent& event) { BuildBitmap(); return; } - -void MUITextButton::BuildBitmap(){ +void MUITextButton::BuildBitmap() { int width = m_size.x; int height = m_size.y; - //Make the bitmap - wxMemoryDC mdc; - wxBitmap bm(width, height); - mdc.SelectObject(bm); - wxColour backColor = *wxBLACK; //GetGlobalColor(_T("GREY3")); - mdc.SetBackground(backColor); - mdc.Clear(); + if (m_ssfn_status != SSFN_OK) return; - wxCoord descent, exlead, gw, gh; - mdc.SetFont(m_font); - mdc.GetTextExtent(m_text, &gw, &gh, &descent, &exlead); + int wbox, hbox; + std::string t = m_text.ToStdString(); + ssfn_bbox(&ctx, (char*)t.c_str(), 0, &wbox, &hbox); - mdc.SetTextForeground(GetGlobalColor("CHWHT")); - mdc.DrawText(m_text, (width-gw)/2, (height-gh)/2); + ssfn_glyph_t* glyph = ssfn_render(&ctx, '0'); + int baseline = glyph->baseline; + free(glyph); - mdc.SelectObject(wxNullBitmap); - m_bitmap = bm; -} + unsigned char* image_data = (unsigned char*)calloc(1, wbox * hbox * 3); + for (int i = 0; i < wbox * hbox; i++) { + int idx = i * 3; + image_data[idx] = m_backgrounColor.Red(); + image_data[idx + 1] = m_backgrounColor.Green(); + image_data[idx + 2] = m_backgrounColor.Blue(); + } + RenderStringToBuffer(image_data, t, wbox, hbox, baseline, + GetGlobalColor("CHWHT"), m_backgrounColor); + + wxImage fimage = wxImage(wbox, hbox, image_data); + wxSize clip_size = wxSize(wbox, baseline + 2); + wxRect clip_rect = wxRect(0, 0, clip_size.x, clip_size.y); + wxImage clip_image = fimage.GetSubImage(clip_rect); + + m_bitmap = wxBitmap(clip_image); +} #define CANVAS_OPTIONS_ANIMATION_TIMER_1 800 #define CANVAS_OPTIONS_TIMER 801 @@ -644,8 +732,7 @@ MUIBar::MUIBar(ChartCanvas* parent, int orientation, float size_factor, m_scaleFactor = size_factor; m_cs = (ColorScheme)-1; -// wxColour backColor = wxColor(*wxBLACK); //GetGlobalColor(m_backcolorString); -// SetBackgroundColour(backColor); + wxColour backColor = wxColor(*wxBLACK); // GetGlobalColor(m_backcolorString); Init(); CreateControls(); @@ -674,25 +761,24 @@ void MUIBar::Init() { m_canvasOptions = NULL; m_canvasOptionsAnimationTimer.SetOwner(this, CANVAS_OPTIONS_ANIMATION_TIMER_1); - m_backcolorString = _T("GREY3"); + m_backcolor = GetGlobalColor("GREY3"); m_capture_size_y = 0; m_COTopOffset = 60; // TODO should be below GPS/Compass CanvasOptionTimer.SetOwner(this, CANVAS_OPTIONS_TIMER); m_coAnimateByBitmaps = false; - m_bEffects = false; //true; + m_bEffects = false; // true; #ifdef __OCPN__ANDROID__ m_bEffects = false; #endif m_texture = 0; - m_end_margin = m_parentCanvas->GetCharWidth()/2; + m_end_margin = m_parentCanvas->GetCharWidth() / 2; m_scale = 0; } void MUIBar::SetColorScheme(ColorScheme cs) { if (m_cs != cs) { - if (m_zinButton) m_zinButton->SetColorScheme(cs); if (m_zoutButton) m_zoutButton->SetColorScheme(cs); if (m_followButton) m_followButton->SetColorScheme(cs); @@ -708,20 +794,20 @@ void MUIBar::InvalidateBitmap() { m_bitmap = wxNullBitmap; #ifdef ocpnUSE_GL - if(g_bopengl) { + if (g_bopengl) { glDeleteTextures(1, &m_texture); m_texture = 0; } #endif } -bool MUIBar::MouseEvent(wxMouseEvent &event) { +bool MUIBar::MouseEvent(wxMouseEvent& event) { int x, y; event.GetPosition(&x, &y); // Check the regions wxRect r = wxRect(m_screenPos, m_size); - if (r.Contains(x,y)) { + if (r.Contains(x, y)) { // Check buttons if (event.LeftDown()) { if (g_bShowMuiZoomButtons) { @@ -745,24 +831,26 @@ bool MUIBar::MouseEvent(wxMouseEvent &event) { } } - wxRect rfollow(m_followButton->m_position.x, m_followButton->m_position.y, - m_followButton->m_size.x, m_followButton->m_size.y); - rfollow.Offset(m_screenPos); - if (rfollow.Contains(x, y)) { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, ID_FOLLOW); - m_parentCanvas->GetEventHandler()->AddPendingEvent(evt); - if (g_focusCanvas) g_focusCanvas->TriggerDeferredFocus(); + if (m_followButton) { + wxRect rfollow(m_followButton->m_position.x, + m_followButton->m_position.y, m_followButton->m_size.x, + m_followButton->m_size.y); + rfollow.Offset(m_screenPos); + if (rfollow.Contains(x, y)) { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, ID_FOLLOW); + m_parentCanvas->GetEventHandler()->AddPendingEvent(evt); + if (g_focusCanvas) g_focusCanvas->TriggerDeferredFocus(); + } } wxRect rmenu(m_menuButton->m_position.x, m_menuButton->m_position.y, - m_menuButton->m_size.x, m_menuButton->m_size.y); + m_menuButton->m_size.x, m_menuButton->m_size.y); rmenu.Offset(m_screenPos); if (rmenu.Contains(x, y)) { HandleMenuClick(); if (g_focusCanvas) g_focusCanvas->TriggerDeferredFocus(); } - } - else if (event.LeftUp()) { + } else if (event.LeftUp()) { if (m_scaleButton) { wxRect rscale(m_scaleButton->m_position.x, m_scaleButton->m_position.y, m_scaleButton->m_size.x, m_scaleButton->m_size.y); @@ -820,41 +908,46 @@ void MUIBar::CreateControls() { if (g_bShowMuiZoomButtons) { m_zinButton = new MUIButton(m_parentCanvas, ID_ZOOMIN, m_scaleFactor, iconDir + _T("MUI_zoom-in.svg")); - m_zinButton->m_position = wxPoint(xoff,0); + m_zinButton->m_position = wxPoint(xoff, 0); xoff += m_zinButton->m_size.x; m_zoutButton = new MUIButton(m_parentCanvas, ID_ZOOMOUT, m_scaleFactor, iconDir + _T("MUI_zoom-out.svg")); - m_zoutButton->m_position = wxPoint(xoff,0); + m_zoutButton->m_position = wxPoint(xoff, 0); xoff += m_zoutButton->m_size.x; - } #ifndef __OCPN__ANDROID__ // Scale m_scaleButton = new MUITextButton(m_parentCanvas, wxID_ANY, m_scaleFactor, - "1:400000"); - m_scaleButton->m_position = wxPoint(xoff,0); + GetBackgroundColor(), "1:400000"); + + m_scaleButton->m_position = wxPoint(xoff, 0); + if (m_scaleButton->GetButtonBitmap().IsOk()) { + int bm_pos_y = (m_scaleButton->GetSize().y - + m_scaleButton->GetButtonBitmap().GetHeight()) / + 2; + m_scaleButton->m_position = wxPoint(xoff, bm_pos_y); + } xoff += m_scaleButton->m_size.x; m_followButton = new MUIButton(m_parentCanvas, ID_FOLLOW, m_scaleFactor, iconDir + _T("MUI_follow.svg"), iconDir + _T("MUI_follow_active.svg"), iconDir + _T("MUI_follow_ahead.svg")); - m_followButton->m_position = wxPoint(xoff,0); + m_followButton->m_position = wxPoint(xoff, 0); xoff += m_followButton->m_size.x; #endif m_menuButton = new MUIButton(m_parentCanvas, ID_MUI_MENU, m_scaleFactor, iconDir + _T("MUI_menu.svg")); - m_menuButton->m_position = wxPoint(xoff,0); + m_menuButton->m_position = wxPoint(xoff, 0); xoff += m_menuButton->m_size.x; m_size.x = xoff; m_size.y = m_zinButton->m_size.y; } else { - int yoff = 0; // Buttons @@ -866,9 +959,8 @@ void MUIBar::CreateControls() { m_zoutButton = new MUIButton(m_parentCanvas, ID_ZOOMOUT, m_scaleFactor, iconDir + _T("MUI_zoom-out.svg")); - m_zoutButton->m_position = wxPoint(0,yoff); + m_zoutButton->m_position = wxPoint(0, yoff); yoff += m_zoutButton->m_size.y; - } #ifndef __OCPN__ANDROID__ @@ -876,32 +968,30 @@ void MUIBar::CreateControls() { iconDir + _T("MUI_follow.svg"), iconDir + _T("MUI_follow_active.svg"), iconDir + _T("MUI_follow_ahead.svg")); - m_followButton->m_position = wxPoint(0,yoff); + m_followButton->m_position = wxPoint(0, yoff); yoff += m_followButton->m_size.y; #endif m_menuButton = new MUIButton(m_parentCanvas, ID_MUI_MENU, m_scaleFactor, iconDir + _T("MUI_menu.svg")); - m_menuButton->m_position = wxPoint(0,yoff); + m_menuButton->m_position = wxPoint(0, yoff); yoff += m_menuButton->m_size.y; m_size.y = yoff; m_size.x = m_zinButton->m_size.x; - } - } void MUIBar::SetBestPosition(void) { - int x = (m_parentCanvas->GetClientSize().x - (m_size.x + (m_end_margin) * 2.00)); + int x = + (m_parentCanvas->GetClientSize().x - (m_size.x + (m_end_margin) * 2.00)); int bottomOffset = 6; - int y = m_parentCanvas->GetClientSize().y - m_size.y - bottomOffset; - //if ( g_bopengl){ - // y -= m_parentCanvas->GetClientSize().y % 1; - // } + // if ( g_bopengl){ + // y -= m_parentCanvas->GetClientSize().y % 1; + // } wxPoint position = wxPoint(x, y); m_screenPos = position; @@ -912,15 +1002,13 @@ void MUIBar::SetBestPosition(void) { } } - void MUIBar::UpdateDynamicValues() { if (!m_scaleButton) return; wxString scaleString; int scale = m_parentCanvas->GetScaleValue(); - if (scale != m_scale) - InvalidateBitmap(); + if (scale != m_scale) InvalidateBitmap(); m_scale = scale; if (scale < 1e6) @@ -938,8 +1026,7 @@ void MUIBar::SetFollowButtonState(int state) { } } - -void MUIBar::HandleMenuClick(){ +void MUIBar::HandleMenuClick() { if (!m_canvasOptions) { m_canvasOptions = new CanvasOptions(m_parentCanvas); @@ -982,14 +1069,12 @@ void MUIBar::HandleMenuClick(){ wxMemoryDC mdcb; mdcb.SelectObject(m_backingBitmap); wxScreenDC sdc; - mdcb.Blit(0, 0, m_canvasOptionsFullSize.x + overShoot_x, - m_capture_size_y, &sdc, m_capturePoint.x - overShoot_x, - m_capturePoint.y, wxCOPY); + mdcb.Blit(0, 0, m_canvasOptionsFullSize.x + overShoot_x, m_capture_size_y, + &sdc, m_capturePoint.x - overShoot_x, m_capturePoint.y, wxCOPY); mdcb.SelectObject(wxNullBitmap); } PullCanvasOptions(); } - } void MUIBar::CaptureCanvasOptionsBitmap() { @@ -1011,8 +1096,8 @@ void MUIBar::CaptureCanvasOptionsBitmapChain(wxTimerEvent& event) { m_canvasOptions->SetSize(wxSize(-1, size_y)); - m_capturePoint = - m_parentCanvas->ClientToScreen(wxPoint(m_parentCanvas->GetSize().x, m_COTopOffset)); + m_capturePoint = m_parentCanvas->ClientToScreen( + wxPoint(m_parentCanvas->GetSize().x, m_COTopOffset)); m_canvasOptions->Move(m_capturePoint); m_canvasOptions->Show(); @@ -1021,8 +1106,9 @@ void MUIBar::CaptureCanvasOptionsBitmapChain(wxTimerEvent& event) { } else if (m_coSequence == 1) { - m_capturePoint = m_parentCanvas->ClientToScreen(wxPoint( - m_parentCanvas->GetSize().x - m_canvasOptionsFullSize.x, m_COTopOffset)); + m_capturePoint = m_parentCanvas->ClientToScreen( + wxPoint(m_parentCanvas->GetSize().x - m_canvasOptionsFullSize.x, + m_COTopOffset)); m_canvasOptions->Move(m_capturePoint); m_coSequence++; @@ -1045,61 +1131,56 @@ void MUIBar::CaptureCanvasOptionsBitmapChain(wxTimerEvent& event) { } } +wxBitmap& MUIBar::CreateBitmap(double displayScale) { + if (m_bitmap.IsOk()) return m_bitmap; -wxBitmap &MUIBar::CreateBitmap(double displayScale) { - if (m_bitmap.IsOk()) - return m_bitmap; - - //Make the bitmap + // Make the bitmap int width = m_size.x; int height = m_size.y; wxMemoryDC mdc; wxBitmap bm(width, height); mdc.SelectObject(bm); - mdc.SetBackground(*wxBLACK_BRUSH); + mdc.SetBackground(wxBrush(GetBackgroundColor())); + mdc.Clear(); wxBitmap bmd; if (g_bShowMuiZoomButtons) { wxBitmap bmd = m_zinButton->GetButtonBitmap(); if (bmd.IsOk()) - mdc.DrawBitmap(bmd, - m_zinButton->m_position.x, - m_zinButton->m_position.y, - false); + mdc.DrawBitmap(bmd, m_zinButton->m_position.x, m_zinButton->m_position.y, + false); bmd = m_zoutButton->GetButtonBitmap(); if (bmd.IsOk()) - mdc.DrawBitmap(bmd, - m_zoutButton->m_position.x, - m_zoutButton->m_position.y, - false); + mdc.DrawBitmap(bmd, m_zoutButton->m_position.x, + m_zoutButton->m_position.y, false); } if (m_scaleButton) { bmd = m_scaleButton->GetButtonBitmap(); - if (bmd.IsOk()) - mdc.DrawBitmap(bmd, - m_scaleButton->m_position.x, - m_scaleButton->m_position.y, - false); + if (bmd.IsOk()) { + int bm_pos_y = (m_scaleButton->GetSize().y - bmd.GetHeight()) / 2; + int bm_pos_x = m_scaleButton->m_position.x + + (m_scaleButton->GetSize().x - bmd.GetWidth()) / 2; + + mdc.DrawBitmap(bmd, bm_pos_x, bm_pos_y, false); + } } if (m_followButton) { bmd = m_followButton->GetButtonBitmap(); if (bmd.IsOk()) - mdc.DrawBitmap(bmd, - m_followButton->m_position.x, m_followButton->m_position.y, - false); + mdc.DrawBitmap(bmd, m_followButton->m_position.x, + m_followButton->m_position.y, false); } if (m_menuButton) { bmd = m_menuButton->GetButtonBitmap(); if (bmd.IsOk()) - mdc.DrawBitmap(bmd, - m_menuButton->m_position.x, m_menuButton->m_position.y, - false); + mdc.DrawBitmap(bmd, m_menuButton->m_position.x, + m_menuButton->m_position.y, false); } mdc.SelectObject(wxNullBitmap); @@ -1108,26 +1189,25 @@ wxBitmap &MUIBar::CreateBitmap(double displayScale) { return m_bitmap; } -void MUIBar::DrawGL(ocpnDC &gldc, double displayScale) { +void MUIBar::DrawGL(ocpnDC& gldc, double displayScale) { #ifdef ocpnUSE_GL - wxColour backColor = *wxBLACK; + wxColour backColor = GetBackgroundColor(); gldc.SetBrush(wxBrush(backColor)); gldc.SetPen(wxPen(backColor)); wxRect r = wxRect(m_screenPos, m_size); if (m_orientation == wxHORIZONTAL) - gldc.DrawRoundedRectangle((r.x - m_end_margin/2)*displayScale, - (r.y-1)*displayScale, - (r.width + m_end_margin)*displayScale, - (r.height+2)*displayScale, - (m_end_margin * 1)*displayScale); + gldc.DrawRoundedRectangle( + (r.x - m_end_margin / 2) * displayScale, (r.y - 1) * displayScale, + (r.width + m_end_margin) * displayScale, (r.height + 2) * displayScale, + (m_end_margin * 1) * displayScale); else - gldc.DrawRoundedRectangle((r.x-1)*displayScale, - (r.y- m_end_margin/2)*displayScale, - (r.width + 2)*displayScale, - (r.height + 2 * m_end_margin)*displayScale, - (m_end_margin * 1.5)*displayScale); + gldc.DrawRoundedRectangle((r.x - 1) * displayScale, + (r.y - m_end_margin / 2) * displayScale, + (r.width + 2) * displayScale, + (r.height + 2 * m_end_margin) * displayScale, + (m_end_margin * 1.5) * displayScale); int width = m_size.x; int height = m_size.y; @@ -1151,23 +1231,28 @@ void MUIBar::DrawGL(ocpnDC &gldc, double displayScale) { glBindTexture(g_texture_rectangle_format, m_texture); } - // fill texture data - wxImage image = m_bitmap.ConvertToImage(); - - unsigned char *d = image.GetData(); - unsigned char *e = new unsigned char[4 * width * height]; - for (int y = 0; y < height; y++) - for (int x = 0; x < width; x++) { - int i = y * width + x; - memcpy(e + 4 * i, d + 3 * i, 3); - e[4 * i + 3] = 255; //d[3*i + 2] == 255 ? 0:255; //255 - d[3 * i + 2]; + if (m_bitmap.IsOk()) { + wxImage image = m_bitmap.ConvertToImage(); + if (image.IsOk()) { + unsigned char* d = image.GetData(); + if (d) { + unsigned char* e = new unsigned char[4 * width * height]; + for (int y = 0; y < height; y++) + for (int x = 0; x < width; x++) { + int i = y * width + x; + memcpy(e + 4 * i, d + 3 * i, 3); + e[4 * i + 3] = + 255; // d[3*i + 2] == 255 ? 0:255; //255 - d[3 * i + 2]; + } + glTexImage2D(g_texture_rectangle_format, 0, GL_RGBA, width, height, 0, + GL_RGBA, GL_UNSIGNED_BYTE, e); + delete[] e; + glDisable(g_texture_rectangle_format); + glDisable(GL_BLEND); + } } - glTexImage2D(g_texture_rectangle_format, 0, GL_RGBA, width, height, 0, - GL_RGBA, GL_UNSIGNED_BYTE, e); - delete[] e; - glDisable(g_texture_rectangle_format); - glDisable(GL_BLEND); + } // Render the texture if (m_texture) { @@ -1177,8 +1262,10 @@ void MUIBar::DrawGL(ocpnDC &gldc, double displayScale) { int x0 = m_screenPos.x, x1 = x0 + width; int y0 = m_screenPos.y - 0, y1 = y0 + height; - x0 *= displayScale; x1 *= displayScale; - y0 *= displayScale; y1 *= displayScale; + x0 *= displayScale; + x1 *= displayScale; + y0 *= displayScale; + y1 *= displayScale; float tx, ty; if (GL_TEXTURE_RECTANGLE_ARB == g_texture_rectangle_format) @@ -1218,12 +1305,12 @@ void MUIBar::DrawGL(ocpnDC &gldc, double displayScale) { } #endif - return; + return; } -void MUIBar::DrawDC(ocpnDC &dc, double displayScale) { - CreateBitmap(1.0); - dc.DrawBitmap(m_bitmap, m_screenPos.x, m_screenPos.y, false); +void MUIBar::DrawDC(ocpnDC& dc, double displayScale) { + CreateBitmap(1.0); + dc.DrawBitmap(m_bitmap, m_screenPos.x, m_screenPos.y, false); } void MUIBar::ResetCanvasOptions() { diff --git a/gui/src/MarkInfo.cpp b/gui/src/MarkInfo.cpp index 145776c87c..feb154167d 100644 --- a/gui/src/MarkInfo.cpp +++ b/gui/src/MarkInfo.cpp @@ -355,10 +355,9 @@ void MarkInfoDlg::Create() { wxBoxSizer* bSizerNameValue = new wxBoxSizer(wxVERTICAL); - m_checkBoxShowName = new wxCheckBox( - m_panelBasicProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, - wxDefaultSize, - wxALIGN_CENTER_VERTICAL); + m_checkBoxShowName = + new wxCheckBox(m_panelBasicProperties, wxID_ANY, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_VERTICAL); bSizerName->Add(m_checkBoxShowName, 0, wxALL | wxALIGN_CENTER_VERTICAL, 5); m_textName = new wxTextCtrl(m_panelBasicProperties, wxID_ANY, wxEmptyString, @@ -871,7 +870,7 @@ void MarkInfoDlg::RecalculateSize(void) { Center(); #else wxSize dsize = GetParent()->GetClientSize(); - SetSize(wxMin(GetSize().x, dsize.x / 3), wxMax(GetSize().y, dsize.y / 1.5)); + SetSize(-1, wxMax(GetSize().y, dsize.y / 1.5)); #endif } @@ -920,7 +919,7 @@ void MarkInfoDlg::SetBulkEdit(bool bBulkEdit) { m_textCtrlExtDescription->Enable(!bBulkEdit); } -void MarkInfoDlg::SetRoutePoints(const std::vector &points) { +void MarkInfoDlg::SetRoutePoints(const std::vector& points) { m_pRoutePoints = points; SetRoutePoint(m_pRoutePoints[0]); SetBulkEdit(points.size() > 1); @@ -1698,7 +1697,8 @@ void MarkInfoDlg::ValidateMark(void) { bool MarkInfoDlg::SaveChanges() { if (m_pRoutePoint) { - if (m_pRoutePoints.size() <= 1) { // We are editing a single point, save everything + if (m_pRoutePoints.size() <= + 1) { // We are editing a single point, save everything if (m_pRoutePoint->m_bIsInLayer) return true; // Get User input Text Fields @@ -1799,15 +1799,20 @@ bool MarkInfoDlg::SaveChanges() { } else { // We are modifying multiple points, just a subset of properties is to be // modified for each of them and just in case they were actually changed - // We need to iterate in reverse order to save the first point in the vector until the end and be able to compere it's original values for changes... - for (std::vector::reverse_iterator rit = m_pRoutePoints.rbegin(); rit != m_pRoutePoints.rend(); ++rit) { + // We need to iterate in reverse order to save the first point in the + // vector until the end and be able to compere it's original values for + // changes... + for (std::vector::reverse_iterator rit = + m_pRoutePoints.rbegin(); + rit != m_pRoutePoints.rend(); ++rit) { RoutePoint* rp = *rit; - if (rp->m_bIsInLayer) continue; // Layer WP, skip it - if (m_pRoutePoint->m_WaypointArrivalRadius != wxAtof(m_textArrivalRadius->GetValue())) + if (rp->m_bIsInLayer) continue; // Layer WP, skip it + if (m_pRoutePoint->m_WaypointArrivalRadius != + wxAtof(m_textArrivalRadius->GetValue())) rp->SetWaypointArrivalRadius(m_textArrivalRadius->GetValue()); if (m_pRoutePoint->GetScaMin() != wxAtoi(m_textScaMin->GetValue())) rp->SetScaMin(m_textScaMin->GetValue()); - if (m_pRoutePoint-> GetUseSca() != m_checkBoxScaMin->GetValue()) + if (m_pRoutePoint->GetUseSca() != m_checkBoxScaMin->GetValue()) rp->SetUseSca(m_checkBoxScaMin->GetValue()); if (m_pRoutePoint->GetNameShown() != m_checkBoxShowName->GetValue()) rp->SetNameShown(m_checkBoxShowName->GetValue()); @@ -1822,9 +1827,9 @@ bool MarkInfoDlg::SaveChanges() { if (m_pRoutePoint->GetShowWaypointRangeRings() != (bool)(m_ChoiceWaypointRangeRingsNumber->GetSelection() != 0)) { rp->SetShowWaypointRangeRings( - (bool)(m_ChoiceWaypointRangeRingsNumber->GetSelection() != 0)); + (bool)(m_ChoiceWaypointRangeRingsNumber->GetSelection() != 0)); rp->SetWaypointRangeRingsNumber( - m_ChoiceWaypointRangeRingsNumber->GetSelection()); + m_ChoiceWaypointRangeRingsNumber->GetSelection()); } double value; @@ -1838,13 +1843,16 @@ bool MarkInfoDlg::SaveChanges() { if (m_textArrivalRadius->GetValue().ToDouble(&value)) rp->SetWaypointArrivalRadius(fromUsrDistance(value, -1)); - if (m_RangeRingUnits->GetSelection() != wxNOT_FOUND && m_pRoutePoint->GetWaypointRangeRingsStepUnits() != m_RangeRingUnits->GetSelection()) + if (m_RangeRingUnits->GetSelection() != wxNOT_FOUND && + m_pRoutePoint->GetWaypointRangeRingsStepUnits() != + m_RangeRingUnits->GetSelection()) rp->SetWaypointRangeRingsStepUnits(m_RangeRingUnits->GetSelection()); - if (m_pRoutePoint->m_TideStation != m_comboBoxTideStation->GetStringSelection()) + if (m_pRoutePoint->m_TideStation != + m_comboBoxTideStation->GetStringSelection()) rp->m_TideStation = m_comboBoxTideStation->GetStringSelection(); pConfig->UpdateWayPoint(rp); - //TODO: Something else? Will we bulk edit routepoints for example? + // TODO: Something else? Will we bulk edit routepoints for example? } } } diff --git a/gui/src/OCPNListCtrl.cpp b/gui/src/OCPNListCtrl.cpp index 2d3ccba9b8..09fc942b5f 100644 --- a/gui/src/OCPNListCtrl.cpp +++ b/gui/src/OCPNListCtrl.cpp @@ -182,9 +182,10 @@ wxString OCPNListCtrl::GetTargetColumnData(AisTargetData* pAISTarget, } case tlSOG: { - if (((pAISTarget->SOG > 100.) && !pAISTarget->b_SarAircraftPosnReport) || - (pAISTarget->Class == AIS_ATON) || (pAISTarget->Class == AIS_BASE) || - (pAISTarget->Class == AIS_METEO)) + if (((pAISTarget->SOG > 100.) && + !pAISTarget->b_SarAircraftPosnReport) || + (pAISTarget->Class == AIS_ATON) || + (pAISTarget->Class == AIS_BASE) || (pAISTarget->Class == AIS_METEO)) ret = _("-"); else ret.Printf(_T("%5.1f"), toUsrSpeed(pAISTarget->SOG)); diff --git a/gui/src/OCPNPlatform.cpp b/gui/src/OCPNPlatform.cpp index 527ccf5343..d3966dd5a4 100644 --- a/gui/src/OCPNPlatform.cpp +++ b/gui/src/OCPNPlatform.cpp @@ -50,7 +50,6 @@ #include "setupapi.h" // presently stored in opencpn/src #endif - #include #include #include @@ -111,7 +110,8 @@ #include "model/macutils.h" #endif -#if (defined(OCPN_GHC_FILESYSTEM) || (defined(__clang_major__) && (__clang_major__ < 15))) +#if (defined(OCPN_GHC_FILESYSTEM) || \ + (defined(__clang_major__) && (__clang_major__ < 15))) // MacOS 1.13 #include namespace fs = ghc::filesystem; @@ -247,7 +247,6 @@ static bool checkIfFlatpacked() { return id == "org.opencpn.OpenCPN"; } - OCPNPlatform::OCPNPlatform() { m_pt_per_pixel = 0; // cached value m_bdisableWindowsDisplayEnum = false; @@ -328,7 +327,7 @@ void catch_signals(int signo) { #ifdef OCPN_USE_CRASHREPORT // Define the crash callback int CALLBACK CrashCallback(CR_CRASH_CALLBACK_INFO *pInfo) { - wxLog::GetActiveTarget()->Flush(); // Flush log file + wxLog::GetActiveTarget()->Flush(); // Flush log file return CR_CB_DODEFAULT; } #endif @@ -548,11 +547,10 @@ void OCPNPlatform::Initialize_1(void) { #ifdef __ANDROID__ qDebug() << "Initialize_1()"; -//#ifdef NOASSERT - wxDisableAsserts( ); // No asserts at all in Release mode -//#endif + // #ifdef NOASSERT + wxDisableAsserts(); // No asserts at all in Release mode +// #endif #endif - } // Called from MyApp() immediately before creation of MyFrame() @@ -564,28 +562,28 @@ void OCPNPlatform::Initialize_2(void) { // Create some directories in App private directory // Mainly required for Android 11+, but useable on all versions. - wxChar sep = wxFileName::GetPathSeparator(); + wxChar sep = wxFileName::GetPathSeparator(); - wxString ChartDir = GetPrivateDataDir(); - if (ChartDir.Last() != sep) ChartDir.Append(sep); - ChartDir.Append( "Charts"); - if (!::wxDirExists(ChartDir)) { - ::wxMkdir(ChartDir); - } + wxString ChartDir = GetPrivateDataDir(); + if (ChartDir.Last() != sep) ChartDir.Append(sep); + ChartDir.Append("Charts"); + if (!::wxDirExists(ChartDir)) { + ::wxMkdir(ChartDir); + } - wxString GRIBDir = GetPrivateDataDir(); - if (GRIBDir.Last() != sep) GRIBDir.Append(sep); - GRIBDir.Append( "GRIBS"); - if (!::wxDirExists(GRIBDir)) { - ::wxMkdir(GRIBDir); - } + wxString GRIBDir = GetPrivateDataDir(); + if (GRIBDir.Last() != sep) GRIBDir.Append(sep); + GRIBDir.Append("GRIBS"); + if (!::wxDirExists(GRIBDir)) { + ::wxMkdir(GRIBDir); + } - // Set the default Import/Export directory for A11+ - if (g_Android_SDK_Version >= 30){ - if (!g_gpx_path.StartsWith(androidGetDownloadDirectory())){ - g_gpx_path = androidGetDownloadDirectory(); - } + // Set the default Import/Export directory for A11+ + if (g_Android_SDK_Version >= 30) { + if (!g_gpx_path.StartsWith(androidGetDownloadDirectory())) { + g_gpx_path = androidGetDownloadDirectory(); } + } #endif @@ -606,7 +604,7 @@ void OCPNPlatform::Initialize_3(void) { bool bcapable = IsGLCapable(); #ifdef ocpnARM // Boot arm* platforms (meaning rPI) without OpenGL on first run - //bcapable = false; + // bcapable = false; #endif bool bAndroid = false; @@ -614,15 +612,14 @@ void OCPNPlatform::Initialize_3(void) { bAndroid = true; #endif - if(!bcapable) + if (!bcapable) g_bopengl = false; else { - //g_bopengl = true; + // g_bopengl = true; g_bdisable_opengl = false; pConfig->UpdateSettings(); } - // Try to automatically switch to guaranteed usable GL mode on an OCPN upgrade // or fresh install @@ -688,7 +685,6 @@ void OCPNPlatform::OnExit_2(void) { #endif } - #ifdef ocpnUSE_GL bool HasGLExt(wxJSONValue &glinfo, const std::string ext) { @@ -713,14 +709,19 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { #endif fs::path gl_util_path = ep.parent_path().append(gl_util_exe); - if (!fs::exists(gl_util_path)) { //TODO: What to do if the utility is not found (Which it is not for developer builds that are not installed)? - wxLogMessage("OpenGL test utility not found at %s.", gl_util_path.c_str()); + if (!fs::exists(gl_util_path)) { // TODO: What to do if the utility is not + // found (Which it is not for developer + // builds that are not installed)? + wxLogMessage("OpenGL test utility not found at %s.", gl_util_path.c_str()); return false; } - std::string gl_json = fs::path(GetPrivateDataDir().ToStdString()).append("gl_caps.json").string(); + std::string gl_json = fs::path(GetPrivateDataDir().ToStdString()) + .append("gl_caps.json") + .string(); - wxString cmd = wxString::Format("\"%s\" opengl-info \"%s\"", gl_util_path.c_str(), gl_json.c_str()); + wxString cmd = wxString::Format("\"%s\" opengl-info \"%s\"", + gl_util_path.c_str(), gl_json.c_str()); wxLogMessage("Starting OpenGL test utility: %s", cmd); @@ -737,9 +738,9 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { wxJSONReader reader; wxJSONValue root; reader.Parse(fis, &root); - if (reader.GetErrorCount() > 0){ + if (reader.GetErrorCount() > 0) { wxLogMessage("Failed to parse JSON output from OpenGL test utility."); - for(const auto &l : reader.GetErrors()) { + for (const auto &l : reader.GetErrors()) { wxLogMessage(l); } return false; @@ -747,7 +748,7 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { OCPN_GLCaps *pcaps = (OCPN_GLCaps *)pbuf; - if(root.HasMember("GL_RENDERER")) { + if (root.HasMember("GL_RENDERER")) { pcaps->Renderer = root["GL_RENDERER"].AsString(); } else { wxLogMessage("GL_RENDERER not found."); @@ -765,7 +766,7 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { wxLogMessage("GL_SHADING_LANGUAGE_VERSION not found."); return false; } - if(root.HasMember("GL_USABLE")) { + if (root.HasMember("GL_USABLE")) { if (!root["GL_USABLE"].AsBool()) { wxLogMessage("OpenGL test utility reports that OpenGL is not usable."); return false; @@ -796,17 +797,20 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { pcaps->bOldIntel = false; - pcaps->bCanDoFBO = HasGLExt(root,"GL_EXT_framebuffer_object"); + pcaps->bCanDoFBO = HasGLExt(root, "GL_EXT_framebuffer_object"); if (!pcaps->TextureRectangleFormat) { pcaps->bCanDoFBO = false; } - pcaps->bCanDoVBO = HasGLExt(root, "GL_ARB_vertex_buffer_object"); //TODO: Or the old way where we enable it without querying the extension is right? + pcaps->bCanDoVBO = HasGLExt( + root, "GL_ARB_vertex_buffer_object"); // TODO: Or the old way where we + // enable it without querying the + // extension is right? gFrame->Show(); return true; #else - // The original codepath doing direct probing in the main OpenCPN process, now only for Android - // Investigate OpenGL capabilities + // The original codepath doing direct probing in the main OpenCPN process, now + // only for Android Investigate OpenGL capabilities gFrame->Show(); glTestCanvas *tcanvas = new glTestCanvas(gFrame); tcanvas->Show(); @@ -817,7 +821,7 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { OCPN_GLCaps *pcaps = (OCPN_GLCaps *)pbuf; char *str = (char *)glGetString(GL_RENDERER); - if (str == NULL) { //No GL at all... + if (str == NULL) { // No GL at all... wxLogMessage("GL_RENDERER not found."); delete tcanvas; delete pctx; @@ -826,7 +830,7 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { pcaps->Renderer = std::string(str); char *stv = (char *)glGetString(GL_VERSION); - if (stv == NULL) { //No GL Version... + if (stv == NULL) { // No GL Version... wxLogMessage("GL_VERSION not found"); delete tcanvas; delete pctx; @@ -835,7 +839,7 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { pcaps->Version = std::string(stv); char *stsv = (char *)glGetString(GL_SHADING_LANGUAGE_VERSION); - if (stsv == NULL) { //No GLSL... + if (stsv == NULL) { // No GLSL... wxLogMessage("GL_SHADING_LANGUAGE_VERSION not found"); delete tcanvas; delete pctx; @@ -846,7 +850,7 @@ bool OCPNPlatform::BuildGLCaps(void *pbuf) { pcaps->dGLSL_Version = 0; pcaps->dGLSL_Version = ::atof(pcaps->GLSL_Version.c_str()); - if (pcaps->dGLSL_Version < 1.2){ + if (pcaps->dGLSL_Version < 1.2) { wxString msg; msg.Printf(_T("GLCaps Probe: OpenGL-> GLSL Version reported: ")); msg += wxString(pcaps->GLSL_Version.c_str()); @@ -907,8 +911,7 @@ bool OCPNPlatform::IsGLCapable() { return false; #else - if(g_bdisable_opengl) - return false; + if (g_bdisable_opengl) return false; wxLogMessage("Starting OpenGL test..."); wxLog::FlushActive(); @@ -918,7 +921,7 @@ bool OCPNPlatform::IsGLCapable() { bool bcaps = BuildGLCaps(GL_Caps); wxLogMessage("OpenGL test complete."); - if (!bcaps){ + if (!bcaps) { wxLogMessage("BuildGLCaps fails."); wxLog::FlushActive(); return false; @@ -934,7 +937,7 @@ bool OCPNPlatform::IsGLCapable() { // We insist on FBO support, since otherwise DC mode is always faster on // canvas panning.. - if (!GL_Caps->bCanDoFBO) { + if (!GL_Caps->bCanDoFBO) { return false; } @@ -943,7 +946,7 @@ bool OCPNPlatform::IsGLCapable() { wxLog::FlushActive(); g_bdisable_opengl = false; - //g_bopengl = true; + // g_bopengl = true; // Update and flush the config file pConfig->UpdateSettings(); @@ -968,7 +971,6 @@ void OCPNPlatform::SetLocaleSearchPrefixes(void) { imsg += locale_location; wxLogMessage(imsg); - // Managed plugin location wxFileName usrShare(GetWinPluginBaseDir() + wxFileName::GetPathSeparator()); usrShare.RemoveLastDir(); @@ -1163,12 +1165,11 @@ wxString OCPNPlatform::ChangeLocale(wxString &newLocaleID, // precedent. for (unsigned int i = 0; i < g_locale_catalog_array.GetCount(); i++) { - if(!locale->AddCatalog(g_locale_catalog_array[i])){ + if (!locale->AddCatalog(g_locale_catalog_array[i])) { wxString emsg = _T("ERROR Loading translation catalog for: "); emsg += g_locale_catalog_array[i]; wxLogMessage(emsg); - } - else { + } else { wxString imsg = _T("Loaded translation catalog for: "); imsg += g_locale_catalog_array[i]; wxLogMessage(imsg); @@ -1272,7 +1273,6 @@ void OCPNPlatform::SetDefaultOptions(void) { g_bsmoothpanzoom = true; g_bShowMenuBar = true; #endif - } #ifdef __WXMSW__ @@ -1513,15 +1513,14 @@ void OCPNPlatform::SetUpgradeOptions(wxString vNew, wxString vOld) { // Check the tide/current databases for readability, // remove any not readable std::vector TCDS_temp; - for (unsigned int i=0; i < TideCurrentDataSet.size() ; i++) + for (unsigned int i = 0; i < TideCurrentDataSet.size(); i++) TCDS_temp.push_back(TideCurrentDataSet[i]); TideCurrentDataSet.clear(); - for (unsigned int i=0; i < TCDS_temp.size() ; i++){ + for (unsigned int i = 0; i < TCDS_temp.size(); i++) { wxString tide = TCDS_temp[i]; wxFileName ft(tide); - if (ft.FileExists()) - TideCurrentDataSet.push_back(TCDS_temp[i]); + if (ft.FileExists()) TideCurrentDataSet.push_back(TCDS_temp[i]); } } } @@ -1555,10 +1554,8 @@ wxString OCPNPlatform::GetSupplementalLicenseString() { // Per-Platform file/directory support //-------------------------------------------------------------------------- - static wxString ExpandPaths(wxString paths, OCPNPlatform *platform); - int OCPNPlatform::DoFileSelectorDialog(wxWindow *parent, wxString *file_spec, wxString Title, wxString initDir, wxString suggestedName, @@ -1745,13 +1742,13 @@ int OCPNPlatform::GetStatusBarFieldCount() { double OCPNPlatform::getFontPointsperPixel(void) { double pt_per_pixel = 1.0; - //#ifdef __ANDROID__ - // On Android, this calculation depends on the density bucket in use. - // Also uses some magic numbers... - // For reference, see http://pixplicity.com/dp-px-converter/ - // pt_per_pixel = 14.0 / (31.11 * getAndroidDisplayDensity()) ; + // #ifdef __ANDROID__ + // On Android, this calculation depends on the density bucket in use. + // Also uses some magic numbers... + // For reference, see http://pixplicity.com/dp-px-converter/ + // pt_per_pixel = 14.0 / (31.11 * getAndroidDisplayDensity()) ; - //#else + // #else if (m_pt_per_pixel == 0) { // Make a measurement... @@ -1768,7 +1765,7 @@ double OCPNPlatform::getFontPointsperPixel(void) { if (height > 0) m_pt_per_pixel = 12.0 / (double)height; } if (m_pt_per_pixel > 0) pt_per_pixel = m_pt_per_pixel; - //#endif + // #endif return pt_per_pixel; } @@ -2068,8 +2065,7 @@ double OCPNPlatform::GetCompassScaleFactor(int GUIScaleFactor) { #if defined(__WXOSX__) || defined(__WXGTK3__) // Support scaled HDPI displays. - if (gFrame) - rv *= gFrame->GetContentScaleFactor(); + if (gFrame) rv *= gFrame->GetContentScaleFactor(); #endif rv /= g_BasePlatform->GetDisplayDIPMult(gFrame); @@ -2098,10 +2094,10 @@ float OCPNPlatform::GetChartScaleFactorExp(float scale_linear) { } float OCPNPlatform::GetMarkScaleFactorExp(float scale_linear) { - if(scale_linear <= 0) + if (scale_linear <= 0) return GetChartScaleFactorExp(scale_linear); else - return GetChartScaleFactorExp(scale_linear-1); + return GetChartScaleFactorExp(scale_linear - 1); } // float OCPNPlatform::GetDIPScaleFactor() { @@ -2216,7 +2212,6 @@ QString getQtStyleSheet(void) { return g_qtStyleSheet; } #endif - bool OCPNPlatform::isPlatformCapable(int flag) { #ifndef __ANDROID__ return true; diff --git a/gui/src/OCPNRegion.cpp b/gui/src/OCPNRegion.cpp index 51f312db20..a16d7d884f 100644 --- a/gui/src/OCPNRegion.cpp +++ b/gui/src/OCPNRegion.cpp @@ -75,7 +75,7 @@ struct _OGdkRectangle { int height; }; -//#define gboolean bool; +// #define gboolean bool; typedef struct _OGdkSegment OGdkSegment; struct _OGdkSegment { @@ -196,18 +196,18 @@ typedef struct _OPOINTBLOCK { */ \ if ((dy) != 0) { \ xStart = (x1); \ - dx = (x2)-xStart; \ + dx = (x2) - xStart; \ if (dx < 0) { \ m = dx / (dy); \ m1 = m - 1; \ - incr1 = -2 * dx + 2 * (dy)*m1; \ - incr2 = -2 * dx + 2 * (dy)*m; \ - d = 2 * m * (dy)-2 * dx - 2 * (dy); \ + incr1 = -2 * dx + 2 * (dy) * m1; \ + incr2 = -2 * dx + 2 * (dy) * m; \ + d = 2 * m * (dy) - 2 * dx - 2 * (dy); \ } else { \ m = dx / (dy); \ m1 = m + 1; \ - incr1 = 2 * dx - 2 * (dy)*m1; \ - incr2 = 2 * dx - 2 * (dy)*m; \ + incr1 = 2 * dx - 2 * (dy) * m1; \ + incr2 = 2 * dx - 2 * (dy) * m; \ d = -2 * m * (dy) + 2 * dx; \ } \ } \ @@ -881,12 +881,12 @@ wxRect OCPNRegionIterator::GetRect() const { * the y-x-banding that's so nice to have... */ -//#include "config.h" -//#include -//#include -//#include -//#include "gdkregion-generic.h" -//#include "gdkalias.h" +// #include "config.h" +// #include +// #include +// #include +// #include "gdkregion-generic.h" +// #include "gdkalias.h" typedef void (*overlapFunc)(OGdkRegion *pReg, OGdkRegionBox *r1, OGdkRegionBox *r1End, OGdkRegionBox *r2, diff --git a/gui/src/Quilt.cpp b/gui/src/Quilt.cpp index b9728a5a06..431245ef66 100644 --- a/gui/src/Quilt.cpp +++ b/gui/src/Quilt.cpp @@ -1101,7 +1101,8 @@ bool Quilt::IsChartSmallestScale(int dbIndex) { LLRegion Quilt::GetHiliteRegion() { LLRegion r; - //TODO Idea: convert this to an array of smaller regions. Should be faster to compose... + // TODO Idea: convert this to an array of smaller regions. Should be faster + // to compose... for (auto &index : m_HiLiteIndexArray) { const ChartTableEntry &cte = ChartData->GetChartTableEntry(index); @@ -1326,10 +1327,10 @@ bool Quilt::BuildExtendedChartStackAndCandidateArray(int ref_db_index, m_canvas_scale_factor / (double)candidate_chart_scale; double zoom_factor = vp_local.view_scale_ppm / chart_native_ppm; if ((zoom_factor < zoom_test_val) && - // MBTILES charts report the scale of their smallest layer (i.e. most - // detailed) as native chart scale, even if they are embedding many more - // layers. Since we don't know their maximum scale at this stage, we don't - // skip the chart if this native scale is apparently too small. + // MBTILES charts report the scale of their smallest layer (i.e. most + // detailed) as native chart scale, even if they are embedding many more + // layers. Since we don't know their maximum scale at this stage, we + // don't skip the chart if this native scale is apparently too small. (cte.GetChartType() != CHART_TYPE_MBTILES)) { m_extended_stack_array.pop_back(); continue; @@ -1390,8 +1391,8 @@ bool Quilt::BuildExtendedChartStackAndCandidateArray(int ref_db_index, if (cte.GetChartType() == CHART_TYPE_CM93COMP) m_fullscreen_index_array.push_back(i); - // On android, SDK > 29, we require that the directory of charts be "writable" - // as determined by Android Java file system + // On android, SDK > 29, we require that the directory of charts be + // "writable" as determined by Android Java file system #ifdef __OCPN__ANDROID__ wxFileName fn(cte.GetFullSystemPath()); if (!androidIsDirWritable(fn.GetPath())) continue; @@ -1415,8 +1416,8 @@ bool Quilt::BuildExtendedChartStackAndCandidateArray(int ref_db_index, if (!m_bquiltskew && fabs(skew_norm) > 1.0) continue; - // Special case for S57 ENC - // Add the chart only if the chart's fractional area exceeds n% + // Special case for S57 ENC + // Add the chart only if the chart's fractional area exceeds n% #if 0 if( CHART_TYPE_S57 == cte.GetChartType() ) { //Get the fractional area of this candidate @@ -2386,7 +2387,7 @@ bool Quilt::Compose(const ViewPort &vp_in) { for (ir = 0; ir < m_pcandidate_array->GetCount(); ir++) { QuiltCandidate *pqc = m_pcandidate_array->Item(ir); if ((pqc->b_include) && (!pqc->b_eclipsed)) { - if (!ChartData->IsChartLocked(pqc->dbIndex)) //Not locked, or not loaded + if (!ChartData->IsChartLocked(pqc->dbIndex)) // Not locked, or not loaded ChartData->OpenChartFromDBAndLock(pqc->dbIndex, FULL_INIT, true); } } @@ -2860,7 +2861,7 @@ bool Quilt::DoRenderQuiltRegionViewOnDC(wxMemoryDC &dc, ViewPort &vp, rdc.SelectObject(wxNullBitmap); } } // box not empty - } // m_nHiLiteIndex + } // m_nHiLiteIndex // Fogging.... if (g_fog_overzoom) { diff --git a/gui/src/RolloverWin.cpp b/gui/src/RolloverWin.cpp index d68e2e7d74..5bc7bde597 100644 --- a/gui/src/RolloverWin.cpp +++ b/gui/src/RolloverWin.cpp @@ -59,7 +59,8 @@ extern MyFrame *gFrame; extern BasePlatform *g_BasePlatform; BEGIN_EVENT_TABLE(RolloverWin, wxWindow) -EVT_PAINT(RolloverWin::OnPaint) EVT_TIMER(ROLLOVER_TIMER, RolloverWin::OnTimer) +EVT_PAINT(RolloverWin::OnPaint) +EVT_TIMER(ROLLOVER_TIMER, RolloverWin::OnTimer) EVT_MOUSE_EVENTS(RolloverWin::OnMouseEvent) END_EVENT_TABLE() @@ -82,8 +83,7 @@ EVT_PAINT(RolloverWin::OnPaint) EVT_TIMER(ROLLOVER_TIMER, RolloverWin::OnTimer) RolloverWin::~RolloverWin() { delete m_pbm; #ifdef ocpnUSE_GL - if (g_bopengl) - glDeleteTextures(1, &m_texture); + if (g_bopengl) glDeleteTextures(1, &m_texture); #endif } void RolloverWin::OnTimer(wxTimerEvent &event) { @@ -152,7 +152,7 @@ void RolloverWin::SetBitmap(int rollover) { mdc.SetTextForeground(FontMgr::Get().GetFontColor(text)); #ifdef __WXOSX__ - mdc.SetTextForeground(wxColour(0,0,0)); + mdc.SetTextForeground(wxColour(0, 0, 0)); #endif if (m_plabelFont && m_plabelFont->IsOk()) { @@ -263,33 +263,32 @@ void RolloverWin::Draw(ocpnDC &dc) { ChartCanvas *pCanvas = wxDynamicCast(GetParent(), ChartCanvas); if (pCanvas) - pCanvas->GetglCanvas()->RenderTextures(dc, coords, uv, 4, pCanvas->GetpVP()); + pCanvas->GetglCanvas()->RenderTextures(dc, coords, uv, 4, + pCanvas->GetpVP()); glDisable(g_texture_rectangle_format); glDisable(GL_BLEND); } else { #ifdef __WXOSX__ - // Support MacBook Retina display - if(g_bopengl){ - double scale = m_parent->GetContentScaleFactor(); - if(scale > 1){ - wxImage image = m_pbm->ConvertToImage(); - image.Rescale( image.GetWidth() * scale, image.GetHeight() * scale); - wxBitmap bmp( image ); - dc.DrawBitmap(bmp, m_position.x, m_position.y, false); - } - else - dc.DrawBitmap(*m_pbm, m_position.x, m_position.y, false); - } - else + // Support MacBook Retina display + if (g_bopengl) { + double scale = m_parent->GetContentScaleFactor(); + if (scale > 1) { + wxImage image = m_pbm->ConvertToImage(); + image.Rescale(image.GetWidth() * scale, image.GetHeight() * scale); + wxBitmap bmp(image); + dc.DrawBitmap(bmp, m_position.x, m_position.y, false); + } else dc.DrawBitmap(*m_pbm, m_position.x, m_position.y, false); -#else + } else dc.DrawBitmap(*m_pbm, m_position.x, m_position.y, false); +#else + dc.DrawBitmap(*m_pbm, m_position.x, m_position.y, false); #endif } #else - dc.DrawBitmap(*m_pbm, m_position.x, m_position.y, false); + dc.DrawBitmap(*m_pbm, m_position.x, m_position.y, false); #endif } @@ -313,7 +312,8 @@ void RolloverWin::SetBestPosition(int x, int y, int off_x, int off_y, break; } - int font_size = wxMax(8 * g_current_monitor_dip_px_ratio, dFont->GetPointSize()); + int font_size = + wxMax(8 * g_current_monitor_dip_px_ratio, dFont->GetPointSize()); font_size /= OCPN_GetWinDIPScaleFactor(); m_plabelFont = FontMgr::Get().FindOrCreateFont( @@ -338,11 +338,11 @@ void RolloverWin::SetBestPosition(int x, int y, int off_x, int off_y, h = 10; } - m_size.x = w + sizeM.x; m_size.y = h + sizeM.y; - m_size *= OCPN_GetWinDIPScaleFactor(); //g_BasePlatform->GetDisplayDPIMult(this); + m_size *= + OCPN_GetWinDIPScaleFactor(); // g_BasePlatform->GetDisplayDPIMult(this); int xp, yp; if ((x + off_x + m_size.x) > parent_size.x) { diff --git a/gui/src/RoutePropDlg.cpp b/gui/src/RoutePropDlg.cpp index 86933c7726..b1448f6e97 100644 --- a/gui/src/RoutePropDlg.cpp +++ b/gui/src/RoutePropDlg.cpp @@ -45,10 +45,9 @@ EVT_CHAR(RoutePropDlg::OnKeyChar) #endif END_EVENT_TABLE() - -extern Routeman *g_pRouteMan; -extern RoutePropDlgImpl *pRoutePropDialog; -extern RouteManagerDialog *pRouteManagerDialog; +extern Routeman* g_pRouteMan; +extern RoutePropDlgImpl* pRoutePropDialog; +extern RouteManagerDialog* pRouteManagerDialog; RoutePropDlgCtx RoutePropDlg::GetDlgCtx() { struct RoutePropDlgCtx ctx; @@ -214,10 +213,9 @@ RoutePropDlg::RoutePropDlg(wxWindow* parent, wxWindowID id, 5); #ifdef __ANDROID__ int ys = GetCharHeight(); - m_dpDepartureDate->SetMinSize(wxSize(-1, ys * 15/10)); + m_dpDepartureDate->SetMinSize(wxSize(-1, ys * 15 / 10)); #endif - #ifdef __WXGTK__ m_tpDepartureTime = new TimeCtrl(m_pnlBasic, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize); @@ -284,9 +282,8 @@ RoutePropDlg::RoutePropDlg(wxWindow* parent, wxWindowID id, m_stStyle->Wrap(-1); bSizerStyle->Add(m_stStyle, 0, wxALL, 5); - wxString m_choiceStyleChoices[] = {_("Default"), _("Solid"), - _("Dot"), _("Long dash"), - _("Short dash")}; + wxString m_choiceStyleChoices[] = {_("Default"), _("Solid"), _("Dot"), + _("Long dash"), _("Short dash")}; int m_choiceStyleNChoices = sizeof(m_choiceStyleChoices) / sizeof(wxString); m_choiceStyle = new wxChoice(m_pnlBasic, wxID_ANY, wxDefaultPosition, wxDefaultSize, @@ -645,14 +642,16 @@ RoutePropDlg::RoutePropDlg(wxWindow* parent, wxWindowID id, EVT_ROUTEMAN_DEL_TRK); Bind(EVT_ROUTEMAN_DEL_TRK, [&](ObservedEvt& ev) { auto t = std::const_pointer_cast(UnpackEvtPointer(ev)); - RoutemanGui(*g_pRouteMan).DeleteTrack(t.get()); }); + RoutemanGui(*g_pRouteMan).DeleteTrack(t.get()); + }); wxDEFINE_EVENT(EVT_ROUTEMAN_DEL_ROUTE, ObservedEvt); navobj_del_route_listener.Listen(navobj->evt_delete_route, this, EVT_ROUTEMAN_DEL_ROUTE); Bind(EVT_ROUTEMAN_DEL_ROUTE, [&](ObservedEvt& ev) { auto r = std::const_pointer_cast(UnpackEvtPointer(ev)); - g_pRouteMan->DeleteRoute(r.get(), navobj); }); + g_pRouteMan->DeleteRoute(r.get(), navobj); + }); } RoutePropDlg::~RoutePropDlg() { diff --git a/gui/src/RoutePropDlgImpl.cpp b/gui/src/RoutePropDlgImpl.cpp index ccdb343308..8097854dc3 100644 --- a/gui/src/RoutePropDlgImpl.cpp +++ b/gui/src/RoutePropDlgImpl.cpp @@ -1,4 +1,4 @@ -/*************************************************************************** +/*************************************************************************** * * Project: OpenCPN * @@ -254,8 +254,7 @@ RoutePropDlgImpl::RoutePropDlgImpl(wxWindow* parent, wxWindowID id, NULL, this); #ifdef __WXOSX__ - Connect(wxEVT_ACTIVATE, - wxActivateEventHandler(RoutePropDlgImpl::OnActivate), + Connect(wxEVT_ACTIVATE, wxActivateEventHandler(RoutePropDlgImpl::OnActivate), NULL, this); #endif } @@ -281,13 +280,13 @@ RoutePropDlgImpl* RoutePropDlgImpl::getInstance(wxWindow* parent) { return single; } -void RoutePropDlgImpl::OnActivate(wxActivateEvent& event){ - wxFrame* pWin = wxDynamicCast(event.GetEventObject(), wxFrame); - long int style = pWin->GetWindowStyle(); - if (event.GetActive()) - pWin->SetWindowStyle(style | wxSTAY_ON_TOP); - else - pWin->SetWindowStyle(style ^ wxSTAY_ON_TOP); +void RoutePropDlgImpl::OnActivate(wxActivateEvent& event) { + wxFrame* pWin = wxDynamicCast(event.GetEventObject(), wxFrame); + long int style = pWin->GetWindowStyle(); + if (event.GetActive()) + pWin->SetWindowStyle(style | wxSTAY_ON_TOP); + else + pWin->SetWindowStyle(style ^ wxSTAY_ON_TOP); } void RoutePropDlgImpl::RecalculateSize(void) { @@ -775,8 +774,10 @@ void RoutePropDlgImpl::WaypointsOnDataViewListCtrlSelectionChanged( if (selected_row >= 0 && selected_row < m_dvlcWaypoints->GetItemCount()) { RoutePoint* prp = m_pRoute->GetPoint(selected_row + 1); if (prp) { - gFrame->JumpToPosition(gFrame->GetPrimaryCanvas(), prp->m_lat, prp->m_lon, - gFrame->GetPrimaryCanvas()->GetVPScale()); + if (gFrame->GetFocusCanvas()) { + gFrame->JumpToPosition(gFrame->GetFocusCanvas(), prp->m_lat, prp->m_lon, + gFrame->GetFocusCanvas()->GetVPScale()); + } #ifdef __WXMSW__ if (m_dvlcWaypoints) m_dvlcWaypoints->SetFocus(); #endif @@ -913,7 +914,8 @@ void RoutePropDlgImpl::OnRoutePropMenuSelected(wxCommandEvent& event) { RoutePoint* pRP = m_pRoute->GetPoint( static_cast(reinterpret_cast(selection.GetID()))); - RouteManagerDialog::WptShowPropertiesDialog(std::vector {pRP}, this); + RouteManagerDialog::WptShowPropertiesDialog(std::vector{pRP}, + this); break; } } diff --git a/gui/src/S57QueryDialog.cpp b/gui/src/S57QueryDialog.cpp index 7d88b464d9..b92cfc8367 100644 --- a/gui/src/S57QueryDialog.cpp +++ b/gui/src/S57QueryDialog.cpp @@ -229,6 +229,14 @@ void S57QueryDialog::OnHtmlLinkClicked(wxHtmlLinkEvent& event) { wxTextFile txf(filen.GetFullPath()); if (txf.Open()) { wxString contents; + if (filen.GetExt().Lower() == "txt") { + contents += + ""; + } wxString str; str = txf.GetFirstLine(); do { @@ -239,6 +247,9 @@ void S57QueryDialog::OnHtmlLinkClicked(wxHtmlLinkEvent& event) { str = txf.GetNextLine(); } while (!txf.Eof()); + if (filen.GetExt().Lower() == "txt") { + contents += ""; + } ExtraObjInfoDlg->m_phtml->SetPage(contents); } diff --git a/gui/src/SencManager.cpp b/gui/src/SencManager.cpp index 7a55abf1b6..264c9cfe70 100644 --- a/gui/src/SencManager.cpp +++ b/gui/src/SencManager.cpp @@ -264,8 +264,8 @@ SENCBuildThread::SENCBuildThread(SENCJobTicket *ticket, } void *SENCBuildThread::Entry() { - //#ifdef __MSVC__ - // _set_se_translator(my_translate); + // #ifdef __MSVC__ + // _set_se_translator(my_translate); // On Windows, if anything in this thread produces a SEH exception (like // access violation) we handle the exception locally, and simply alow the @@ -273,7 +273,7 @@ void *SENCBuildThread::Entry() { // got done, and maybe try again later. try - //#endif + // #endif { // Start the SENC build Osenc senc; @@ -311,7 +311,7 @@ void *SENCBuildThread::Entry() { return 0; } // try - //#ifdef __MSVC__ + // #ifdef __MSVC__ catch (const std::exception &e /*SE_Exception e*/) { const char *msg = e.what(); if (m_manager) { @@ -325,5 +325,5 @@ void *SENCBuildThread::Entry() { return 0; } - //#endif + // #endif } diff --git a/gui/src/SendToGpsDlg.cpp b/gui/src/SendToGpsDlg.cpp index fe34ecf1a9..2bd69a736d 100644 --- a/gui/src/SendToGpsDlg.cpp +++ b/gui/src/SendToGpsDlg.cpp @@ -51,9 +51,10 @@ IMPLEMENT_DYNAMIC_CLASS(SendToGpsDlg, wxDialog) BEGIN_EVENT_TABLE(SendToGpsDlg, wxDialog) EVT_BUTTON(ID_STG_CANCEL, SendToGpsDlg::OnCancelClick) - EVT_BUTTON(ID_STG_OK, SendToGpsDlg::OnSendClick) END_EVENT_TABLE() +EVT_BUTTON(ID_STG_OK, SendToGpsDlg::OnSendClick) +END_EVENT_TABLE() - SendToGpsDlg::SendToGpsDlg() { + SendToGpsDlg::SendToGpsDlg() { m_itemCommListBox = NULL; m_pgauge = NULL; m_SendButton = NULL; diff --git a/gui/src/SendToPeerDlg.cpp b/gui/src/SendToPeerDlg.cpp index 481fbf80dc..07c70caf6e 100644 --- a/gui/src/SendToPeerDlg.cpp +++ b/gui/src/SendToPeerDlg.cpp @@ -29,7 +29,9 @@ #include "model/cmdline.h" #include "model/config_vars.h" +#include "model/mdns_cache.h" #include "model/mDNS_query.h" +#include "model/ocpn_utils.h" #include "model/peer_client.h" #include "model/route.h" #include "model/route_point.h" @@ -53,8 +55,6 @@ extern MyFrame* gFrame; extern OCPNPlatform* g_Platform; -extern std::vector> g_DNS_cache; -extern wxDateTime g_DNS_cache_time; static PeerDlgResult ConfirmWriteDlg() { std::string msg(_("Objects exists on server. OK to overwrite?")); @@ -102,7 +102,7 @@ static PeerDlgResult RunStatusDlg(PeerDlg kind, int status) { int r = dlg.ShowModal(); return r == wxID_OK ? PeerDlgResult::Ok : PeerDlgResult::Cancel; } - case PeerDlg::BadPincode: { + case PeerDlg::BadPincode: { std::string msg(_("Pincode not accepted")); OCPNMessageDialog dlg(NULL, msg, _("OpenCPN Info"), wxICON_ERROR | wxOK | wxCANCEL); @@ -128,8 +128,8 @@ std::pair RunPincodeDlg() { wxDefaultPosition, wxDefaultSize, SYMBOL_PCD_STYLE); static const char* const msg = - _("A server pin is needed.\n" - "Please enter PIN number from server to pair with this device"); + _("A server pin is needed.\n" + "Please enter PIN number from server to pair with this device"); dlg.SetMessage(msg); dlg.SetPincodeText(""); @@ -171,6 +171,11 @@ SendToPeerDlg::SendToPeerDlg() { premtext = NULL; m_scanTime = 5; // default, seconds m_bScanOnCreate = false; + + // Get our own local ipv4 address, for filtering + std::vector ipv4_addrs = get_local_ipv4_addresses(); + if (ipv4_addrs.size()) m_ownipAddr = ipv4_addrs[0]; + #ifdef __ANDROID__ androidDisableRotation(); #endif @@ -216,7 +221,7 @@ bool SendToPeerDlg::Create(wxWindow* parent, wxWindowID id, bool SendToPeerDlg::EnableActivateChkbox() { return m_RouteList.size() == 1 && m_RoutePointList.empty() && - m_TrackList.empty(); + m_TrackList.empty(); } void SendToPeerDlg::CreateControls(const wxString&) { @@ -236,20 +241,24 @@ void SendToPeerDlg::CreateControls(const wxString&) { m_PeerListBox = new wxComboBox(this, ID_STP_CHOICE_PEER); // Fill in the wxComboBox with all detected peers - for (unsigned int i = 0; i < g_DNS_cache.size(); i++) { - wxString item(g_DNS_cache[i]->hostname.c_str()); + for (auto& entry : MdnsCache::GetInstance().GetCache()) { + wxString item(entry.hostname.c_str()); // skip "self" - if (!g_hostname.IsSameAs(item.BeforeFirst('.'))) { + if (!g_hostname.IsSameAs(item.BeforeFirst('.')) || + (m_ownipAddr != entry.ip)) { item += " {"; - item += g_DNS_cache[i]->ip.c_str(); + item += entry.ip.c_str(); item += "}"; m_PeerListBox->Append(item); } } if (m_PeerListBox->GetCount()) m_PeerListBox->SetSelection(0); - + m_PeerListBox->Bind(wxEVT_TEXT, [&](wxCommandEvent&) { + m_SendButton->Enable(m_PeerListBox->GetValue() != ""); + }); + m_PeerListBox->Enable(!m_bScanOnCreate); comm_box_sizer->Add(m_PeerListBox, 0, wxEXPAND | wxALL, 5); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); @@ -265,15 +274,12 @@ void SendToPeerDlg::CreateControls(const wxString&) { itemBoxSizer2->AddSpacer(30); itemBoxSizer2->Add(new wxStaticLine(this), wxSizerFlags(0).Expand()); - m_activate_chkbox = new wxCheckBox(this, wxID_ANY, - _("Activate after transfer"), - wxDefaultPosition, wxDefaultSize, - wxALIGN_RIGHT); - itemBoxSizer2->Add(m_activate_chkbox, 0, - wxALIGN_RIGHT | wxALL, 10); + m_activate_chkbox = + new wxCheckBox(this, wxID_ANY, _("Activate after transfer"), + wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT); + itemBoxSizer2->Add(m_activate_chkbox, 0, wxALIGN_RIGHT | wxALL, 10); if (!EnableActivateChkbox()) m_activate_chkbox->Disable(); - // OK/Cancel/etc. wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer16, 0, wxALIGN_RIGHT | wxALL, 5); @@ -286,6 +292,7 @@ void SendToPeerDlg::CreateControls(const wxString&) { wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer16->Add(m_SendButton, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); m_SendButton->SetDefault(); + m_SendButton->Enable(!m_PeerListBox->IsListEmpty()); } void SendToPeerDlg::SetMessage(wxString msg) { @@ -303,6 +310,9 @@ void SendToPeerDlg::OnSendClick(wxCommandEvent&) { // Set up transfer data PeerData peer_data(progress); ParsePeer(m_PeerListBox->GetValue(), peer_data); + auto addr_port = ocpn::split(peer_data.dest_ip_address, ":"); + if (addr_port.size() == 1) addr_port.push_back("8443"); + MdnsCache::GetInstance().Add(addr_port[0], addr_port[1]); peer_data.routes = m_RouteList; peer_data.tracks = m_TrackList; peer_data.routepoints = m_RoutePointList; @@ -345,29 +355,29 @@ void SendToPeerDlg::OnTimerScanTick(wxTimerEvent&) { m_ScanTickTimer.Stop(); g_Platform->HideBusySpinner(); m_RescanButton->Enable(); - m_SendButton->Enable(); m_SendButton->SetDefault(); m_pgauge->Hide(); + m_PeerListBox->Enable(true); m_bScanOnCreate = false; // Clear the combo box m_PeerListBox->Clear(); // Fill in the wxComboBox with all detected peers - for (unsigned int i = 0; i < g_DNS_cache.size(); i++) { - wxString item(g_DNS_cache[i]->hostname.c_str()); + for (auto& entry : MdnsCache::GetInstance().GetCache()) { + wxString item(entry.hostname.c_str()); // skip "self" - if (!g_hostname.IsSameAs(item.BeforeFirst('.'))) { + if (!g_hostname.IsSameAs(item.BeforeFirst('.')) || + (m_ownipAddr != entry.ip)) { item += " {"; - item += g_DNS_cache[i]->ip.c_str(); + item += entry.ip.c_str(); item += "}"; m_PeerListBox->Append(item); } } if (m_PeerListBox->GetCount()) m_PeerListBox->SetSelection(0); - - g_DNS_cache_time = wxDateTime::Now(); + m_SendButton->Enable(m_PeerListBox->GetCount() > 0); } } diff --git a/gui/src/TCDS_Ascii_Harmonic.cpp b/gui/src/TCDS_Ascii_Harmonic.cpp index 445e7f9219..da83e70744 100644 --- a/gui/src/TCDS_Ascii_Harmonic.cpp +++ b/gui/src/TCDS_Ascii_Harmonic.cpp @@ -205,7 +205,7 @@ TC_Error_Code TCDS_Ascii_Harmonic::init_index_file() { } } #endif - } // while (more file) + } // while (more file) if (index_in_memory) IndexFileIO(IFF_CLOSE, 0); // All done with file } // index file can't be opened // if (hwndBusy) DestroyWindow(hwndBusy); diff --git a/gui/src/TCDS_Binary_Harmonic.cpp b/gui/src/TCDS_Binary_Harmonic.cpp index 62596846d3..1e2cb3bef8 100644 --- a/gui/src/TCDS_Binary_Harmonic.cpp +++ b/gui/src/TCDS_Binary_Harmonic.cpp @@ -305,8 +305,7 @@ TCDS_Binary_Harmonic::TCDS_Binary_Harmonic() { // Build the units array } -TCDS_Binary_Harmonic::~TCDS_Binary_Harmonic() -{ +TCDS_Binary_Harmonic::~TCDS_Binary_Harmonic() { for (int i = 0; i < num_csts; i++) { free(m_cst_nodes[i]); free(m_cst_epochs[i]); diff --git a/gui/src/TTYWindow.cpp b/gui/src/TTYWindow.cpp index acea3d2236..301558c0a3 100644 --- a/gui/src/TTYWindow.cpp +++ b/gui/src/TTYWindow.cpp @@ -82,9 +82,9 @@ TTYWindow::TTYWindow(wxWindow* parent, int n_lines, wxStaticBoxSizer* bbSizer1 = new wxStaticBoxSizer(buttonBox, wxVERTICAL); m_btn_pause = new wxButton(this, wxID_ANY, _("Pause"), wxDefaultPosition, - wxDefaultSize, 0); + wxDefaultSize, 0); m_btn_copy = new wxButton(this, wxID_ANY, _("Copy"), wxDefaultPosition, - wxDefaultSize, 0); + wxDefaultSize, 0); m_btn_copy->SetToolTip(_("Copy NMEA Debug window to clipboard.")); bbSizer1->Add(m_btn_pause, 0, wxALL, 5); @@ -92,11 +92,11 @@ TTYWindow::TTYWindow(wxWindow* parent, int n_lines, bSizerBottomContainer->Add(bbSizer1, 1, wxALL | wxEXPAND, 5); m_btn_copy->Connect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(TTYWindow::OnCopyClick), NULL, - this); + wxCommandEventHandler(TTYWindow::OnCopyClick), NULL, + this); m_btn_pause->Connect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(TTYWindow::OnPauseClick), NULL, - this); + wxCommandEventHandler(TTYWindow::OnPauseClick), NULL, + this); m_is_paused = false; } @@ -111,7 +111,8 @@ TTYWindow::~TTYWindow() { void TTYWindow::CreateLegendBitmap() { double dip_factor = OCPN_GetWinDIPScaleFactor(); wxScreenDC dcs; - wxFont font(10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + wxFont font(10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL); int width, height; dcs.GetTextExtent("M", &width, &height, NULL, NULL, &font); double ref_dim = height * dip_factor; @@ -128,7 +129,7 @@ void TTYWindow::CreateLegendBitmap() { int y = ref_dim * .25; int bsize = ref_dim; int text_x = ref_dim * 1.5; - int boff = ref_dim *.25; + int boff = ref_dim * .25; wxBrush b1(wxColour(_T("DARK GREEN"))); dc.SetBrush(b1); @@ -142,8 +143,8 @@ void TTYWindow::CreateLegendBitmap() { dc.DrawRectangle(boff, y, bsize, bsize); dc.SetTextForeground(wxColour(_T("CORAL"))); dc.DrawText( - _("Input message filtered, output message filtered and dropped"), text_x, - y); + _("Input message filtered, output message filtered and dropped"), + text_x, y); y += yp; wxBrush b3(wxColour(_T("MAROON"))); diff --git a/gui/src/TrackPropDlg.cpp b/gui/src/TrackPropDlg.cpp index 8afb8bcfe8..f2685f2f10 100644 --- a/gui/src/TrackPropDlg.cpp +++ b/gui/src/TrackPropDlg.cpp @@ -164,8 +164,7 @@ TrackPropDlg::TrackPropDlg(wxWindow* parent, wxWindowID id, this); #ifdef __WXOSX__ - Connect(wxEVT_ACTIVATE, - wxActivateEventHandler(TrackPropDlg::OnActivate), + Connect(wxEVT_ACTIVATE, wxActivateEventHandler(TrackPropDlg::OnActivate), NULL, this); #endif @@ -261,16 +260,15 @@ TrackPropDlg::~TrackPropDlg() { instanceFlag = false; } -void TrackPropDlg::OnActivate(wxActivateEvent& event){ - DIALOG_PARENT* pWin = wxDynamicCast(event.GetEventObject(), DIALOG_PARENT); - long int style = pWin->GetWindowStyle(); - if (event.GetActive()) - pWin->SetWindowStyle(style | wxSTAY_ON_TOP); - else - pWin->SetWindowStyle(style ^ wxSTAY_ON_TOP); +void TrackPropDlg::OnActivate(wxActivateEvent& event) { + DIALOG_PARENT* pWin = wxDynamicCast(event.GetEventObject(), DIALOG_PARENT); + long int style = pWin->GetWindowStyle(); + if (event.GetActive()) + pWin->SetWindowStyle(style | wxSTAY_ON_TOP); + else + pWin->SetWindowStyle(style ^ wxSTAY_ON_TOP); } - void TrackPropDlg::RecalculateSize(void) { // Make an estimate of the dialog size, without scrollbars showing @@ -497,9 +495,8 @@ void TrackPropDlg::CreateControlsCompact() { itemFlexGridSizer6b->Add(staticTextStyle, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - wxString m_chStyleChoices[] = {_("Default"), _("Solid"), - _("Dot"), _("Long dash"), - _("Short dash")}; + wxString m_chStyleChoices[] = {_("Default"), _("Solid"), _("Dot"), + _("Long dash"), _("Short dash")}; int m_chStyleNChoices = sizeof(m_chStyleChoices) / sizeof(wxString); m_cStyle = new wxChoice(itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, @@ -664,9 +661,9 @@ void TrackPropDlg::CreateControls(void) { #endif - //#ifdef __ANDROID__ - // m_panelBasic->GetHandle()->setStyleSheet( getQtStyleSheet()); - //#endif + // #ifdef __ANDROID__ + // m_panelBasic->GetHandle()->setStyleSheet( getQtStyleSheet()); + // #endif wxBoxSizer* bSizerBasic = new wxBoxSizer(wxVERTICAL); m_panelBasic->SetSizer(bSizerBasic); @@ -740,7 +737,7 @@ void TrackPropDlg::CreateControls(void) { // m_stStyle->Wrap( -1 ); sbSizerParams->Add(m_stStyle, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - wxString m_cStyleChoices[] = {_("Default"), _("Solid"), _("Dot"), + wxString m_cStyleChoices[] = {_("Default"), _("Solid"), _("Dot"), _("Long dash"), _("Short dash")}; int m_cStyleNChoices = sizeof(m_cStyleChoices) / sizeof(wxString); m_cStyle = new wxChoice(m_panelBasic, wxID_ANY, wxDefaultPosition, @@ -819,18 +816,21 @@ void TrackPropDlg::CreateControls(void) { m_rbShowTimeUTC = new wxRadioButton(m_panel0, wxID_ANY, _("UTC"), wxDefaultPosition, wxDefaultSize, 0); bSizerShowTime->Add(m_rbShowTimeUTC, 0, - wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); + wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, + 5); m_rbShowTimePC = new wxRadioButton(m_panel0, wxID_ANY, _("Local @ PC"), wxDefaultPosition, wxDefaultSize, 0); bSizerShowTime->Add(m_rbShowTimePC, 0, - wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); + wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, + 5); m_rbShowTimeLocal = new wxRadioButton(m_panel0, wxID_ANY, _("LMT @ Track Start"), wxDefaultPosition, wxDefaultSize, 0); bSizerShowTime->Add(m_rbShowTimeLocal, 0, - wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); + wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, + 5); m_rbShowTimePC->SetValue(true); @@ -1177,7 +1177,7 @@ bool TrackPropDlg::UpdateProperties() { // Time wxString time_form; wxTimeSpan time(0, 0, (int)total_seconds, 0); - //TODO Construct a readable time string, e.g. "xx Days, 15:34" + // TODO Construct a readable time string, e.g. "xx Days, 15:34" if (total_seconds > 3600. * 24.) time_form = time.Format("%H:%M"); else if (total_seconds > 0.) @@ -1428,8 +1428,10 @@ void TrackPropDlg::OnTrackPropListClick(wxListEvent& event) { m_nSelected = selected_no + 1; m_sdbBtmBtnsSizerSplit->Enable(true); } - gFrame->JumpToPosition(gFrame->GetPrimaryCanvas(), prp->m_lat, prp->m_lon, - gFrame->GetPrimaryCanvas()->GetVPScale()); + if (gFrame->GetFocusCanvas()) { + gFrame->JumpToPosition(gFrame->GetFocusCanvas(), prp->m_lat, prp->m_lon, + gFrame->GetFocusCanvas()->GetVPScale()); + } #ifdef __WXMSW__ if (m_lcPoints) m_lcPoints->SetFocus(); #endif @@ -1455,7 +1457,7 @@ void TrackPropDlg::OnToRouteBtnClick(wxCommandEvent& event) { void TrackPropDlg::OnExportBtnClick(wxCommandEvent& event) { wxString suggested_name = _("track"); - std::vector list = { m_pTrack }; + std::vector list = {m_pTrack}; if (m_pTrack->GetName() != wxEmptyString) suggested_name = m_pTrack->GetName(); ExportGPXTracks(this, &list, suggested_name); @@ -1739,9 +1741,8 @@ void TrackPropDlg::OnOKBtnClick(wxCommandEvent& event) { // Look in the track list to be sure the track is still available // (May have been deleted by RouteManagerDialog...) - bool b_found_track = - std::find(g_TrackList.begin(), g_TrackList.end(), m_pTrack) != - g_TrackList.end(); + bool b_found_track = std::find(g_TrackList.begin(), g_TrackList.end(), + m_pTrack) != g_TrackList.end(); if (b_found_track) { SaveChanges(); // write changes to globals and update config @@ -1761,9 +1762,8 @@ void TrackPropDlg::OnOKBtnClick(wxCommandEvent& event) { } void TrackPropDlg::OnCancelBtnClick(wxCommandEvent& event) { - bool b_found_track = - std::find(g_TrackList.begin(), g_TrackList.end(), m_pTrack) != - g_TrackList.end(); + bool b_found_track = std::find(g_TrackList.begin(), g_TrackList.end(), + m_pTrack) != g_TrackList.end(); if (b_found_track) m_pTrack->ClearHighlights(); diff --git a/gui/src/about.cpp b/gui/src/about.cpp index ec0648df70..2363a8df19 100644 --- a/gui/src/about.cpp +++ b/gui/src/about.cpp @@ -66,7 +66,7 @@ wxString OpenCPNVersion("\n Version "); const wxString AboutText = wxT("
OpenCPN
") - wxT("(c) 2000-2023 The OpenCPN Authors

"); + wxT("(c) 2000-2024 The OpenCPN Authors

"); const wxString OpenCPNInfo = wxT("

") @@ -204,10 +204,10 @@ about::about(wxWindow* parent, wxString Data_Locn, wxWindowID id, pAuthorHTMLCtl = NULL; m_blicensePageSet = false; - if(strlen(DEBIAN_PPA_VERSION)) - OpenCPNVersion += wxString(DEBIAN_PPA_VERSION); + if (strlen(DEBIAN_PPA_VERSION)) + OpenCPNVersion += wxString(DEBIAN_PPA_VERSION); else - OpenCPNVersion += wxString(PACKAGE_VERSION); + OpenCPNVersion += wxString(PACKAGE_VERSION); Create(parent, id, caption, pos, size, style); } diff --git a/gui/src/ais.cpp b/gui/src/ais.cpp index 6863b60fb6..5aedff6f23 100644 --- a/gui/src/ais.cpp +++ b/gui/src/ais.cpp @@ -362,13 +362,16 @@ void AISDrawAreaNotices(ocpnDC &dc, ViewPort &vp, ChartCanvas *cp) { points.push_back(target_point); for (int i = 0; i < 18; ++i) { - ll_gc_ll(lat1, lon1, sa->left_bound_deg + i * (sa->right_bound_deg - sa->left_bound_deg) / 18 , sa->radius_m / 1852.0, - &lat, &lon); + ll_gc_ll( + lat1, lon1, + sa->left_bound_deg + + i * (sa->right_bound_deg - sa->left_bound_deg) / 18, + sa->radius_m / 1852.0, &lat, &lon); GetCanvasPointPix(vp, cp, lat, lon, &target_point); points.push_back(target_point); } // Last angle explicitly to avoid any rounding errors - ll_gc_ll(lat1, lon1, sa->right_bound_deg , sa->radius_m / 1852.0, + ll_gc_ll(lat1, lon1, sa->right_bound_deg, sa->radius_m / 1852.0, &lat, &lon); GetCanvasPointPix(vp, cp, lat, lon, &target_point); points.push_back(target_point); @@ -469,8 +472,9 @@ static void AtoN_Diamond(ocpnDC &dc, wxPen pen, int x, int y, int radius, dc.SetPen(aton_DrawPen); dc.DrawLines(5, diamond, x, y); - aton_DrawPen = wxPen(GetGlobalColor(_T ( "UBLCK" )), - pen.GetWidth()); // Change drawing pen to Solid and width 1 + aton_DrawPen = + wxPen(GetGlobalColor(_T ( "UBLCK" )), + pen.GetWidth()); // Change drawing pen to Solid and width 1 aton_WhiteBorderPen = wxPen(GetGlobalColor(_T ( "CHWHT" )), aton_DrawPen.GetWidth() + 2); @@ -745,7 +749,8 @@ static void AISSetMetrics() { AIS_width_cogpredictor_base = 3 * AIS_nominal_line_width_pix; AIS_width_cogpredictor_line = 1.3 * AIS_nominal_line_width_pix; AIS_width_target_outline = 1.4 * AIS_nominal_line_width_pix; - AIS_icon_diameter = AIS_intercept_bar_circle_diameter * AIS_user_scale_factor * AIS_scale_factor; + AIS_icon_diameter = AIS_intercept_bar_circle_diameter * + AIS_user_scale_factor * AIS_scale_factor; wxFont *font = FontMgr::Get().GetFont(_("AIS Target Name"), 12); double scaler = DPIscale; @@ -1315,15 +1320,19 @@ static void AISDrawTarget(AisTargetData *td, ocpnDC &dc, ViewPort &vp, TargetPoint.x + met_radius / 2, TargetPoint.y - met_radius / 2); } else if (td->Class == AIS_ATON) { // Aid to Navigation - AtoN_Diamond(dc, wxPen(UBLCK, AIS_width_target_outline), TargetPoint.x, TargetPoint.y, AIS_icon_diameter * 1.5, td); + AtoN_Diamond(dc, wxPen(UBLCK, AIS_width_target_outline), TargetPoint.x, + TargetPoint.y, AIS_icon_diameter * 1.5, td); } else if (td->Class == AIS_BASE) { // Base Station - Base_Square(dc, wxPen(UBLCK, AIS_width_target_outline), TargetPoint.x, TargetPoint.y, AIS_icon_diameter); + Base_Square(dc, wxPen(UBLCK, AIS_width_target_outline), TargetPoint.x, + TargetPoint.y, AIS_icon_diameter); } else if (td->Class == AIS_SART) { // SART Target if (td->NavStatus == 14) // active - SART_Render(dc, wxPen(URED, AIS_width_target_outline), TargetPoint.x, TargetPoint.y, AIS_icon_diameter); - else - SART_Render(dc, wxPen(GetGlobalColor(_T ( "UGREN" )), AIS_width_target_outline), TargetPoint.x, + SART_Render(dc, wxPen(URED, AIS_width_target_outline), TargetPoint.x, TargetPoint.y, AIS_icon_diameter); + else + SART_Render( + dc, wxPen(GetGlobalColor(_T ( "UGREN" )), AIS_width_target_outline), + TargetPoint.x, TargetPoint.y, AIS_icon_diameter); } else if (td->b_SarAircraftPosnReport) { int airtype = (td->MMSI % 1000) / 100; // xxxyyy5zz >> helicopter @@ -1730,7 +1739,7 @@ static void AISDrawTarget(AisTargetData *td, ocpnDC &dc, ViewPort &vp, TargetPoint.y /*+ (0.5 * h)*/); } // If name do not empty - } // if scale + } // if scale } // Draw tracks if enabled diff --git a/gui/src/ais_info_gui.cpp b/gui/src/ais_info_gui.cpp index 8406f19cc6..f4c923f3b3 100644 --- a/gui/src/ais_info_gui.cpp +++ b/gui/src/ais_info_gui.cpp @@ -33,7 +33,6 @@ #include #endif // precompiled headers - #include #include #include @@ -66,19 +65,19 @@ extern int g_iSoundDeviceIndex; extern OCPNPlatform *g_Platform; extern Route *pAISMOBRoute; extern wxString g_CmdSoundString; -extern MyConfig* pConfig; +extern MyConfig *pConfig; extern RouteManagerDialog *pRouteManagerDialog; -extern MyFrame* gFrame; +extern MyFrame *gFrame; extern AisInfoGui *g_pAISGUI; static void onSoundFinished(void *ptr) { if (!g_bquiting) { wxCommandEvent ev(SOUND_PLAYED_EVTYPE); - wxPostEvent(g_pAISGUI, ev); // FIXME(leamas): Review sound handling. + wxPostEvent(g_pAISGUI, ev); // FIXME(leamas): Review sound handling. } } -static void OnNewAisWaypoint(RoutePoint* pWP) { +static void OnNewAisWaypoint(RoutePoint *pWP) { pConfig->AddNewWayPoint(pWP, -1); // , -1 use auto next num if (pRouteManagerDialog && pRouteManagerDialog->IsShown()) pRouteManagerDialog->UpdateWptListCtrl(); @@ -91,60 +90,56 @@ static void OnNewAisWaypoint(RoutePoint* pWP) { } } -const static char* const kDeleteTrackPrompt = -_(R"( +const static char *const kDeleteTrackPrompt = _(R"( This AIS target has Persistent Tracking selected by MMSI properties A Persistent track recording will therefore be restarted for this target. Do you instead want to stop Persistent Tracking for this target? )"); - -static void OnDeleteTrack(MmsiProperties* props) { +static void OnDeleteTrack(MmsiProperties *props) { if (wxID_NO == OCPNMessageBox(NULL, kDeleteTrackPrompt, _("OpenCPN Info"), - wxYES_NO | wxCENTER, 60)) - { + wxYES_NO | wxCENTER, 60)) { props->m_bPersistentTrack = true; } } - AisInfoGui::AisInfoGui() { ais_info_listener.Listen(g_pAIS->info_update, this, EVT_AIS_INFO); Bind(EVT_AIS_INFO, [&](ObservedEvt &ev) { - auto ptr = ev.GetSharedPtr(); - auto palert_target = std::static_pointer_cast(ptr); - ShowAisInfo(palert_target); } - ); + auto ptr = ev.GetSharedPtr(); + auto palert_target = std::static_pointer_cast(ptr); + ShowAisInfo(palert_target); + }); ais_touch_listener.Listen(g_pAIS->touch_state, this, EVT_AIS_TOUCH); Bind(EVT_AIS_TOUCH, [&](wxCommandEvent ev) { gFrame->TouchAISActive(); }); ais_wp_listener.Listen(g_pAIS->new_ais_wp, this, EVT_AIS_WP); Bind(EVT_AIS_WP, [&](wxCommandEvent ev) { - auto pWP = static_cast(ev.GetClientData()); - OnNewAisWaypoint(pWP); }); + auto pWP = static_cast(ev.GetClientData()); + OnNewAisWaypoint(pWP); + }); - ais_new_track_listener.Listen(g_pAIS->new_ais_wp, this, - EVT_AIS_NEW_TRACK); + ais_new_track_listener.Listen(g_pAIS->new_ais_wp, this, EVT_AIS_NEW_TRACK); Bind(EVT_AIS_NEW_TRACK, [&](wxCommandEvent ev) { - auto t = static_cast(ev.GetClientData()); - pConfig->AddNewTrack(t); }); + auto t = static_cast(ev.GetClientData()); + pConfig->AddNewTrack(t); + }); - ais_del_track_listener.Listen(g_pAIS->new_ais_wp, this, - EVT_AIS_DEL_TRACK); + ais_del_track_listener.Listen(g_pAIS->new_ais_wp, this, EVT_AIS_DEL_TRACK); Bind(EVT_AIS_DEL_TRACK, [&](wxCommandEvent ev) { - auto t = static_cast< MmsiProperties*>(ev.GetClientData()); - OnDeleteTrack(t); }); + auto t = static_cast(ev.GetClientData()); + OnDeleteTrack(t); + }); - Bind(SOUND_PLAYED_EVTYPE, [&](wxCommandEvent ev) { - OnSoundFinishedAISAudio(ev); }); + Bind(SOUND_PLAYED_EVTYPE, + [&](wxCommandEvent ev) { OnSoundFinishedAISAudio(ev); }); m_AIS_Sound = 0; m_bAIS_Audio_Alert_On = false; m_bAIS_AlertPlaying = false; - } void AisInfoGui::OnSoundFinishedAISAudio(wxCommandEvent &event) { @@ -157,12 +152,13 @@ void AisInfoGui::OnSoundFinishedAISAudio(wxCommandEvent &event) { m_bAIS_AlertPlaying = false; } -void AisInfoGui::ShowAisInfo(std::shared_ptr palert_target) { - if (!palert_target) return; +void AisInfoGui::ShowAisInfo( + std::shared_ptr palert_target) { + if (!palert_target) return; - int audioType = AISAUDIO_NONE; + int audioType = AISAUDIO_NONE; - switch (palert_target->Class){ + switch (palert_target->Class) { case AIS_DSC: audioType = AISAUDIO_DSC; break; @@ -172,52 +168,50 @@ void AisInfoGui::ShowAisInfo(std::shared_ptr palert_target) default: audioType = AISAUDIO_CPA; break; - } + } - // If no alert dialog shown yet... - if (!g_pais_alert_dialog_active) { - bool b_jumpto = (palert_target->Class == AIS_SART) || - (palert_target->Class == AIS_DSC); - bool b_createWP = palert_target->Class == AIS_DSC; - bool b_ack = palert_target->Class != AIS_DSC; + // If no alert dialog shown yet... + if (!g_pais_alert_dialog_active) { + bool b_jumpto = + (palert_target->Class == AIS_SART) || (palert_target->Class == AIS_DSC); + bool b_createWP = palert_target->Class == AIS_DSC; + bool b_ack = palert_target->Class != AIS_DSC; - // Show the Alert dialog + // Show the Alert dialog - // See FS# 968/998 - // If alert occurs while OCPN is iconized to taskbar, then clicking - // the taskbar icon only brings up the Alert dialog, and not the - // entire application. This is an OS specific behavior, not seen on - // linux or Mac. This patch will allow the audio alert to occur, and - // the visual alert will pop up soon after the user selects the OCPN - // icon from the taskbar. (on the next timer tick, probably) + // See FS# 968/998 + // If alert occurs while OCPN is iconized to taskbar, then clicking + // the taskbar icon only brings up the Alert dialog, and not the + // entire application. This is an OS specific behavior, not seen on + // linux or Mac. This patch will allow the audio alert to occur, and + // the visual alert will pop up soon after the user selects the OCPN + // icon from the taskbar. (on the next timer tick, probably) #ifndef __ANDROID__ - if (gFrame->IsIconized() || !gFrame->IsActive()) - gFrame->RequestUserAttention(); + if (gFrame->IsIconized() || !gFrame->IsActive()) + gFrame->RequestUserAttention(); #endif - if (!gFrame->IsIconized()) { - AISTargetAlertDialog *pAISAlertDialog = new AISTargetAlertDialog(); - pAISAlertDialog->Create(palert_target->MMSI, gFrame, g_pAIS, - b_jumpto, b_createWP, b_ack, -1, - _("AIS Alert")); + if (!gFrame->IsIconized()) { + AISTargetAlertDialog *pAISAlertDialog = new AISTargetAlertDialog(); + pAISAlertDialog->Create(palert_target->MMSI, gFrame, g_pAIS, b_jumpto, + b_createWP, b_ack, -1, _("AIS Alert")); - g_pais_alert_dialog_active = pAISAlertDialog; + g_pais_alert_dialog_active = pAISAlertDialog; - wxTimeSpan alertLifeTime(0, 1, 0, - 0); // Alert default lifetime, 1 minute. - auto alert_dlg_active = - dynamic_cast(g_pais_alert_dialog_active); - alert_dlg_active->dtAlertExpireTime = wxDateTime::Now() + alertLifeTime; - g_Platform->PositionAISAlert(pAISAlertDialog); + wxTimeSpan alertLifeTime(0, 1, 0, + 0); // Alert default lifetime, 1 minute. + auto alert_dlg_active = + dynamic_cast(g_pais_alert_dialog_active); + alert_dlg_active->dtAlertExpireTime = wxDateTime::Now() + alertLifeTime; + g_Platform->PositionAISAlert(pAISAlertDialog); - pAISAlertDialog->Show(); // Show modeless, so it stays on the screen - } - - // Audio alert if requested - m_bAIS_Audio_Alert_On = true; // always on when alert is first shown + pAISAlertDialog->Show(); // Show modeless, so it stays on the screen } + // Audio alert if requested + m_bAIS_Audio_Alert_On = true; // always on when alert is first shown + } // The AIS Alert dialog is already shown. If the dialog MMSI number is // still alerted, update the dialog otherwise, destroy the dialog @@ -225,8 +219,8 @@ void AisInfoGui::ShowAisInfo(std::shared_ptr palert_target) // Find the target with shortest CPA, ignoring DSC and SART targets double tcpa_min = 1e6; // really long AisTargetData *palert_target_lowestcpa = NULL; - const auto& current_targets = g_pAIS->GetTargetList(); - for (auto& it : current_targets) { + const auto ¤t_targets = g_pAIS->GetTargetList(); + for (auto &it : current_targets) { auto td = it.second; if (td) { if ((td->Class != AIS_SART) && (td->Class != AIS_DSC)) { @@ -244,9 +238,9 @@ void AisInfoGui::ShowAisInfo(std::shared_ptr palert_target) // Get the target currently displayed auto alert_dlg_active = - dynamic_cast(g_pais_alert_dialog_active); - palert_target = g_pAIS->Get_Target_Data_From_MMSI( - alert_dlg_active->Get_Dialog_MMSI()); + dynamic_cast(g_pais_alert_dialog_active); + palert_target = + g_pAIS->Get_Target_Data_From_MMSI(alert_dlg_active->Get_Dialog_MMSI()); // If the currently displayed target is not alerted, it must be in "expiry // delay" We should cancel that alert display now, and pick up the more @@ -263,7 +257,7 @@ void AisInfoGui::ShowAisInfo(std::shared_ptr palert_target) wxDateTime now = wxDateTime::Now(); if (((AIS_ALERT_SET == palert_target->n_alert_state) && !palert_target->b_in_ack_timeout) || - (palert_target->Class == AIS_SART) ) { + (palert_target->Class == AIS_SART)) { alert_dlg_active->UpdateText(); // Retrigger the alert expiry timeout if alerted now wxTimeSpan alertLifeTime(0, 1, 0, @@ -316,7 +310,7 @@ void AisInfoGui::ShowAisInfo(std::shared_ptr palert_target) m_AIS_Sound->Load(soundFile, g_iSoundDeviceIndex); if (m_AIS_Sound->IsOk()) { m_AIS_Sound->SetFinishedCallback(onSoundFinished, this); - if (!m_AIS_Sound->Play()){ + if (!m_AIS_Sound->Play()) { delete m_AIS_Sound; m_AIS_Sound = 0; m_bAIS_AlertPlaying = false; diff --git a/gui/src/canvasMenu.cpp b/gui/src/canvasMenu.cpp index b08911b937..352c1984b4 100644 --- a/gui/src/canvasMenu.cpp +++ b/gui/src/canvasMenu.cpp @@ -44,6 +44,7 @@ #include "model/config_vars.h" #include "model/cutil.h" #include "model/georef.h" +#include "model/mdns_cache.h" #include "model/mDNS_query.h" #include "model/nav_object_database.h" #include "model/own_ship.h" @@ -124,8 +125,6 @@ extern bool g_bBasicMenus; extern TrackPropDlg *pTrackPropDialog; extern bool g_FlushNavobjChanges; extern ColorScheme global_color_scheme; -extern std::vector> g_DNS_cache; -extern wxDateTime g_DNS_cache_time; // Constants for right click menus enum { @@ -432,12 +431,15 @@ void CanvasMenuHandler::CanvasPopupMenu(int x, int y, int seltype) { parent->GetCanvasPointPix(lat1, lon1, &target_point); bbox.Expand(target_point); for (int i = 0; i < 18; ++i) { - ll_gc_ll(lat1, lon1, sa->left_bound_deg + i * (sa->right_bound_deg - sa->left_bound_deg) / 18 , sa->radius_m / 1852.0, - &lat, &lon); + ll_gc_ll( + lat1, lon1, + sa->left_bound_deg + + i * (sa->right_bound_deg - sa->left_bound_deg) / 18, + sa->radius_m / 1852.0, &lat, &lon); parent->GetCanvasPointPix(lat, lon, &target_point); bbox.Expand(target_point); } - ll_gc_ll(lat1, lon1, sa->right_bound_deg , sa->radius_m / 1852.0, + ll_gc_ll(lat1, lon1, sa->right_bound_deg, sa->radius_m / 1852.0, &lat, &lon); parent->GetCanvasPointPix(lat, lon, &target_point); bbox.Expand(target_point); @@ -1407,7 +1409,7 @@ void CanvasMenuHandler::PopupMenuHandler(wxCommandEvent &event) { case ID_DEF_MENU_DEACTIVATE_MEASURE: parent->CancelMeasureRoute(); - //gFrame->SurfaceAllCanvasToolbars(); + // gFrame->SurfaceAllCanvasToolbars(); parent->InvalidateGL(); parent->Refresh(false); break; @@ -1752,14 +1754,8 @@ void CanvasMenuHandler::PopupMenuHandler(wxCommandEvent &event) { // Perform initial scan, if necessary // Check for stale cache... - bool bDNScacheStale = true; - wxDateTime tnow = wxDateTime::Now(); - if (g_DNS_cache_time.IsValid()) { - wxTimeSpan delta = tnow.Subtract(g_DNS_cache_time); - if (delta.GetMinutes() < 5) bDNScacheStale = false; - } - - if ((g_DNS_cache.size() == 0) || bDNScacheStale) + MdnsCache::GetInstance().Validate(); + if (MdnsCache::GetInstance().GetCache().empty()) dlg.SetScanOnCreate(true); dlg.SetScanTime(5); // seconds @@ -1803,14 +1799,8 @@ void CanvasMenuHandler::PopupMenuHandler(wxCommandEvent &event) { // Perform initial scan, if necessary // Check for stale cache... - bool bDNScacheStale = true; - wxDateTime tnow = wxDateTime::Now(); - if (g_DNS_cache_time.IsValid()) { - wxTimeSpan delta = tnow.Subtract(g_DNS_cache_time); - if (delta.GetMinutes() < 5) bDNScacheStale = false; - } - - if ((g_DNS_cache.size() == 0) || bDNScacheStale) + MdnsCache::GetInstance().Validate(); + if (MdnsCache::GetInstance().GetCache().empty()) dlg.SetScanOnCreate(true); dlg.SetScanTime(5); // seconds @@ -1942,14 +1932,8 @@ void CanvasMenuHandler::PopupMenuHandler(wxCommandEvent &event) { // Perform initial scan, if necessary // Check for stale cache... - bool bDNScacheStale = true; - wxDateTime tnow = wxDateTime::Now(); - if (g_DNS_cache_time.IsValid()) { - wxTimeSpan delta = tnow.Subtract(g_DNS_cache_time); - if (delta.GetMinutes() < 5) bDNScacheStale = false; - } - - if ((g_DNS_cache.size() == 0) || bDNScacheStale) + MdnsCache::GetInstance().Validate(); + if (MdnsCache::GetInstance().GetCache().empty()) dlg.SetScanOnCreate(true); dlg.SetScanTime(5); // seconds @@ -1985,7 +1969,7 @@ void CanvasMenuHandler::PopupMenuHandler(wxCommandEvent &event) { case ID_RC_MENU_FINISH: parent->FinishRoute(); - //gFrame->SurfaceAllCanvasToolbars(); + // gFrame->SurfaceAllCanvasToolbars(); parent->Refresh(false); g_FlushNavobjChanges = true; break; diff --git a/gui/src/catalog_mgr.cpp b/gui/src/catalog_mgr.cpp index 46fa35cd95..383b5cfee3 100644 --- a/gui/src/catalog_mgr.cpp +++ b/gui/src/catalog_mgr.cpp @@ -94,7 +94,6 @@ class CatalogUpdate : public wxDialog, Helpers { wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP), Helpers(this), m_show_edit(true) { - HIDE = ""; HIDE += _("Hide"); HIDE += " <<<"; diff --git a/gui/src/chartdb.cpp b/gui/src/chartdb.cpp index 279c5b2d30..11db20480f 100644 --- a/gui/src/chartdb.cpp +++ b/gui/src/chartdb.cpp @@ -46,7 +46,7 @@ #include "ConfigMgr.h" #include "ocpn_frame.h" //FIXME (dave) LoadS57 #ifdef __OCPN__ANDROID__ - #include "androidUTIL.h" +#include "androidUTIL.h" #endif #ifdef ocpnUSE_GL @@ -484,12 +484,11 @@ int ChartDB::BuildChartStack(ChartStack *cstk, float lat, float lon, b_group_add = true; bool b_writable_add = true; - // On android, SDK > 29, we require that the directory of charts be "writable" - // as determined by Android Java file system + // On android, SDK > 29, we require that the directory of charts be + // "writable" as determined by Android Java file system #ifdef __OCPN__ANDROID__ wxFileName fn(cte.GetFullSystemPath()); - if (!androidIsDirWritable( fn.GetPath())) - b_writable_add = false; + if (!androidIsDirWritable(fn.GetPath())) b_writable_add = false; #endif bool b_pos_add = false; @@ -548,7 +547,8 @@ int ChartDB::BuildChartStack(ChartStack *cstk, float lat, float lon, // actually a directory, then windows fails to produce a valid file // modification time. Detect GetFileTime() == 0, and skip the test in this // case - // Extended to also check for "identical" charts, having exact same EditionDate + // Extended to also check for "identical" charts, having exact same + // EditionDate for (int id = 0; id < j - 1; id++) { if (cstk->GetDBIndex(id) != -1) { @@ -563,12 +563,12 @@ int ChartDB::BuildChartStack(ChartStack *cstk, float lat, float lon, if (labs(ctem.GetFileTime() - cten.GetFileTime()) < 60) bsameTime = true; } - if (ctem.GetChartEditionDate() == cten.GetChartEditionDate() ) + if (ctem.GetChartEditionDate() == cten.GetChartEditionDate()) bsameTime = true; - if(bsameTime) { - if (cten.GetpFileName()->IsSameAs(*(ctem.GetpFileName()))) - cstk->SetDBIndex(jd, -1); // mark to remove + if (bsameTime) { + if (cten.GetpFileName()->IsSameAs(*(ctem.GetpFileName()))) + cstk->SetDBIndex(jd, -1); // mark to remove } } } @@ -1241,8 +1241,7 @@ ChartBase *ChartDB::OpenChartUsingCache(int dbindex, ChartInitFlag init_flag) { // bewteen the search mask and the the chart file extension for (auto &cd : m_ChartClassDescriptorArray) { - if (cd.m_descriptor_type == - PLUGIN_DESCRIPTOR) { + if (cd.m_descriptor_type == PLUGIN_DESCRIPTOR) { if (cd.m_search_mask == ext_upper) { chart_class_name = cd.m_class_name; break; diff --git a/gui/src/chartdbs.cpp b/gui/src/chartdbs.cpp index 8eac914347..0a814f40b2 100644 --- a/gui/src/chartdbs.cpp +++ b/gui/src/chartdbs.cpp @@ -491,8 +491,7 @@ bool ChartTableEntry::Read(const ChartDatabase *pDb, wxInputStream &is) { if (db_version == 18) { // Read the path first - for (cp = path; (*cp = (char)is.GetC()) != 0; cp++) - ; + for (cp = path; (*cp = (char)is.GetC()) != 0; cp++); pFullPath = (char *)malloc(cp - path + 1); strncpy(pFullPath, path, cp - path + 1); wxLogVerbose(_T(" Chart %s"), pFullPath); @@ -574,8 +573,7 @@ bool ChartTableEntry::Read(const ChartDatabase *pDb, wxInputStream &is) { else if (db_version == 17) { // Read the path first - for (cp = path; (*cp = (char)is.GetC()) != 0; cp++) - ; + for (cp = path; (*cp = (char)is.GetC()) != 0; cp++); pFullPath = (char *)malloc(cp - path + 1); strncpy(pFullPath, path, cp - path + 1); wxLogVerbose(_T(" Chart %s"), pFullPath); @@ -652,8 +650,7 @@ bool ChartTableEntry::Read(const ChartDatabase *pDb, wxInputStream &is) { else if (db_version == 16) { // Read the path first - for (cp = path; (*cp = (char)is.GetC()) != 0; cp++) - ; + for (cp = path; (*cp = (char)is.GetC()) != 0; cp++); // TODO: optimize prepended dir pFullPath = (char *)malloc(cp - path + 1); strncpy(pFullPath, path, cp - path + 1); @@ -716,8 +713,7 @@ bool ChartTableEntry::Read(const ChartDatabase *pDb, wxInputStream &is) { else if (db_version == 15) { // Read the path first - for (cp = path; (*cp = (char)is.GetC()) != 0; cp++) - ; + for (cp = path; (*cp = (char)is.GetC()) != 0; cp++); // TODO: optimize prepended dir pFullPath = (char *)malloc(cp - path + 1); strncpy(pFullPath, path, cp - path + 1); @@ -767,8 +763,7 @@ bool ChartTableEntry::Read(const ChartDatabase *pDb, wxInputStream &is) { } } else if (db_version == 14) { // Read the path first - for (cp = path; (*cp = (char)is.GetC()) != 0; cp++) - ; + for (cp = path; (*cp = (char)is.GetC()) != 0; cp++); pFullPath = (char *)malloc(cp - path + 1); strncpy(pFullPath, path, cp - path + 1); wxLogVerbose(_T(" Chart %s"), pFullPath); @@ -1083,24 +1078,31 @@ ChartDatabase::ChartDatabase() { UpdateChartClassDescriptorArray(); } - void ChartDatabase::UpdateChartClassDescriptorArray(void) { - if(m_ChartClassDescriptorArray.empty()) { - m_ChartClassDescriptorArray.push_back(ChartClassDescriptor(_T("ChartKAP"), _T("*.kap"), BUILTIN_DESCRIPTOR)); - m_ChartClassDescriptorArray.push_back(ChartClassDescriptor(_T("ChartGEO"), _T("*.geo"), BUILTIN_DESCRIPTOR)); - m_ChartClassDescriptorArray.push_back(ChartClassDescriptor(_T("s57chart"), _T("*.000"), BUILTIN_DESCRIPTOR)); - m_ChartClassDescriptorArray.push_back(ChartClassDescriptor(_T("s57chart"), _T("*.s57"), BUILTIN_DESCRIPTOR)); - m_ChartClassDescriptorArray.push_back(ChartClassDescriptor(_T("cm93compchart"), _T("00300000.a"), BUILTIN_DESCRIPTOR)); - m_ChartClassDescriptorArray.push_back(ChartClassDescriptor(_T("ChartMBTiles"), _T("*.mbtiles"), BUILTIN_DESCRIPTOR)); + if (m_ChartClassDescriptorArray.empty()) { + m_ChartClassDescriptorArray.push_back( + ChartClassDescriptor(_T("ChartKAP"), _T("*.kap"), BUILTIN_DESCRIPTOR)); + m_ChartClassDescriptorArray.push_back( + ChartClassDescriptor(_T("ChartGEO"), _T("*.geo"), BUILTIN_DESCRIPTOR)); + m_ChartClassDescriptorArray.push_back( + ChartClassDescriptor(_T("s57chart"), _T("*.000"), BUILTIN_DESCRIPTOR)); + m_ChartClassDescriptorArray.push_back( + ChartClassDescriptor(_T("s57chart"), _T("*.s57"), BUILTIN_DESCRIPTOR)); + m_ChartClassDescriptorArray.push_back(ChartClassDescriptor( + _T("cm93compchart"), _T("00300000.a"), BUILTIN_DESCRIPTOR)); + m_ChartClassDescriptorArray.push_back(ChartClassDescriptor( + _T("ChartMBTiles"), _T("*.mbtiles"), BUILTIN_DESCRIPTOR)); } // If the PlugIn Manager exists, get the array of dynamically loadable // chart class names if (g_pi_manager) { - m_ChartClassDescriptorArray.erase(std::remove_if( - m_ChartClassDescriptorArray.begin(), m_ChartClassDescriptorArray.end(), - [](const ChartClassDescriptor& cd) { - return cd.m_descriptor_type ==PLUGIN_DESCRIPTOR; - }), m_ChartClassDescriptorArray.end()); + m_ChartClassDescriptorArray.erase( + std::remove_if(m_ChartClassDescriptorArray.begin(), + m_ChartClassDescriptorArray.end(), + [](const ChartClassDescriptor &cd) { + return cd.m_descriptor_type == PLUGIN_DESCRIPTOR; + }), + m_ChartClassDescriptorArray.end()); wxArrayString array = g_pi_manager->GetPlugInChartClassNameArray(); for (unsigned int j = 0; j < array.GetCount(); j++) { @@ -1112,7 +1114,8 @@ void ChartDatabase::UpdateChartClassDescriptorArray(void) { wxString mask = cpiw->GetFileSearchMask(); // Create a new descriptor and add it to the database - m_ChartClassDescriptorArray.push_back(ChartClassDescriptor(class_name, mask, PLUGIN_DESCRIPTOR)); + m_ChartClassDescriptorArray.push_back( + ChartClassDescriptor(class_name, mask, PLUGIN_DESCRIPTOR)); delete cpiw; } } @@ -1519,8 +1522,7 @@ bool ChartDatabase::Update(ArrayOfCDI &dir_array, bool bForce, // on within the "scoped storage" domain is very slow. // Aviod it.... #ifdef __OCPN__ANDROID__ - if (!androidIsDirWritable(dir_info.fullpath)) - continue; + if (!androidIsDirWritable(dir_info.fullpath)) continue; #endif wxString dir_magic; @@ -1536,7 +1538,8 @@ bool ChartDatabase::Update(ArrayOfCDI &dir_array, bool bForce, } if (dir_info.fullpath.Find(_T("OSMSHP")) != wxNOT_FOUND) { if (!wxDir::FindFirst(dir_info.fullpath, "basemap_*.shp").empty()) { - gWorldShapefileLocation = dir_info.fullpath + wxFileName::GetPathSeparator(); + gWorldShapefileLocation = + dir_info.fullpath + wxFileName::GetPathSeparator(); gShapeBasemap.Reset(); } } @@ -1694,8 +1697,7 @@ int ChartDatabase::TraverseDirAndAddCharts(ChartDirInfo &dir_info, // Look for all possible defined chart classes for (auto &cd : m_ChartClassDescriptorArray) { - nAdd += SearchDirAndAddCharts(dir_info.fullpath, - cd, pprog); + nAdd += SearchDirAndAddCharts(dir_info.fullpath, cd, pprog); } return nAdd; @@ -1998,7 +2000,6 @@ int ChartDatabase::SearchDirAndAddCharts(wxString &dir_name_base, } if (!b_found_cm93) { - wxDir dir(dir_name); dir.GetAllFiles(dir_name, &FileList, filespec, gaf_flags); @@ -2011,14 +2012,12 @@ int ChartDatabase::SearchDirAndAddCharts(wxString &dir_name_base, } #endif - #ifndef __WXMSW__ if (filespec != lowerFileSpec) { // add lowercase filespec files too wxArrayString lowerFileList; dir.GetAllFiles(dir_name, &lowerFileList, lowerFileSpec, gaf_flags); - #ifdef __OCPN__ANDROID__ if (!lowerFileList.GetCount()) { wxArrayString afl = androidTraverseDir(dir_name, lowerFileSpec); @@ -2035,12 +2034,11 @@ int ChartDatabase::SearchDirAndAddCharts(wxString &dir_name_base, #endif #ifdef OCPN_USE_LZMA - // add xz compressed files; - dir.GetAllFiles(dir_name, &FileList, filespecXZ, gaf_flags); - dir.GetAllFiles(dir_name, &FileList, lowerFileSpecXZ, gaf_flags); + // add xz compressed files; + dir.GetAllFiles(dir_name, &FileList, filespecXZ, gaf_flags); + dir.GetAllFiles(dir_name, &FileList, lowerFileSpecXZ, gaf_flags); #endif - FileList.Sort(); // Sorted processing order makes the progress bar more // meaningful to the user. } else { // This is a cm93 dataset, specified as yada/yada/cm93 @@ -2747,8 +2745,7 @@ bool ChartDatabase::IsChartAvailable(int dbIndex) { // between the search mask and the the chart file extension for (auto &cd : m_ChartClassDescriptorArray) { - if (cd.m_descriptor_type == - PLUGIN_DESCRIPTOR) { + if (cd.m_descriptor_type == PLUGIN_DESCRIPTOR) { wxString search_mask = cd.m_search_mask; if (search_mask == ext_upper) { diff --git a/gui/src/chartimg.cpp b/gui/src/chartimg.cpp index 82bdeabbe3..68e16b4edc 100644 --- a/gui/src/chartimg.cpp +++ b/gui/src/chartimg.cpp @@ -3885,7 +3885,7 @@ int ChartBaseBSB::BSBScanScanline(wxInputStream *pinStream) { // using /02 settings inline void memset_short(unsigned char *dst, unsigned char cbyte, int count) { -#if 0 //def __MSVC__ +#if 0 // def __MSVC__ __asm { pushf // save Direction flag cld // set direction "up" @@ -3903,8 +3903,8 @@ inline void memset_short(unsigned char *dst, unsigned char cbyte, int count) { // this is chosen as it is also the opengl tile size so should work well #define TILE_SIZE 512 -//#define USE_OLD_CACHE // removed this (and simplify code below) once the new -//method is verified #define PRINT_TIMINGS // enable for profiling +// #define USE_OLD_CACHE // removed this (and simplify code below) once the new +// method is verified #define PRINT_TIMINGS // enable for profiling #ifdef PRINT_TIMINGS class OCPNStopWatch { @@ -3976,7 +3976,7 @@ int ChartBaseBSB::BSBGetScanline(unsigned char *pLineBuf, int y, int xs, int xl, #else pt->pTileOffset = (TileOffsetCache *)calloc( sizeof(TileOffsetCache) * (Size_X / TILE_SIZE + 1), 1); - pt->pPix = (unsigned char *)malloc(pt->size ); + pt->pPix = (unsigned char *)malloc(pt->size); #endif if (pline_table[y] == 0 || pline_table[y + 1] == 0) FAIL; @@ -3988,20 +3988,20 @@ int ChartBaseBSB::BSBGetScanline(unsigned char *pLineBuf, int y, int xs, int xl, FAIL; #ifdef USE_OLD_CACHE - if (pt->size > ifs_bufsize) { + if (pt->size > ifs_bufsize) { unsigned char *tmp = ifs_buf; - if (!(ifs_buf = (unsigned char *)realloc(ifs_buf, pt->size ))) { + if (!(ifs_buf = (unsigned char *)realloc(ifs_buf, pt->size))) { free(tmp); FAIL; } - ifs_bufsize = pt->size ; + ifs_bufsize = pt->size; } lp = ifs_buf; #else lp = pt->pPix; #endif - ifs_bitmap->Read(lp, pt->size ); + ifs_bitmap->Read(lp, pt->size); #ifdef USE_OLD_CACHE pCL = pt->pPix; @@ -4016,8 +4016,7 @@ int ChartBaseBSB::BSBGetScanline(unsigned char *pLineBuf, int y, int xs, int xl, } else { byNext = 0; } - } - while ((byNext & 0x80) != 0); + } while ((byNext & 0x80) != 0); goto nocachestart; } pCL = ifs_buf; @@ -4042,8 +4041,7 @@ int ChartBaseBSB::BSBGetScanline(unsigned char *pLineBuf, int y, int xs, int xl, } else { byNext = 0; } - } - while ((byNext & 0x80) != 0); + } while ((byNext & 0x80) != 0); // Setup masking values. nValueShift = 7 - nColorSize; diff --git a/gui/src/chcanv.cpp b/gui/src/chcanv.cpp index 7c68121292..90a31f1557 100644 --- a/gui/src/chcanv.cpp +++ b/gui/src/chcanv.cpp @@ -66,7 +66,7 @@ #include "chartimg.h" #include "chcanv.h" #include "ChInfoWin.h" -#include "cm93.h" // for chart outline draw +#include "cm93.h" // for chart outline draw #include "compass.h" #include "concanv.h" #include "displays.h" @@ -146,7 +146,7 @@ extern double g_mouse_zoom_sensitivity; #define OCPN_ALT_MENUBAR 1 // Profiling support -//#include "/usr/include/valgrind/callgrind.h" +// #include "/usr/include/valgrind/callgrind.h" // ---------------------------------------------------------------------------- // Useful Prototypes @@ -168,7 +168,7 @@ extern ConsoleCanvas *console; extern OCPNPlatform *g_Platform; extern RouteList *pRouteList; -extern std::vector g_TrackList; +extern std::vector g_TrackList; extern MyConfig *pConfig; extern Routeman *g_pRouteMan; extern ThumbWin *pthumbwin; @@ -275,7 +275,6 @@ extern int g_chart_zoom_modifier_raster; extern int g_chart_zoom_modifier_vector; extern int g_ChartScaleFactor; - #ifdef ocpnUSE_GL #endif @@ -292,7 +291,6 @@ extern wxString g_CmdSoundString; extern bool g_boptionsactive; ShapeBaseChartSet gShapeBasemap; - // TODO why are these static? static int mouse_x; static int mouse_y; @@ -522,7 +520,7 @@ ChartCanvas::ChartCanvas(wxFrame *frame, int canvasIndex) #endif /* HAVE_WX_GESTURE_EVENTS */ SetupGlCanvas(); - + singleClickEventIsValid = false; // Build the cursors @@ -614,7 +612,8 @@ ChartCanvas::ChartCanvas(wxFrame *frame, int canvasIndex) // Build icons for tide/current points ocpnStyle::Style *style = g_StyleManager->GetCurrentStyle(); - m_bmTideDay = style->GetIconScaled(_T("tidesml"), 1. / g_Platform->GetDisplayDIPMult(this)); + m_bmTideDay = style->GetIconScaled(_T("tidesml"), + 1. / g_Platform->GetDisplayDIPMult(this)); // Dusk m_bmTideDusk = CreateDimBitmap(m_bmTideDay, .50); @@ -738,8 +737,8 @@ ChartCanvas::ChartCanvas(wxFrame *frame, int canvasIndex) #endif m_pgridFont = FontMgr::Get().FindOrCreateFont( - gridFontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE, - wxString(_T ( "Arial" ))); + gridFontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, + FALSE, wxString(_T ( "Arial" ))); m_Piano = new Piano(this); @@ -759,10 +758,8 @@ ChartCanvas::ChartCanvas(wxFrame *frame, int canvasIndex) m_displayScale = GetContentScaleFactor(); #endif - #ifdef HAVE_WX_GESTURE_EVENTS - if (!EnableTouchEvents(wxTOUCH_ZOOM_GESTURE | - wxTOUCH_PRESS_GESTURES)) { + if (!EnableTouchEvents(wxTOUCH_ZOOM_GESTURE | wxTOUCH_PRESS_GESTURES)) { wxLogError("Failed to enable touch events"); } @@ -875,7 +872,8 @@ void ChartCanvas::RebuildCursors() { wxImage ICursorRight = style->GetIcon(_T("right")).ConvertToImage(); wxImage ICursorUp = style->GetIcon(_T("up")).ConvertToImage(); wxImage ICursorDown = style->GetIcon(_T("down")).ConvertToImage(); - wxImage ICursorPencil = style->GetIconScaled(_T("pencil"), pencilScale).ConvertToImage(); + wxImage ICursorPencil = + style->GetIconScaled(_T("pencil"), pencilScale).ConvertToImage(); wxImage ICursorCross = style->GetIcon(_T("cross")).ConvertToImage(); #if !defined(__WXMSW__) && !defined(__WXQT__) @@ -2565,7 +2563,7 @@ void ChartCanvas::SetVP(ViewPort &vp) { VPoint = vp; } // } void ChartCanvas::TriggerDeferredFocus() { - //#if defined(__WXGTK__) || defined(__WXOSX__) + // #if defined(__WXGTK__) || defined(__WXOSX__) m_deferredFocusTimer.Start(20, true); @@ -2574,10 +2572,10 @@ void ChartCanvas::TriggerDeferredFocus() { #endif // gFrame->Raise(); - //#else + // #else // SetFocus(); // Refresh(true); - //#endif + // #endif } void ChartCanvas::OnDeferredFocusTimerEvent(wxTimerEvent &event) { @@ -2746,7 +2744,7 @@ void ChartCanvas::OnKeyDown(wxKeyEvent &event) { SetCursor(*pCursorArrow); - //SurfaceToolbar(); + // SurfaceToolbar(); InvalidateGL(); Refresh(false); } @@ -2906,7 +2904,8 @@ void ChartCanvas::OnKeyDown(wxKeyEvent &event) { #ifdef __WXOSX__ // Ctrl+Cmd+F toggles fullscreen on macOS - if (key_char == 'F' && m_modkeys & wxMOD_CONTROL && m_modkeys & wxMOD_RAW_CONTROL) { + if (key_char == 'F' && m_modkeys & wxMOD_CONTROL && + m_modkeys & wxMOD_RAW_CONTROL) { parent_frame->ToggleFullScreen(); return; } @@ -3006,11 +3005,10 @@ void ChartCanvas::OnKeyDown(wxKeyEvent &event) { break; case 'R': g_bNavAidRadarRingsShown = !g_bNavAidRadarRingsShown; - if (g_bNavAidRadarRingsShown && - g_iNavAidRadarRingsNumberVisible == 0) + if (g_bNavAidRadarRingsShown && g_iNavAidRadarRingsNumberVisible == 0) g_iNavAidRadarRingsNumberVisible = 1; else if (!g_bNavAidRadarRingsShown && - g_iNavAidRadarRingsNumberVisible == 1) + g_iNavAidRadarRingsNumberVisible == 1) g_iNavAidRadarRingsNumberVisible = 0; break; case 'S': @@ -3033,7 +3031,7 @@ void ChartCanvas::OnKeyDown(wxKeyEvent &event) { Refresh(true); break; - case 'W': // W Toggle CPA alarm + case 'W': // W Toggle CPA alarm ToggleCPAWarn(); break; @@ -3137,14 +3135,14 @@ void ChartCanvas::OnKeyDown(wxKeyEvent &event) { SetCursor(*pCursorArrow); - //SurfaceToolbar(); + // SurfaceToolbar(); gFrame->RefreshAllCanvas(); } if (m_routeState) // creating route? { FinishRoute(); - //SurfaceToolbar(); + // SurfaceToolbar(); InvalidateGL(); Refresh(false); } @@ -3573,7 +3571,7 @@ void ChartCanvas::SetColorScheme(ColorScheme cs) { } #endif - //UpdateToolbarColorScheme(cs); + // UpdateToolbarColorScheme(cs); m_Piano->SetColorScheme(cs); @@ -3792,8 +3790,8 @@ void ChartCanvas::OnRolloverPopupTimerEvent(wxTimerEvent &event) { << segShow_point_b->GetName() << _T("\n"); if (g_bShowTrue) - s << wxString::Format(wxString("%03d%c(T) ", wxConvUTF8), (int)floor(brg+0.5), - 0x00B0); + s << wxString::Format(wxString("%03d%c(T) ", wxConvUTF8), + (int)floor(brg + 0.5), 0x00B0); if (g_bShowMag) { double latAverage = (segShow_point_b->m_lat + segShow_point_a->m_lat) / 2; @@ -3801,8 +3799,8 @@ void ChartCanvas::OnRolloverPopupTimerEvent(wxTimerEvent &event) { (segShow_point_b->m_lon + segShow_point_a->m_lon) / 2; double varBrg = gFrame->GetMag(brg, latAverage, lonAverage); - s << wxString::Format(wxString("%03d%c(M) ", wxConvUTF8), (int)floor(varBrg+0.5), - 0x00B0); + s << wxString::Format(wxString("%03d%c(M) ", wxConvUTF8), + (int)floor(varBrg + 0.5), 0x00B0); } s << FormatDistanceAdaptive(dist); @@ -3967,13 +3965,13 @@ void ChartCanvas::OnRolloverPopupTimerEvent(wxTimerEvent &event) { pt->GetPoint(0)->GetTimeString()) { wxDateTime lastPointTime = pt->GetLastPoint()->GetCreateTime(); wxDateTime zeroPointTime = pt->GetPoint(0)->GetCreateTime(); - if (lastPointTime.IsValid() && zeroPointTime.IsValid()){ + if (lastPointTime.IsValid() && zeroPointTime.IsValid()) { wxTimeSpan ttime = lastPointTime - zeroPointTime; double htime = ttime.GetSeconds().ToDouble() / 3600.; s << wxString::Format(_T(" %.1f "), (float)(tlenght / htime)) << getUsrSpeedUnit(); s << wxString(htime > 24. ? ttime.Format(_T(" %Dd %H:%M")) - : ttime.Format(_T(" %H:%M"))); + : ttime.Format(_T(" %H:%M"))); } } @@ -4003,11 +4001,9 @@ void ChartCanvas::OnRolloverPopupTimerEvent(wxTimerEvent &event) { segShow_point_b->GetTimeString()) { wxDateTime apoint = segShow_point_a->GetCreateTime(); wxDateTime bpoint = segShow_point_b->GetCreateTime(); - if (apoint.IsValid() && bpoint.IsValid()){ - double segmentSpeed = - toUsrSpeed(dist / ((bpoint - apoint).GetSeconds() - .ToDouble() / - 3600.)); + if (apoint.IsValid() && bpoint.IsValid()) { + double segmentSpeed = toUsrSpeed( + dist / ((bpoint - apoint).GetSeconds().ToDouble() / 3600.)); s << wxString::Format(_T(" %.1f "), (float)segmentSpeed) << getUsrSpeedUnit(); } @@ -4066,8 +4062,8 @@ void ChartCanvas::OnRolloverPopupTimerEvent(wxTimerEvent &event) { } void ChartCanvas::OnCursorTrackTimerEvent(wxTimerEvent &event) { - if ((GetShowENCLights() || m_bsectors_shown ) && - s57_CheckExtendedLightSectors( this, mouse_x, mouse_y, VPoint, + if ((GetShowENCLights() || m_bsectors_shown) && + s57_CheckExtendedLightSectors(this, mouse_x, mouse_y, VPoint, extendedSectorLegs)) { if (!m_bsectors_shown) { ReloadVP(false); @@ -4121,10 +4117,8 @@ void ChartCanvas::SetCursorStatus(double cursor_lat, double cursor_lon) { wxString sm; wxString st; DistanceBearingMercator(cursor_lat, cursor_lon, gLat, gLon, &brg, &dist); - if (g_bShowMag) - sm.Printf("%03d%c(M) ", (int)toMagnetic(brg), 0x00B0); - if (g_bShowTrue) - st.Printf("%03d%c(T) ", (int)brg, 0x00B0); + if (g_bShowMag) sm.Printf("%03d%c(M) ", (int)toMagnetic(brg), 0x00B0); + if (g_bShowTrue) st.Printf("%03d%c(T) ", (int)brg, 0x00B0); wxString s = st + sm; s << FormatDistanceAdaptive(dist); @@ -4318,7 +4312,7 @@ bool ChartCanvas::GetCanvasPointPixVP(ViewPort &vp, double rlat, double rlon, return false; } - if( (abs(p.m_x) < 1e6) && (abs(p.m_y) < 1e6) ) + if ((abs(p.m_x) < 1e6) && (abs(p.m_y) < 1e6)) *r = wxPoint(wxRound(p.m_x), wxRound(p.m_y)); else *r = wxPoint(INVALID_COORD, INVALID_COORD); @@ -4453,7 +4447,8 @@ void ChartCanvas::DoZoomCanvas(double factor, bool can_zoom_to_cursor) { // and then adjust for scale range int current_ref_stack_index = -1; if (m_pCurrentStack->nEntry) { - int trial_index = m_pCurrentStack->GetDBIndex(m_pCurrentStack->nEntry - 1); + int trial_index = + m_pCurrentStack->GetDBIndex(m_pCurrentStack->nEntry - 1); m_pQuilt->SetReferenceChart(trial_index); new_db_index = m_pQuilt->AdjustRefOnZoomIn(proposed_scale_onscreen); if (new_db_index >= 0) @@ -4568,7 +4563,7 @@ void ChartCanvas::DoZoomCanvas(double factor, bool can_zoom_to_cursor) { } int rot; void ChartCanvas::RotateCanvas(double dir) { - //SetUpMode(NORTH_UP_MODE); + // SetUpMode(NORTH_UP_MODE); if (g_bsmoothpanzoom) { if (StartTimedMovement()) { @@ -4754,26 +4749,27 @@ bool ChartCanvas::PanCanvas(double dx, double dy) { } } - if(new_ref_dbIndex == -1) { + if (new_ref_dbIndex == -1) { // for whatever reason, no reference chart is known // Probably panned out of the coverage region // If any charts are anywhere on-screen, choose the smallest // scale chart on the screen to be a new reference chart. - int trial_index = -1; - if (m_pCurrentStack->nEntry) { + int trial_index = -1; + if (m_pCurrentStack->nEntry) { int trial_index = m_pCurrentStack->GetDBIndex(m_pCurrentStack->nEntry - 1); - } + } if (trial_index < 0) { auto full_screen_array = GetQuiltFullScreendbIndexArray(); if (full_screen_array.size()) - trial_index = full_screen_array[full_screen_array.size()-1]; - } + trial_index = full_screen_array[full_screen_array.size() - 1]; + } - if (trial_index >= 0){ + if (trial_index >= 0) { m_pQuilt->SetReferenceChart(trial_index); - SetViewPoint(dlat, dlon, VPoint.view_scale_ppm, VPoint.skew, VPoint.rotation); + SetViewPoint(dlat, dlon, VPoint.view_scale_ppm, VPoint.skew, + VPoint.rotation); ReloadVP(); } } @@ -4842,7 +4838,6 @@ void ChartCanvas::LoadVP(ViewPort &vp, bool b_adjust) { SetViewPoint(vp.clat, vp.clon, vp.view_scale_ppm, vp.skew, vp.rotation, vp.m_projection_type, b_adjust); - } void ChartCanvas::SetQuiltRefChart(int dbIndex) { @@ -4987,8 +4982,8 @@ bool ChartCanvas::SetViewPoint(double lat, double lon) { } bool ChartCanvas::SetVPRotation(double angle) { - return SetViewPoint(VPoint.clat, VPoint.clon, VPoint.view_scale_ppm, VPoint.skew, - angle); + return SetViewPoint(VPoint.clat, VPoint.clon, VPoint.view_scale_ppm, + VPoint.skew, angle); } bool ChartCanvas::SetViewPoint(double lat, double lon, double scale_ppm, @@ -5041,7 +5036,7 @@ bool ChartCanvas::SetViewPoint(double lat, double lon, double scale_ppm, VPoint.m_projection_type == PROJECTION_TRANSVERSE_MERCATOR) VPoint.view_scale_ppm = wxMax(VPoint.view_scale_ppm, 2e-4); - //SetVPRotation(rotation); + // SetVPRotation(rotation); if (!g_bopengl) // tilt is not possible without opengl VPoint.tilt = 0; @@ -5401,13 +5396,14 @@ bool ChartCanvas::SetViewPoint(double lat, double lon, double scale_ppm, // Fixme: Workaround the wrongly calculated scale on Retina displays (#3117) double retina_coef = 1; - #ifdef ocpnUSE_GL - #ifdef __WXOSX__ +#ifdef ocpnUSE_GL +#ifdef __WXOSX__ if (g_bopengl) { - retina_coef = GetContentScaleFactor();; + retina_coef = GetContentScaleFactor(); + ; } - #endif - #endif +#endif +#endif double true_scale_display = wxRound(VPoint.chart_scale / round_factor) * round_factor * retina_coef; @@ -5548,7 +5544,7 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, wxColour cPred; cPred.Set(g_cog_predictor_color); - if(cPred == wxNullColour) cPred = PredColor(); + if (cPred == wxNullColour) cPred = PredColor(); // Establish some graphic element line widths dependent on the platform // display resolution @@ -5625,8 +5621,9 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, dash_long[1] = dash_long[0] / 2; } - wxPen ppPen2(cPred, g_cog_predictor_width, (wxPenStyle)g_cog_predictor_style); - if(g_cog_predictor_style==(wxPenStyle)wxUSER_DASH) + wxPen ppPen2(cPred, g_cog_predictor_width, + (wxPenStyle)g_cog_predictor_style); + if (g_cog_predictor_style == (wxPenStyle)wxUSER_DASH) ppPen2.SetDashes(2, dash_long); dc.SetPen(ppPen2); dc.StrokeLine( @@ -5642,7 +5639,7 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, wxPen ppPen3(GetGlobalColor(_T ( "UBLCK" )), wxMax(1, line_width), (wxPenStyle)g_cog_predictor_style); - if(g_cog_predictor_style==(wxPenStyle)wxUSER_DASH) + if (g_cog_predictor_style == (wxPenStyle)wxUSER_DASH) ppPen3.SetDashes(2, dash_long3); dc.SetPen(ppPen3); dc.StrokeLine( @@ -5655,8 +5652,7 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, double png_pred_icon_scale_factor = .4; if (g_ShipScaleFactorExp > 1.0) png_pred_icon_scale_factor *= (log(g_ShipScaleFactorExp) + 1.0) * 1.1; - if (g_scaler) - png_pred_icon_scale_factor *= 1.0 / g_scaler; + if (g_scaler) png_pred_icon_scale_factor *= 1.0 / g_scaler; wxPoint icon[4]; @@ -5695,8 +5691,10 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, float hdt_dash_length = ref_dim * 0.4; cPred.Set(g_ownship_HDTpredictor_color); - if(cPred == wxNullColour) cPred = PredColor(); - float hdt_width = (g_ownship_HDTpredictor_width>0?g_ownship_HDTpredictor_width:g_cog_predictor_width * 0.8); + if (cPred == wxNullColour) cPred = PredColor(); + float hdt_width = + (g_ownship_HDTpredictor_width > 0 ? g_ownship_HDTpredictor_width + : g_cog_predictor_width * 0.8); wxDash dash_short[2]; dash_short[0] = (int)(floor(g_Platform->GetDisplayDPmm() * hdt_dash_length) / @@ -5705,8 +5703,8 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, (int)(floor(g_Platform->GetDisplayDPmm() * hdt_dash_length * 0.9) / hdt_width); // Short gap | - wxPen ppPen2(cPred, hdt_width,(wxPenStyle)g_ownship_HDTpredictor_style); - if(g_ownship_HDTpredictor_style==(wxPenStyle)wxUSER_DASH) + wxPen ppPen2(cPred, hdt_width, (wxPenStyle)g_ownship_HDTpredictor_style); + if (g_ownship_HDTpredictor_style == (wxPenStyle)wxUSER_DASH) ppPen2.SetDashes(2, dash_short); dc.SetPen(ppPen2); @@ -5720,7 +5718,7 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, if (g_ownship_HDTpredictor_endmarker) { double nominal_circle_size_pixels = wxMax( - 4.0, floor(m_pix_per_mm * (ref_dim / 5.0))); // not less than 4 pixel + 4.0, floor(m_pix_per_mm * (ref_dim / 5.0))); // not less than 4 pixel // Scale the circle to ChartScaleFactor, slightly softened.... if (g_ShipScaleFactorExp > 1.0) @@ -5737,11 +5735,11 @@ void ChartCanvas::ShipIndicatorsDraw(ocpnDC &dc, int img_height, double factor = 1.00; if (g_pNavAidRadarRingsStepUnits == 1) // kilometers factor = 1 / 1.852; - else if (g_pNavAidRadarRingsStepUnits == 2){ // minutes (time) + else if (g_pNavAidRadarRingsStepUnits == 2) { // minutes (time) if (std::isnan(gSog)) factor = 0.0; else - factor = gSog/60; + factor = gSog / 60; } factor *= g_fNavAidRadarRingsStep; @@ -6280,7 +6278,8 @@ void ChartCanvas::ScaleBarDraw(ocpnDC &dc) { int y_origin = m_canvas_height - chartbar_height - 5; #ifdef __WXOSX__ if (!g_bopengl) - y_origin = m_canvas_height/GetContentScaleFactor() - chartbar_height - 5; + y_origin = + m_canvas_height / GetContentScaleFactor() - chartbar_height - 5; #endif GetCanvasPixPoint(x_origin, y_origin, blat, blon); @@ -6417,8 +6416,8 @@ void ChartCanvas::AlertDraw(ocpnDC &dc) { AnchorAlertOn2 = false; if (play_sound) { - if(!bAnchorSoundPlaying) { - auto cmd_sound = dynamic_cast(g_anchorwatch_sound); + if (!bAnchorSoundPlaying) { + auto cmd_sound = dynamic_cast(g_anchorwatch_sound); if (cmd_sound) cmd_sound->SetCmd(g_CmdSoundString.mb_str(wxConvUTF8)); g_anchorwatch_sound->Load(g_anchorwatch_sound_file); if (g_anchorwatch_sound->IsOk()) { @@ -6437,9 +6436,8 @@ void ChartCanvas::UpdateShips() { if (!dc.IsOk()) return; wxBitmap test_bitmap(dc.GetSize().x, dc.GetSize().y); - if (!test_bitmap.IsOk()) - return; - + if (!test_bitmap.IsOk()) return; + wxMemoryDC temp_dc(test_bitmap); temp_dc.ResetBoundingBox(); @@ -6607,8 +6605,8 @@ void ChartCanvas::ToggleCPAWarn() { } else { if (!g_AisFirstTimeUse) { OCPNMessageBox(this, - _("CPA Alarm is switched") + _T(" ") + mess.MakeLower(), - _("CPA") + _T(" ") + mess, 4, 4); + _("CPA Alarm is switched") + _T(" ") + mess.MakeLower(), + _("CPA") + _T(" ") + mess, 4, 4); } } } @@ -6616,8 +6614,7 @@ void ChartCanvas::ToggleCPAWarn() { void ChartCanvas::OnActivate(wxActivateEvent &event) { ReloadVP(); } void ChartCanvas::OnSize(wxSizeEvent &event) { - if ((event.m_size.GetWidth() < 1) || (event.m_size.GetHeight() < 1)) - return; + if ((event.m_size.GetWidth() < 1) || (event.m_size.GetHeight() < 1)) return; GetClientSize(&m_canvas_width, &m_canvas_height); #ifdef __WXOSX__ @@ -6625,7 +6622,6 @@ void ChartCanvas::OnSize(wxSizeEvent &event) { m_displayScale = GetContentScaleFactor(); #endif - m_canvas_width *= m_displayScale; m_canvas_height *= m_displayScale; @@ -6690,7 +6686,7 @@ void ChartCanvas::OnSize(wxSizeEvent &event) { #ifdef ocpnUSE_GL if (/*g_bopengl &&*/ m_glcc) { - //FIXME (dave) This can go away? + // FIXME (dave) This can go away? m_glcc->OnSize(event); } #endif @@ -6701,7 +6697,7 @@ void ChartCanvas::OnSize(wxSizeEvent &event) { } void ChartCanvas::ProcessNewGUIScale() { - //m_muiBar->Hide(); + // m_muiBar->Hide(); delete m_muiBar; m_muiBar = 0; @@ -6734,8 +6730,8 @@ void ChartCanvas::SetMUIBarPosition() { // We estimate the piano width based on the canvas width int pianoWidth = GetClientSize().x * 0.6f; // If the piano already exists, we can use its exact width - if(m_Piano) - pianoWidth = m_Piano->GetWidth(); + // if(m_Piano) + // pianoWidth = m_Piano->GetWidth(); if ((m_muiBar->GetOrientation() == wxHORIZONTAL)) { if (m_muiBarHOSize.x > (GetClientSize().x - pianoWidth)) { @@ -6764,8 +6760,8 @@ void ChartCanvas::DestroyMuiBar() { } } -void ChartCanvas::ShowCompositeInfoWindow(int x, int n_charts, int scale, - const std::vector &index_vector) { +void ChartCanvas::ShowCompositeInfoWindow( + int x, int n_charts, int scale, const std::vector &index_vector) { if (n_charts > 0) { if (NULL == m_pCIWin) { m_pCIWin = new ChInfoWin(this); @@ -6778,7 +6774,7 @@ void ChartCanvas::ShowCompositeInfoWindow(int x, int n_charts, int scale, s = _("Composite of "); wxString s1; - s1.Printf( "%d ", n_charts); + s1.Printf("%d ", n_charts); if (n_charts > 1) s1 += _("charts"); else @@ -6803,7 +6799,7 @@ void ChartCanvas::ShowCompositeInfoWindow(int x, int n_charts, int scale, if (g_bChartBarEx) { s += '\n'; int j = 0; - for (int i : index_vector ) { + for (int i : index_vector) { const ChartTableEntry &cte = ChartData->GetChartTableEntry(i); wxString path = cte.GetFullSystemPath(); s += path; @@ -6819,7 +6815,7 @@ void ChartCanvas::ShowCompositeInfoWindow(int x, int n_charts, int scale, s += '\n'; char_height += 1; - char_width += 4; // Fluff + char_width += 4; // Fluff } m_pCIWin->SetString(s); @@ -6876,13 +6872,14 @@ void ChartCanvas::ShowChartInfoWindow(int x, int dbIndex) { wxPoint p; p.x = x / GetContentScaleFactor(); - if ((p.x + m_pCIWin->GetWinSize().x) > (m_canvas_width / GetContentScaleFactor())) - p.x = ((m_canvas_width / GetContentScaleFactor()) - - m_pCIWin->GetWinSize().x) / 2; // centered + if ((p.x + m_pCIWin->GetWinSize().x) > + (m_canvas_width / GetContentScaleFactor())) + p.x = ((m_canvas_width / GetContentScaleFactor()) - + m_pCIWin->GetWinSize().x) / + 2; // centered - p.y = - (m_canvas_height - m_Piano->GetHeight()) / GetContentScaleFactor() - - 4 - m_pCIWin->GetWinSize().y; + p.y = (m_canvas_height - m_Piano->GetHeight()) / GetContentScaleFactor() - + 4 - m_pCIWin->GetWinSize().y; m_pCIWin->dbIndex = dbIndex; m_pCIWin->SetPosition(p); @@ -7059,18 +7056,13 @@ bool ChartCanvas::MouseEventOverlayWindows(wxMouseEvent &event) { } } - if (MouseEventToolbar(event)) - return true; + if (MouseEventToolbar(event)) return true; - if (MouseEventChartBar(event)) - return true; + if (MouseEventChartBar(event)) return true; - if (MouseEventMUIBar(event)) - return true; - - if (MouseEventIENCBar(event)) - return true; + if (MouseEventMUIBar(event)) return true; + if (MouseEventIENCBar(event)) return true; } return false; } @@ -7086,8 +7078,7 @@ bool ChartCanvas::MouseEventChartBar(wxMouseEvent &event) { } bool ChartCanvas::MouseEventToolbar(wxMouseEvent &event) { - if (!IsPrimaryCanvas()) - return false; + if (!IsPrimaryCanvas()) return false; if (g_MainToolbar) { if (!g_MainToolbar->MouseEvent(event)) @@ -7102,8 +7093,7 @@ bool ChartCanvas::MouseEventToolbar(wxMouseEvent &event) { } bool ChartCanvas::MouseEventIENCBar(wxMouseEvent &event) { - if (!IsPrimaryCanvas()) - return false; + if (!IsPrimaryCanvas()) return false; if (g_iENCToolbar) { if (!g_iENCToolbar->MouseEvent(event)) @@ -7374,10 +7364,8 @@ void ChartCanvas::CallPopupMenu(int x, int y) { SelectCtx ctx(m_bShowNavobjects, GetCanvasTrueScale(), GetScaleValue()); pFindAIS = pSelectAIS->FindSelection(ctx, slat, slon, SELTYPE_AISTARGET); pFindRP = pSelect->FindSelection(ctx, slat, slon, SELTYPE_ROUTEPOINT); - pFindRouteSeg = - pSelect->FindSelection(ctx, slat, slon, SELTYPE_ROUTESEGMENT); - pFindTrackSeg = - pSelect->FindSelection(ctx, slat, slon, SELTYPE_TRACKSEGMENT); + pFindRouteSeg = pSelect->FindSelection(ctx, slat, slon, SELTYPE_ROUTESEGMENT); + pFindTrackSeg = pSelect->FindSelection(ctx, slat, slon, SELTYPE_TRACKSEGMENT); if (m_bShowCurrent) pFindCurrent = @@ -7491,7 +7479,8 @@ void ChartCanvas::CallPopupMenu(int x, int y) { if (m_pFoundRoutePoint) { m_pFoundRoutePoint->m_bPtIsSelected = true; wxRect wp_rect; - RoutePointGui(*m_pFoundRoutePoint).CalculateDCRect(m_dc_route, this, &wp_rect); + RoutePointGui(*m_pFoundRoutePoint) + .CalculateDCRect(m_dc_route, this, &wp_rect); RefreshRect(wp_rect, true); } } @@ -7674,7 +7663,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { singleClickEventIsValid = false; double zlat, zlon; - GetCanvasPixPoint(x * g_current_monitor_dip_px_ratio, y * g_current_monitor_dip_px_ratio, zlat, zlon); + GetCanvasPixPoint(x * g_current_monitor_dip_px_ratio, + y * g_current_monitor_dip_px_ratio, zlat, zlon); SelectCtx ctx(m_bShowNavobjects, GetCanvasTrueScale(), GetScaleValue()); if (m_bShowAIS) { @@ -7714,9 +7704,11 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { } else { m_pRoutePointEditTarget->m_bRPIsBeingEdited = false; m_pRoutePointEditTarget->m_bPtIsSelected = false; - if (g_btouch) RoutePointGui(*m_pRoutePointEditTarget).EnableDragHandle(false); + if (g_btouch) + RoutePointGui(*m_pRoutePointEditTarget).EnableDragHandle(false); wxRect wp_rect; - RoutePointGui(*m_pRoutePointEditTarget).CalculateDCRect(m_dc_route, this, &wp_rect); + RoutePointGui(*m_pRoutePointEditTarget) + .CalculateDCRect(m_dc_route, this, &wp_rect); m_pRoutePointEditTarget = NULL; // cancel selection RefreshRect(wp_rect, true); return true; @@ -8091,9 +8083,9 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { r_rband.y = y; } - RoutePoint *pMousePoint = new RoutePoint( - m_cursor_lat, m_cursor_lon, wxString(_T ( "circle" )), - wxEmptyString, wxEmptyString); + RoutePoint *pMousePoint = new RoutePoint(m_cursor_lat, m_cursor_lon, + wxString(_T ( "circle" )), + wxEmptyString, wxEmptyString); pMousePoint->m_bShowName = false; pMousePoint->SetShowWaypointRangeRings(false); @@ -8102,8 +8094,7 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { m_prev_rlat = m_cursor_lat; m_prev_rlon = m_cursor_lon; m_prev_pMousePoint = pMousePoint; - m_pMeasureRoute->m_lastMousePointIndex = - m_pMeasureRoute->GetnPoints(); + m_pMeasureRoute->m_lastMousePointIndex = m_pMeasureRoute->GetnPoints(); m_nMeasureState++; gFrame->RefreshAllCanvas(); @@ -8113,7 +8104,7 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { else { FindRoutePointsAtCursor(SelectRadius, true); // Not creating Route } - } // !g_btouch + } // !g_btouch else { // g_btouch if ((m_bMeasure_Active && m_nMeasureState) || (m_routeState)) { @@ -8163,7 +8154,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { } if (!m_dragoffsetSet) { - RoutePointGui(*m_pRoutePointEditTarget).PresetDragOffset(this, mouse_x, mouse_y); + RoutePointGui(*m_pRoutePointEditTarget) + .PresetDragOffset(this, mouse_x, mouse_y); m_dragoffsetSet = true; } } @@ -8217,8 +8209,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { if (g_btouch) { // m_pRoutePointEditTarget->SetPointFromDraghandlePoint(VPoint, // new_cursor_lat, new_cursor_lon); - RoutePointGui(*m_pRoutePointEditTarget).SetPointFromDraghandlePoint(this, mouse_x, - mouse_y); + RoutePointGui(*m_pRoutePointEditTarget) + .SetPointFromDraghandlePoint(this, mouse_x, mouse_y); // update the Drag Handle entry in the pSelect list pSelect->ModifySelectablePoint(new_cursor_lat, new_cursor_lon, m_pRoutePointEditTarget, @@ -8307,7 +8299,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { // Get the update rectangle for the un-edited mark wxRect pre_rect; if (!g_bopengl) { - RoutePointGui(*m_pRoutePointEditTarget).CalculateDCRect(m_dc_route, this, &pre_rect); + RoutePointGui(*m_pRoutePointEditTarget) + .CalculateDCRect(m_dc_route, this, &pre_rect); if ((lppmax > pre_rect.width / 2) || (lppmax > pre_rect.height / 2)) pre_rect.Inflate((int)(lppmax - (pre_rect.width / 2)), (int)(lppmax - (pre_rect.height / 2))); @@ -8317,8 +8310,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { if (g_btouch) { // m_pRoutePointEditTarget->SetPointFromDraghandlePoint(VPoint, // m_cursor_lat, m_cursor_lon); - RoutePointGui(*m_pRoutePointEditTarget).SetPointFromDraghandlePoint(this, mouse_x, - mouse_y); + RoutePointGui(*m_pRoutePointEditTarget) + .SetPointFromDraghandlePoint(this, mouse_x, mouse_y); // update the Drag Handle entry in the pSelect list pSelect->ModifySelectablePoint(m_cursor_lat, m_cursor_lon, m_pRoutePointEditTarget, @@ -8348,8 +8341,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { } else { // Get the update rectangle for the edited mark wxRect post_rect; - RoutePointGui(*m_pRoutePointEditTarget).CalculateDCRect(m_dc_route, this, - &post_rect); + RoutePointGui(*m_pRoutePointEditTarget) + .CalculateDCRect(m_dc_route, this, &post_rect); if ((lppmax > post_rect.width / 2) || (lppmax > post_rect.height / 2)) post_rect.Inflate((int)(lppmax - (post_rect.width / 2)), (int)(lppmax - (post_rect.height / 2))); @@ -8658,10 +8651,10 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { r_rband.y = y; } - if (m_pMeasureRoute){ - RoutePoint *pMousePoint = new RoutePoint(m_cursor_lat, m_cursor_lon, - wxString(_T ( "circle" )), - wxEmptyString, wxEmptyString); + if (m_pMeasureRoute) { + RoutePoint *pMousePoint = new RoutePoint( + m_cursor_lat, m_cursor_lon, wxString(_T ( "circle" )), + wxEmptyString, wxEmptyString); pMousePoint->m_bShowName = false; m_pMeasureRoute->AddPoint(pMousePoint); @@ -8669,11 +8662,11 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { m_prev_rlat = m_cursor_lat; m_prev_rlon = m_cursor_lon; m_prev_pMousePoint = pMousePoint; - m_pMeasureRoute->m_lastMousePointIndex = m_pMeasureRoute->GetnPoints(); + m_pMeasureRoute->m_lastMousePointIndex = + m_pMeasureRoute->GetnPoints(); m_nMeasureState++; - } - else { + } else { CancelMeasureRoute(); } @@ -8746,7 +8739,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { if (m_lastRoutePointEditTarget) { m_lastRoutePointEditTarget->m_bRPIsBeingEdited = false; m_lastRoutePointEditTarget->m_bPtIsSelected = false; - RoutePointGui(*m_lastRoutePointEditTarget).EnableDragHandle(false); + RoutePointGui(*m_lastRoutePointEditTarget) + .EnableDragHandle(false); pSelect->DeleteSelectablePoint(m_lastRoutePointEditTarget, SELTYPE_DRAGHANDLE); } @@ -8757,7 +8751,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { m_pRoutePointEditTarget->m_bPtIsSelected = true; RoutePointGui(*m_pRoutePointEditTarget).EnableDragHandle(true); wxPoint2DDouble dragHandlePoint = - RoutePointGui(*m_pRoutePointEditTarget).GetDragHandlePoint(this); + RoutePointGui(*m_pRoutePointEditTarget) + .GetDragHandlePoint(this); pSelect->AddSelectablePoint( dragHandlePoint.m_y, dragHandlePoint.m_x, m_pRoutePointEditTarget, SELTYPE_DRAGHANDLE); @@ -8766,7 +8761,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { if (m_lastRoutePointEditTarget) { m_lastRoutePointEditTarget->m_bRPIsBeingEdited = false; m_lastRoutePointEditTarget->m_bPtIsSelected = false; - RoutePointGui(*m_lastRoutePointEditTarget).EnableDragHandle(false); + RoutePointGui(*m_lastRoutePointEditTarget) + .EnableDragHandle(false); pSelect->DeleteSelectablePoint(m_lastRoutePointEditTarget, SELTYPE_DRAGHANDLE); @@ -8794,15 +8790,15 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { } else { if (m_lastRoutePointEditTarget) { wxRect wp_rect; - RoutePointGui(*m_lastRoutePointEditTarget).CalculateDCRect(m_dc_route, this, - &wp_rect); + RoutePointGui(*m_lastRoutePointEditTarget) + .CalculateDCRect(m_dc_route, this, &wp_rect); RefreshRect(wp_rect, true); } if (m_pRoutePointEditTarget) { wxRect wp_rect; - RoutePointGui(*m_pRoutePointEditTarget).CalculateDCRect(m_dc_route, this, - &wp_rect); + RoutePointGui(*m_pRoutePointEditTarget) + .CalculateDCRect(m_dc_route, this, &wp_rect); RefreshRect(wp_rect, true); } } @@ -8914,8 +8910,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { tail = g_pRouteMan->FindVisibleRouteContainingWaypoint( pNearbyPoint); - current = FindRouteContainingWaypoint( - m_pRoutePointEditTarget); + current = + FindRouteContainingWaypoint(m_pRoutePointEditTarget); if (tail && current && (tail != current)) { int dlg_return1; @@ -9174,8 +9170,8 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { * unintentionally*/ tail = g_pRouteMan->FindVisibleRouteContainingWaypoint( pNearbyPoint); - current = FindRouteContainingWaypoint( - m_pRoutePointEditTarget); + current = + FindRouteContainingWaypoint(m_pRoutePointEditTarget); if (tail && current && (tail != current)) { int dlg_return1; @@ -9353,7 +9349,7 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { m_bRouteEditing = false; m_pRoutePointEditTarget = NULL; - //if (m_toolBar && !m_toolBar->IsToolbarShown()) SurfaceToolbar(); + // if (m_toolBar && !m_toolBar->IsToolbarShown()) SurfaceToolbar(); ret = true; } @@ -9373,7 +9369,7 @@ bool ChartCanvas::MouseEventProcessObjects(wxMouseEvent &event) { } m_pRoutePointEditTarget = NULL; m_bMarkEditing = false; - //if (m_toolBar && !m_toolBar->IsToolbarShown()) SurfaceToolbar(); + // if (m_toolBar && !m_toolBar->IsToolbarShown()) SurfaceToolbar(); ret = true; } @@ -9529,8 +9525,9 @@ bool ChartCanvas::MouseEventProcessCanvas(wxMouseEvent &event) { } if ((last_drag.x != x) || (last_drag.y != y)) { - if(!m_routeState){ // Correct fault on wx32/gtk3, uncommanded dragging on route create. - // github #2994 + if (!m_routeState) { // Correct fault on wx32/gtk3, uncommanded dragging + // on route create. + // github #2994 m_bChartDragging = true; StartTimedMovement(); m_pan_drag.x += last_drag.x - x; @@ -9661,8 +9658,10 @@ void ChartCanvas::ShowObjectQueryWindow(int x, int y, float zlat, float zlon) { wxPoint target_point; GetCanvasPointPix(sa->latitude, sa->longitude, &target_point); bbox.Expand(target_point); - if (sa->e_dim_m > sa->n_dim_m) bbox.EnLarge(sa->e_dim_m * vp_scale); - else bbox.EnLarge(sa->n_dim_m * vp_scale); + if (sa->e_dim_m > sa->n_dim_m) + bbox.EnLarge(sa->e_dim_m * vp_scale); + else + bbox.EnLarge(sa->n_dim_m * vp_scale); break; } case AIS8_001_22_SHAPE_POLYGON: @@ -9686,12 +9685,15 @@ void ChartCanvas::ShowObjectQueryWindow(int x, int y, float zlat, float zlon) { GetCanvasPointPix(lat1, lon1, &target_point); bbox.Expand(target_point); for (int i = 0; i < 18; ++i) { - ll_gc_ll(lat1, lon1, sa->left_bound_deg + i * (sa->right_bound_deg - sa->left_bound_deg) / 18 , sa->radius_m / 1852.0, - &lat, &lon); + ll_gc_ll( + lat1, lon1, + sa->left_bound_deg + + i * (sa->right_bound_deg - sa->left_bound_deg) / 18, + sa->radius_m / 1852.0, &lat, &lon); GetCanvasPointPix(lat, lon, &target_point); bbox.Expand(target_point); } - ll_gc_ll(lat1, lon1, sa->right_bound_deg , sa->radius_m / 1852.0, + ll_gc_ll(lat1, lon1, sa->right_bound_deg, sa->radius_m / 1852.0, &lat, &lon); GetCanvasPointPix(lat, lon, &target_point); bbox.Expand(target_point); @@ -9816,23 +9818,26 @@ void ChartCanvas::ShowObjectQueryWindow(int x, int y, float zlat, float zlon) { file.GetFullName()); file.Normalize(); file.Assign(file.GetPath(), wxT("")); - wxDir dir( file.GetFullPath() ); + wxDir dir(file.GetFullPath()); wxString filename; - bool cont = dir.GetFirst( &filename, "", wxDIR_FILES ); - while ( cont ) - { - file.Assign( dir.GetNameWithSep().append( filename) ); - wxString FormatString = _T("%s"); - if( g_ObjQFileExt.Find( file.GetExt().Lower() ) != wxNOT_FOUND ) - { - filenameOK=file.GetFullPath();//remember last valid name + bool cont = dir.GetFirst(&filename, "", wxDIR_FILES); + while (cont) { + file.Assign(dir.GetNameWithSep().append(filename)); + wxString FormatString = + _T("%s"); + if (g_ObjQFileExt.Find(file.GetExt().Lower()) != wxNOT_FOUND) { + filenameOK = file.GetFullPath(); // remember last valid name // we are making a 3 columns table. New row only every third file - if ( 3*((int)filecount/3) == filecount ) - FormatString.Prepend(_T("")); // new row + if (3 * ((int)filecount / 3) == filecount) + FormatString.Prepend(_T("")); // new row else - FormatString.Prepend(_T("     ")); // an empty spacer column + FormatString.Prepend( + _T("     ")); // an empty + // spacer column - AddFiles << wxString::Format(FormatString, file.GetFullPath(), file.GetFullName()); + AddFiles << wxString::Format(FormatString, file.GetFullPath(), + file.GetFullName()); filecount++; } cont = dir.GetNext(&filename); @@ -9846,8 +9851,8 @@ void ChartCanvas::ShowObjectQueryWindow(int x, int y, float zlat, float zlon) { g_pObjectQueryDialog->SetHTMLPage(objText); g_pObjectQueryDialog->Show(); } - if ((!Chs57 && filecount == 1)){ // only one file?, show direktly - //generate an event to avoid double code + if ((!Chs57 && filecount == 1)) { // only one file?, show direktly + // generate an event to avoid double code wxHtmlLinkInfo hli(filenameOK); wxHtmlLinkEvent hle(1, hli); g_pObjectQueryDialog->OnHtmlLinkClicked(hle); @@ -9906,14 +9911,12 @@ void ChartCanvas::ShowMarkPropertiesDialog(RoutePoint *markPoint) { markPoint->m_bRPIsBeingEdited = false; wxString title_base = _("Waypoint Properties"); - if (!markPoint->m_bIsInRoute) - title_base = _("Mark Properties"); + if (!markPoint->m_bIsInRoute) title_base = _("Mark Properties"); - g_pMarkInfoDialog->SetRoutePoints(std::vector {markPoint}); + g_pMarkInfoDialog->SetRoutePoints(std::vector{markPoint}); g_pMarkInfoDialog->UpdateProperties(); if (markPoint->m_bIsInLayer) { - wxString caption(wxString::Format(_T("%s, %s: %s"), - title_base, _("Layer"), + wxString caption(wxString::Format(_T("%s, %s: %s"), title_base, _("Layer"), GetLayerName(markPoint->m_LayerID))); g_pMarkInfoDialog->SetDialogTitle(caption); } else @@ -10240,7 +10243,7 @@ void ChartCanvas::StartRoute(void) { m_routeState = 1; m_bDrawingRoute = false; SetCursor(*pCursorPencil); - //SetCanvasToolbarItemState(ID_ROUTE, true); + // SetCanvasToolbarItemState(ID_ROUTE, true); gFrame->SetMasterToolbarItemState(ID_MENU_ROUTE_NEW, true); HideGlobalToolbar(); @@ -10255,7 +10258,7 @@ void ChartCanvas::FinishRoute(void) { m_prev_pMousePoint = NULL; m_bDrawingRoute = false; - //SetCanvasToolbarItemState(ID_ROUTE, false); + // SetCanvasToolbarItemState(ID_ROUTE, false); gFrame->SetMasterToolbarItemState(ID_MENU_ROUTE_NEW, false); #ifdef __ANDROID__ androidSetRouteAnnunciator(false); @@ -10559,9 +10562,8 @@ static void RouteLegInfo(ocpnDC &dc, wxPoint ref_point, const wxString &first, pointsize /= OCPN_GetWinDIPScaleFactor(); wxFont *psRLI_font = FontMgr::Get().FindOrCreateFont( - pointsize, dFont->GetFamily(), dFont->GetStyle(), - dFont->GetWeight(), false, dFont->GetFaceName()); - + pointsize, dFont->GetFamily(), dFont->GetStyle(), dFont->GetWeight(), + false, dFont->GetFaceName()); dc.SetFont(*psRLI_font); @@ -10584,7 +10586,7 @@ static void RouteLegInfo(ocpnDC &dc, wxPoint ref_point, const wxString &first, h1 *= (OCPN_GetWinDIPScaleFactor() * 100.) / 100; h2 *= (OCPN_GetWinDIPScaleFactor() * 100.) / 100; - w = wxMax(w1, w2) + (h1 / 2); // Add a little right pad + w = wxMax(w1, w2) + (h1 / 2); // Add a little right pad w *= (OCPN_GetWinDIPScaleFactor() * 100.) / 100; h = h1 + h2; @@ -10631,12 +10633,11 @@ void ChartCanvas::RenderShipToActive(ocpnDC &dc, bool Use_Opengl) { dc.SetBrush(wxBrush(color, wxBRUSHSTYLE_SOLID)); if (!Use_Opengl) - RouteGui(*rt).RenderSegment(dc, (int)pa.m_x, (int)pa.m_y, (int)pb.m_x, (int)pb.m_y, - GetVP(), true); + RouteGui(*rt).RenderSegment(dc, (int)pa.m_x, (int)pa.m_y, (int)pb.m_x, + (int)pb.m_y, GetVP(), true); #ifdef ocpnUSE_GL else { - #ifdef USE_ANDROID_GLES2 dc.DrawLine(pa.m_x, pa.m_y, pb.m_x, pb.m_y); #else @@ -10650,8 +10651,8 @@ void ChartCanvas::RenderShipToActive(ocpnDC &dc, bool Use_Opengl) { dc.DrawLine(pa.m_x, pa.m_y, pb.m_x, pb.m_y); #endif - RouteGui(*rt).RenderSegmentArrowsGL(dc, (int)pa.m_x, (int)pa.m_y, (int)pb.m_x, - (int)pb.m_y, GetVP()); + RouteGui(*rt).RenderSegmentArrowsGL(dc, (int)pa.m_x, (int)pa.m_y, + (int)pb.m_x, (int)pb.m_y, GetVP()); } #endif } @@ -10665,9 +10666,8 @@ void ChartCanvas::RenderRouteLegs(ocpnDC &dc) { if (!route) return; - // Validate route pointer - if( !g_pRouteMan->IsRouteValid(route) ) - return; + // Validate route pointer + if (!g_pRouteMan->IsRouteValid(route)) return; double render_lat = m_cursor_lat; double render_lon = m_cursor_lon; @@ -10707,8 +10707,9 @@ void ChartCanvas::RenderRouteLegs(ocpnDC &dc) { route->m_NextLegGreatCircle = true; } - //FIXME (MacOS, the first segment is rendered wrong) - RouteGui(*route).DrawPointWhich(dc, this, route->m_lastMousePointIndex, &lastPoint); + // FIXME (MacOS, the first segment is rendered wrong) + RouteGui(*route).DrawPointWhich(dc, this, route->m_lastMousePointIndex, + &lastPoint); if (route->m_NextLegGreatCircle) { for (int i = 1; i <= milesDiff; i++) { @@ -10717,12 +10718,14 @@ void ChartCanvas::RenderRouteLegs(ocpnDC &dc) { Geodesic::GreatCircleTravel(render_lon, render_lat, gcDist * p, brg, &pLon, &pLat, &gcBearing2); destPoint = VPoint.GetPixFromLL(pLat, pLon); - RouteGui(*route).DrawSegment(dc, this, &lastPoint, &destPoint, GetVP(), false); + RouteGui(*route).DrawSegment(dc, this, &lastPoint, &destPoint, GetVP(), + false); lastPoint = destPoint; } } else { if (r_rband.x && r_rband.y) { // RubberBand disabled? - RouteGui(*route).DrawSegment(dc, this, &lastPoint, &r_rband, GetVP(), false); + RouteGui(*route).DrawSegment(dc, this, &lastPoint, &r_rband, GetVP(), + false); if (m_bMeasure_DistCircle) { double distanceRad = sqrtf(powf((float)(r_rband.x - lastPoint.x), 2) + powf((float)(r_rband.y - lastPoint.y), 2)); @@ -10745,8 +10748,8 @@ void ChartCanvas::RenderRouteLegs(ocpnDC &dc) { double lonAverage = (m_cursor_lon + render_lon) / 2; double varBrg = gFrame->GetMag(brg, latAverage, lonAverage); - routeInfo << wxString::Format(wxString("%03d%c(M) ", wxConvUTF8), (int)varBrg, - 0x00B0); + routeInfo << wxString::Format(wxString("%03d%c(M) ", wxConvUTF8), + (int)varBrg, 0x00B0); } routeInfo << _T(" ") << FormatDistanceAdaptive(dist); @@ -10773,9 +10776,9 @@ void ChartCanvas::RenderVisibleSectorLights(ocpnDC &dc) { // need to re-evaluate sectors? double rhumbBearing, rhumbDist; DistanceBearingMercator(gLat, gLon, m_sector_glat, m_sector_glon, - &rhumbBearing, &rhumbDist); + &rhumbBearing, &rhumbDist); - if (rhumbDist > 0.05) // miles + if (rhumbDist > 0.05) // miles { s57_GetVisibleLightSectors(this, gLat, gLon, GetVP(), m_sectorlegsVisible); @@ -10831,10 +10834,8 @@ void ChartCanvas::UpdateCanvasS52PLIBConfig() { v[_T("OpenCPN S52PLIB ShowText")] = GetShowENCText(); v[_T("OpenCPN S52PLIB ShowSoundings")] = GetShowENCDepth(); v[_T("OpenCPN S52PLIB ShowLights")] = GetShowENCLights(); - v[_T("OpenCPN S52PLIB ShowAnchorConditions")] = - m_encShowAnchor; - v[_T("OpenCPN S52PLIB ShowQualityOfData")] = - GetShowENCDataQual(); + v[_T("OpenCPN S52PLIB ShowAnchorConditions")] = m_encShowAnchor; + v[_T("OpenCPN S52PLIB ShowQualityOfData")] = GetShowENCDataQual(); v[_T("OpenCPN S52PLIB ShowATONLabel")] = GetShowENCBuoyLabels(); v[_T("OpenCPN S52PLIB ShowLightDescription")] = GetShowENCLightDesc(); @@ -10848,17 +10849,20 @@ void ChartCanvas::UpdateCanvasS52PLIBConfig() { v[_T("OpenCPN S52PLIB MetaDisplay")] = ps52plib->m_bShowMeta; v[_T("OpenCPN S52PLIB DeclutterText")] = ps52plib->m_bDeClutterText; v[_T("OpenCPN S52PLIB ShowNationalText")] = ps52plib->m_bShowNationalTexts; - v[_T("OpenCPN S52PLIB ShowImportantTextOnly")] = ps52plib->m_bShowS57ImportantTextOnly; + v[_T("OpenCPN S52PLIB ShowImportantTextOnly")] = + ps52plib->m_bShowS57ImportantTextOnly; v[_T("OpenCPN S52PLIB UseSCAMIN")] = ps52plib->m_bUseSCAMIN; v[_T("OpenCPN S52PLIB UseSUPER_SCAMIN")] = ps52plib->m_bUseSUPER_SCAMIN; v[_T("OpenCPN S52PLIB SymbolStyle")] = ps52plib->m_nSymbolStyle; v[_T("OpenCPN S52PLIB BoundaryStyle")] = ps52plib->m_nBoundaryStyle; - v[_T("OpenCPN S52PLIB ColorShades")] = S52_getMarinerParam( S52_MAR_TWO_SHADES ); + v[_T("OpenCPN S52PLIB ColorShades")] = + S52_getMarinerParam(S52_MAR_TWO_SHADES); // Some global GUI parameters, for completeness v[_T("OpenCPN Zoom Mod Vector")] = g_chart_zoom_modifier_vector; v[_T("OpenCPN Zoom Mod Other")] = g_chart_zoom_modifier_raster; - v[_T("OpenCPN Scale Factor Exp")] = g_Platform->GetChartScaleFactorExp(g_ChartScaleFactor); + v[_T("OpenCPN Scale Factor Exp")] = + g_Platform->GetChartScaleFactorExp(g_ChartScaleFactor); v[_T("OpenCPN Display Width")] = (int)g_display_size_mm; wxJSONWriter w; @@ -11227,7 +11231,7 @@ void ChartCanvas::OnPaint(wxPaintEvent &event) { double r = VPoint.rotation; SetVPRotation(VPoint.skew); - //pWorldBackgroundChart->RenderViewOnDC(bgdc, VPoint); + // pWorldBackgroundChart->RenderViewOnDC(bgdc, VPoint); gShapeBasemap.RenderViewOnDC(bgdc, VPoint); SetVPRotation(r); @@ -11859,7 +11863,8 @@ void ChartCanvas::DrawOverlayObjects(ocpnDC &dc, const wxRegion &ru) { if (g_pi_manager) { g_pi_manager->SendViewPortToRequestingPlugIns(GetVP()); - g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, OVERLAY_LEGACY); + g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, + OVERLAY_LEGACY); } AISDrawAreaNotices(dc, GetVP(), this); @@ -11892,15 +11897,17 @@ void ChartCanvas::DrawOverlayObjects(ocpnDC &dc, const wxRegion &ru) { ScaleBarDraw(dc); s57_DrawExtendedLightSectors(dc, VPoint, extendedSectorLegs); if (g_pi_manager) { - g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, OVERLAY_OVER_SHIPS); + g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, + OVERLAY_OVER_SHIPS); } DrawEmboss(dc, EmbossDepthScale()); DrawEmboss(dc, EmbossOverzoomIndicator(dc)); if (g_pi_manager) { - g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, OVERLAY_OVER_EMBOSS); + g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, + OVERLAY_OVER_EMBOSS); } - if(!g_PrintingInProgress){ + if (!g_PrintingInProgress) { if (IsPrimaryCanvas()) { if (g_MainToolbar) g_MainToolbar->DrawDC(dc, 1.0); } @@ -11909,8 +11916,7 @@ void ChartCanvas::DrawOverlayObjects(ocpnDC &dc, const wxRegion &ru) { if (g_iENCToolbar) g_iENCToolbar->DrawDC(dc, 1.0); } - if (m_muiBar) - m_muiBar->DrawDC( dc, 1.0); + if (m_muiBar) m_muiBar->DrawDC(dc, 1.0); if (m_pTrackRolloverWin) { m_pTrackRolloverWin->Draw(dc); @@ -11928,7 +11934,8 @@ void ChartCanvas::DrawOverlayObjects(ocpnDC &dc, const wxRegion &ru) { } } if (g_pi_manager) { - g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, OVERLAY_OVER_UI); + g_pi_manager->RenderAllCanvasOverlayPlugIns(dc, GetVP(), m_canvasIndex, + OVERLAY_OVER_UI); } } @@ -12136,7 +12143,7 @@ emboss_data *ChartCanvas::CreateEmbossMapData(wxFont &font, int width, void ChartCanvas::DrawAllTracksInBBox(ocpnDC &dc, LLBBox &BltBBox) { Track *active_track = NULL; - for (Track* pTrackDraw : g_TrackList) { + for (Track *pTrackDraw : g_TrackList) { if (g_pActiveTrack == pTrackDraw) { active_track = pTrackDraw; continue; @@ -12150,7 +12157,7 @@ void ChartCanvas::DrawAllTracksInBBox(ocpnDC &dc, LLBBox &BltBBox) { void ChartCanvas::DrawActiveTrackInBBox(ocpnDC &dc, LLBBox &BltBBox) { Track *active_track = NULL; - for (Track* pTrackDraw : g_TrackList) { + for (Track *pTrackDraw : g_TrackList) { if (g_pActiveTrack == pTrackDraw) { active_track = pTrackDraw; break; @@ -12388,11 +12395,9 @@ void ChartCanvas::DrawAllTidesInBBox(ocpnDC &dc, LLBBox &BBox) { dc.SetTextForeground(FontMgr::Get().GetFontColor(_("ExtendedTideIcon"))); int font_size = wxMax(10, dFont->GetPointSize()); font_size /= g_Platform->GetDisplayDIPMult(this); - wxFont *plabelFont = - FontMgr::Get().FindOrCreateFont(font_size, - dFont->GetFamily(), dFont->GetStyle(), - dFont->GetWeight(), false, - dFont->GetFaceName()); + wxFont *plabelFont = FontMgr::Get().FindOrCreateFont( + font_size, dFont->GetFamily(), dFont->GetStyle(), dFont->GetWeight(), + false, dFont->GetFaceName()); dc.SetPen(*pblack_pen); dc.SetBrush(*pgreen_brush); @@ -12445,7 +12450,6 @@ void ChartCanvas::DrawAllTidesInBBox(ocpnDC &dc, LLBBox &BBox) { float nominal_icon_size_pixels = 48; // 3 x 16 float pix_factor = (2 * height) / nominal_icon_size_pixels; - #else // Yet another method goes like this: // Set the onscreen size of the symbol @@ -12475,7 +12479,6 @@ void ChartCanvas::DrawAllTidesInBBox(ocpnDC &dc, LLBBox &BBox) { scale_factor *= user_scale_factor; scale_factor *= GetContentScaleFactor(); - { double marge = 0.05; std::vector drawn_boxes; @@ -12489,18 +12492,16 @@ void ChartCanvas::DrawAllTidesInBBox(ocpnDC &dc, LLBBox &BBox) { double lat = pIDX->IDX_lat; if (BBox.ContainsMarge(lat, lon, marge)) { - // Avoid drawing detailed graphic for duplicate tide stations - if (GetVP().chart_scale < 500000){ + if (GetVP().chart_scale < 500000) { bool bdrawn = false; - for (size_t i = 0; i < drawn_boxes.size(); i++){ - if (drawn_boxes[i].Contains(lat, lon)){ + for (size_t i = 0; i < drawn_boxes.size(); i++) { + if (drawn_boxes[i].Contains(lat, lon)) { bdrawn = true; break; } } - if (bdrawn) - continue; // the station loop + if (bdrawn) continue; // the station loop LLBBox this_box; this_box.Set(lat, lon, lat, lon); @@ -12713,19 +12714,15 @@ void ChartCanvas::DrawAllCurrentsInBBox(ocpnDC &dc, LLBBox &BBox) { wxBrush *pblack_brush = wxTheBrushList->FindOrCreateBrush( GetGlobalColor(_T ( "UINFD" )), wxBRUSHSTYLE_SOLID); - double skew_angle = GetVPRotation(); wxFont *dFont = FontMgr::Get().GetFont(_("CurrentValue")); dc.SetTextForeground(FontMgr::Get().GetFontColor(_("CurrentValue"))); int font_size = wxMax(10, dFont->GetPointSize()); font_size /= g_Platform->GetDisplayDIPMult(this); - pTCFont = - FontMgr::Get().FindOrCreateFont(font_size, - dFont->GetFamily(), dFont->GetStyle(), - dFont->GetWeight(), false, - dFont->GetFaceName()); - + pTCFont = FontMgr::Get().FindOrCreateFont( + font_size, dFont->GetFamily(), dFont->GetStyle(), dFont->GetWeight(), + false, dFont->GetFaceName()); float scale_factor = 1.0; @@ -13178,9 +13175,6 @@ void ChartCanvas::OnToolLeftClick(wxCommandEvent &event) { event.Skip(); } - - - void ChartCanvas::SetShowAIS(bool show) { m_bShowAIS = show; if (GetMUIBar() && GetMUIBar()->GetCanvasOptions()) @@ -13234,11 +13228,9 @@ void ChartCanvas::SetAISCanvasDisplayStyle(int StyleIndx) { m_bShowAISScaled = bShowScaled_Array[AIS_Toolbar_Switch]; } -void ChartCanvas::TouchAISToolActive(void) { - } +void ChartCanvas::TouchAISToolActive(void) {} -void ChartCanvas::UpdateAISTBTool(void) { -} +void ChartCanvas::UpdateAISTBTool(void) {} //--------------------------------------------------------------------------------- // @@ -13454,9 +13446,8 @@ void ChartCanvas::AddTileOverlayIndexToNoShow(int index) { // //------------------------------------------------------------------------------------------------------- -void ChartCanvas::HandlePianoClick(int selected_index, - const std::vector &selected_dbIndex_array) -{ +void ChartCanvas::HandlePianoClick( + int selected_index, const std::vector &selected_dbIndex_array) { if (g_boptionsactive) return; // Piano might be invalid due to chartset updates. if (!m_pCurrentStack) return; @@ -13468,12 +13459,14 @@ void ChartCanvas::HandlePianoClick(int selected_index, // but the delayed timer fires first and it zooms out again! StopMovement(); - // When switching by piano key click, we may appoint the new target chart to be - // any chart in the composite array. - // As an improvement to UX, find the chart that is "closest" to the current vp, - // and select that chart. This will cause a jump to the centroid of that chart + // When switching by piano key click, we may appoint the new target chart to + // be any chart in the composite array. + // As an improvement to UX, find the chart that is "closest" to the current + // vp, + // and select that chart. This will cause a jump to the centroid of that + // chart - double distance = 25000; //RTW + double distance = 25000; // RTW int closest_index = -1; for (int chart_index : selected_dbIndex_array) { const ChartTableEntry &cte = ChartData->GetChartTableEntry(chart_index); @@ -13482,15 +13475,14 @@ void ChartCanvas::HandlePianoClick(int selected_index, // measure distance as Manhattan style double test_distance = abs(m_vLat - chart_lat) + abs(m_vLon - chart_lon); - if (test_distance < distance){ + if (test_distance < distance) { distance = test_distance; closest_index = chart_index; } } int selected_dbIndex = selected_dbIndex_array[0]; - if (closest_index >= 0) - selected_dbIndex = closest_index; + if (closest_index >= 0) selected_dbIndex = closest_index; if (!GetQuiltMode()) { if (m_bpersistent_quilt /* && g_bQuiltEnable*/) { @@ -13594,9 +13586,9 @@ void ChartCanvas::HandlePianoClick(int selected_index, ReloadVP(); // Pick up the new selections } -void ChartCanvas::HandlePianoRClick(int x, int y, int selected_index, - const std::vector &selected_dbIndex_array) -{ +void ChartCanvas::HandlePianoRClick( + int x, int y, int selected_index, + const std::vector &selected_dbIndex_array) { if (g_boptionsactive) return; // Piano might be invalid due to chartset updates. if (!GetpCurrentStack()) return; @@ -13607,9 +13599,9 @@ void ChartCanvas::HandlePianoRClick(int x, int y, int selected_index, SetQuiltChartHiLiteIndex(-1); } -void ChartCanvas::HandlePianoRollover(int selected_index, - const std::vector &selected_dbIndex_array, - int n_charts, int scale) { +void ChartCanvas::HandlePianoRollover( + int selected_index, const std::vector &selected_dbIndex_array, + int n_charts, int scale) { if (g_boptionsactive) return; // Piano might be invalid due to chartset updates. if (!GetpCurrentStack()) return; @@ -13643,16 +13635,15 @@ void ChartCanvas::HandlePianoRollover(int selected_index, ShowChartInfoWindow(key_location.x, -1); } } - } - else { + } else { piano_chart_index_array = GetQuiltFullScreendbIndexArray(); if ((GetpCurrentStack()->nEntry > 1) || - (piano_chart_index_array.size() >= 1)) { - - if(n_charts > 1) - ShowCompositeInfoWindow(key_location.x, n_charts, scale, selected_dbIndex_array); - else if(n_charts == 1) + (piano_chart_index_array.size() >= 1)) { + if (n_charts > 1) + ShowCompositeInfoWindow(key_location.x, n_charts, scale, + selected_dbIndex_array); + else if (n_charts == 1) ShowChartInfoWindow(key_location.x, selected_dbIndex_array[0]); SetQuiltChartHiLiteIndexArray(selected_dbIndex_array); @@ -13686,7 +13677,7 @@ void ChartCanvas::UpdateCanvasControlBar(void) { wxString old_hash = m_Piano->GetStoredHash(); if (GetQuiltMode()) { - m_Piano->SetKeyArray(GetQuiltExtendedStackdbIndexArray(), + m_Piano->SetKeyArray(GetQuiltExtendedStackdbIndexArray(), GetQuiltFullScreendbIndexArray()); std::vector piano_active_chart_index_array = @@ -13781,8 +13772,9 @@ void ChartCanvas::UpdateCanvasControlBar(void) { void ChartCanvas::FormatPianoKeys(void) { m_Piano->FormatKeys(); } -void ChartCanvas::PianoPopupMenu(int x, int y, int selected_index, - const std::vector &selected_dbIndex_array) { +void ChartCanvas::PianoPopupMenu( + int x, int y, int selected_index, + const std::vector &selected_dbIndex_array) { if (!GetpCurrentStack()) return; // No context menu if quilting is disabled @@ -13790,15 +13782,15 @@ void ChartCanvas::PianoPopupMenu(int x, int y, int selected_index, m_piano_ctx_menu = new wxMenu(); - if(m_Piano->GetPianoMode() == PIANO_MODE_COMPOSITE) { -// m_piano_ctx_menu->Append(ID_PIANO_EXPAND_PIANO, _("Legacy chartbar")); -// Connect(ID_PIANO_EXPAND_PIANO, wxEVT_COMMAND_MENU_SELECTED, -// wxCommandEventHandler(ChartCanvas::OnPianoMenuExpandChartbar)); - } - else { -// m_piano_ctx_menu->Append(ID_PIANO_CONTRACT_PIANO, _("Fullscreen chartbar")); -// Connect(ID_PIANO_CONTRACT_PIANO, wxEVT_COMMAND_MENU_SELECTED, -// wxCommandEventHandler(ChartCanvas::OnPianoMenuContractChartbar)); + if (m_Piano->GetPianoMode() == PIANO_MODE_COMPOSITE) { + // m_piano_ctx_menu->Append(ID_PIANO_EXPAND_PIANO, _("Legacy chartbar")); + // Connect(ID_PIANO_EXPAND_PIANO, wxEVT_COMMAND_MENU_SELECTED, + // wxCommandEventHandler(ChartCanvas::OnPianoMenuExpandChartbar)); + } else { + // m_piano_ctx_menu->Append(ID_PIANO_CONTRACT_PIANO, _("Fullscreen + // chartbar")); Connect(ID_PIANO_CONTRACT_PIANO, + // wxEVT_COMMAND_MENU_SELECTED, + // wxCommandEventHandler(ChartCanvas::OnPianoMenuContractChartbar)); menu_selected_dbIndex = selected_dbIndex_array[0]; menu_selected_index = selected_index; diff --git a/gui/src/cm93.cpp b/gui/src/cm93.cpp index ef61635dc1..9d9fc01e5a 100644 --- a/gui/src/cm93.cpp +++ b/gui/src/cm93.cpp @@ -2089,7 +2089,8 @@ void cm93chart::SetVPParms(const ViewPort &vpt) { m_this_chart_context->safety_contour = m_next_safe_cnt; m_this_chart_context->vertex_buffer = GetLineVertexBuffer(); - m_this_chart_context->pt2GetAssociatedObjects = &s57chart::GetAssociatedObjects; + m_this_chart_context->pt2GetAssociatedObjects = + &s57chart::GetAssociatedObjects; // Loop and populate all the objects for (int i = 0; i < PI_PRIO_NUM; ++i) { @@ -3282,13 +3283,13 @@ S57Obj *cm93chart::CreateS57Obj(int cell_index, int iobject, int subcell, break; case 'S': - pAVS = strdup((char*)aval); + pAVS = strdup((char *)aval); pattValTmp->valType = OGR_STR; pattValTmp->value = pAVS; break; case 'C': - pAVS = strdup((const char*)&aval[3]); + pAVS = strdup((const char *)&aval[3]); pattValTmp->valType = OGR_STR; pattValTmp->value = pAVS; break; @@ -4198,8 +4199,8 @@ bool cm93chart::UpdateCovrSet(ViewPort *vpt) { loadcell_key++; } // while - } // cell is not in - } // for cellindex array + } // cell is not in + } // for cellindex array return true; } @@ -4730,7 +4731,9 @@ void cm93compchart::SetVPParms(const ViewPort &vpt) { // Continuoesly update the composite chart edition date to the latest cell // decoded if (m_pcm93chart_array[cmscale]) { - if (!m_EdDate.IsValid() || !m_pcm93chart_array[cmscale]->GetEditionDate().IsValid() || m_pcm93chart_array[cmscale]->GetEditionDate().IsLaterThan(m_EdDate)) + if (!m_EdDate.IsValid() || + !m_pcm93chart_array[cmscale]->GetEditionDate().IsValid() || + m_pcm93chart_array[cmscale]->GetEditionDate().IsLaterThan(m_EdDate)) m_EdDate = m_pcm93chart_array[cmscale]->GetEditionDate(); } } @@ -5228,7 +5231,12 @@ bool cm93compchart::DoRenderRegionViewOnGL(const wxGLContext &glc, // Render the cm93 cell's M_COVR outlines if called for if (m_cell_index_special_outline) { +#ifdef ocpnUSE_GL + glChartCanvas *glc = gFrame->GetPrimaryCanvas()->GetglCanvas(); + ocpnDC dc(*glc); +#else ocpnDC dc; +#endif dc.SetVP(VPoint); covr_set *pcover = m_pcm93chart_current->GetCoverSet(); @@ -5778,8 +5786,8 @@ bool cm93compchart::RenderNextSmallerCellOutlines(ocpnDC &dc, ViewPort &vp, return true; } -bool cm93compchart::RenderCellOutlines(ocpnDC &dc, ViewPort &vp, - wxPoint *pwp, M_COVR_Desc *mcd) { +bool cm93compchart::RenderCellOutlines(ocpnDC &dc, ViewPort &vp, wxPoint *pwp, + M_COVR_Desc *mcd) { float_2Dpt *p = mcd->pvertices; int np = mcd->m_nvertices; @@ -5827,7 +5835,7 @@ void cm93compchart::UpdateLUPs(s57chart *pOwner) { } } -std::list *cm93compchart::GetAssociatedObjects(S57Obj *obj) { +std::list *cm93compchart::GetAssociatedObjects(S57Obj *obj) { if (m_pcm93chart_current) return m_pcm93chart_current->GetAssociatedObjects(obj); else diff --git a/gui/src/color_handler.cpp b/gui/src/color_handler.cpp index 005e1229d4..dcf8535da4 100644 --- a/gui/src/color_handler.cpp +++ b/gui/src/color_handler.cpp @@ -4,10 +4,9 @@ #include "s52plib.h" #include "model/ocpn_types.h" -extern s52plib *ps52plib; +extern s52plib* ps52plib; extern wxColorHashMap* pcurrent_user_color_hash; - wxColour GetGlobalColor(wxString colorName) { wxColour ret_color; diff --git a/gui/src/compass.cpp b/gui/src/compass.cpp index 1c9628979b..6246a4cc9c 100644 --- a/gui/src/compass.cpp +++ b/gui/src/compass.cpp @@ -36,7 +36,7 @@ #include "styles.h" #include "glChartCanvas.h" -#include "ocpn_frame.h" // FIXME (dave) colorschemes +#include "ocpn_frame.h" // FIXME (dave) colorschemes extern ocpnStyle::StyleManager* g_StyleManager; extern bool g_bSatValid; @@ -89,7 +89,7 @@ ocpnCompass::~ocpnCompass() { void ocpnCompass::Paint(ocpnDC& dc) { if (m_shown && m_StatBmp.IsOk()) { #if defined(ocpnUSE_GLES) || defined(ocpnUSE_GL) - if (g_bopengl && !m_texobj){ + if (g_bopengl && !m_texobj) { // The glContext is known active here, // so safe to create a texture. glGenTextures(1, &m_texobj); @@ -148,18 +148,16 @@ void ocpnCompass::Paint(ocpnDC& dc) { } else { #ifdef __WXOSX__ // Support MacBook Retina display - if(g_bopengl){ + if (g_bopengl) { double scale = m_parent->GetContentScaleFactor(); - if(scale > 1){ + if (scale > 1) { wxImage image = m_StatBmp.ConvertToImage(); - image.Rescale( image.GetWidth() * scale, image.GetHeight() * scale); - wxBitmap bmp( image ); + image.Rescale(image.GetWidth() * scale, image.GetHeight() * scale); + wxBitmap bmp(image); dc.DrawBitmap(bmp, m_rect.x, m_rect.y, true); - } - else + } else dc.DrawBitmap(m_StatBmp, m_rect.x, m_rect.y, true); - } - else + } else dc.DrawBitmap(m_StatBmp, m_rect.x, m_rect.y, true); #else dc.DrawBitmap(m_StatBmp, m_rect.x, m_rect.y, true); @@ -193,16 +191,13 @@ void ocpnCompass::SetColorScheme(ColorScheme cs) { } void ocpnCompass::UpdateStatus(bool bnew) { - if (bnew) - m_lastgpsIconName.Clear(); // force an update to occur + if (bnew) m_lastgpsIconName.Clear(); // force an update to occur CreateBmp(bnew); #ifdef ocpnUSE_GL - if (g_bopengl && m_texobj) - CreateTexture(); + if (g_bopengl && m_texobj) CreateTexture(); #endif - } void ocpnCompass::SetScaleFactor(float factor) { @@ -249,7 +244,7 @@ void ocpnCompass::SetScaleFactor(float factor) { } void ocpnCompass::CreateBmp(bool newColorScheme) { - //if (!m_shown) return; + // if (!m_shown) return; wxString gpsIconName; ocpnStyle::Style* style = g_StyleManager->GetCurrentStyle(); @@ -318,7 +313,7 @@ void ocpnCompass::CreateBmp(bool newColorScheme) { if (fabs(m_rose_angle - rose_angle) > .1) b_need_refresh = true; - //if (!b_need_refresh) return; + // if (!b_need_refresh) return; int width = compassBg.GetWidth(); if (m_bshowGPS) width += gpsBg.GetWidth() + leftmargin; @@ -332,7 +327,7 @@ void ocpnCompass::CreateBmp(bool newColorScheme) { m_rect.width = m_StatBmp.GetWidth(); m_rect.height = m_StatBmp.GetHeight(); - //if (!m_StatBmp.IsOk()) return; + // if (!m_StatBmp.IsOk()) return; m_MaskBmp = wxBitmap(m_StatBmp.GetWidth(), m_StatBmp.GetHeight()); if (style->marginsInvisible) { @@ -447,7 +442,7 @@ void ocpnCompass::CreateBmp(bool newColorScheme) { void ocpnCompass::CreateTexture() { #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) // GLES does not do ocpnDC::DrawBitmap(), so use - // texture + // texture if (g_bopengl) { wxImage image = m_StatBmp.ConvertToImage(); unsigned char* imgdata = image.GetData(); @@ -489,7 +484,7 @@ void ocpnCompass::CreateTexture() { m_tex_h = height_pot; GLuint format = GL_RGBA; - GLuint internalformat = GL_RGBA8; //format; + GLuint internalformat = GL_RGBA8; // format; int stride = 4; if (imgdata) { @@ -530,7 +525,7 @@ void ocpnCompass::CreateTexture() { void ocpnCompass::UpdateTexture() { #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) // GLES does not do ocpnDC::DrawBitmap(), so use - // texture + // texture if (g_bopengl) { wxImage image = m_StatBmp.ConvertToImage(); unsigned char* imgdata = image.GetData(); @@ -572,7 +567,7 @@ void ocpnCompass::UpdateTexture() { m_tex_h = height_pot; GLuint format = GL_RGBA; - GLuint internalformat = GL_RGBA8; //format; + GLuint internalformat = GL_RGBA8; // format; int stride = 4; if (imgdata) { @@ -594,7 +589,8 @@ void ocpnCompass::UpdateTexture() { glBindTexture(GL_TEXTURE_2D, m_texobj); glEnable(GL_TEXTURE_2D); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_tex_w, m_tex_h, format, GL_UNSIGNED_BYTE, teximage); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_tex_w, m_tex_h, format, + GL_UNSIGNED_BYTE, teximage); free(teximage); glBindTexture(GL_TEXTURE_2D, 0); diff --git a/gui/src/concanv.cpp b/gui/src/concanv.cpp index 52313b2bad..011667a9de 100644 --- a/gui/src/concanv.cpp +++ b/gui/src/concanv.cpp @@ -519,9 +519,11 @@ void AnnunText::CalculateMinSize(void) { if (m_pvalueFont) GetTextExtent(_T("123.4567"), &wv, &hv, NULL, NULL, m_pvalueFont); - double pdifactor = g_BasePlatform->GetDisplayDIPMult(gFrame); - wl *= pdifactor; hl *= pdifactor; - wv *= pdifactor; hv *= pdifactor; + double pdifactor = g_BasePlatform->GetDisplayDIPMult(gFrame); + wl *= pdifactor; + hl *= pdifactor; + wv *= pdifactor; + hv *= pdifactor; wxSize min; min.x = wl + wv; @@ -535,7 +537,7 @@ void AnnunText::CalculateMinSize(void) { SetMinSize(min); - //resize background to the necessary size + // resize background to the necessary size ocpnStyle::Style* style = g_StyleManager->GetCurrentStyle(); if (style->consoleTextBackground.IsOk()) { wxImage img = style->consoleTextBackground.ConvertToImage(); @@ -553,19 +555,15 @@ void AnnunText::SetColorScheme(ColorScheme cs) { } void AnnunText::RefreshFonts() { - wxFont *pl = FontMgr::Get().GetFont(m_LegendTextElement); + wxFont* pl = FontMgr::Get().GetFont(m_LegendTextElement); m_plabelFont = FontMgr::Get().FindOrCreateFont( - pl->GetPointSize() / OCPN_GetWinDIPScaleFactor(), - pl->GetFamily(), pl->GetStyle(), - pl->GetWeight(), FALSE, - pl->GetFaceName()); + pl->GetPointSize() / OCPN_GetWinDIPScaleFactor(), pl->GetFamily(), + pl->GetStyle(), pl->GetWeight(), FALSE, pl->GetFaceName()); - wxFont *pv = FontMgr::Get().GetFont(m_ValueTextElement); + wxFont* pv = FontMgr::Get().GetFont(m_ValueTextElement); m_pvalueFont = FontMgr::Get().FindOrCreateFont( - pv->GetPointSize() / OCPN_GetWinDIPScaleFactor(), - pv->GetFamily(), pv->GetStyle(), - pv->GetWeight(), FALSE, - pv->GetFaceName()); + pv->GetPointSize() / OCPN_GetWinDIPScaleFactor(), pv->GetFamily(), + pv->GetStyle(), pv->GetWeight(), FALSE, pv->GetFaceName()); m_legend_color = FontMgr::Get().GetFontColor(_("Console Legend")); m_val_color = FontMgr::Get().GetFontColor(_("Console Value")); diff --git a/gui/src/conn_params_panel.cpp b/gui/src/conn_params_panel.cpp index 3e1700feee..fb50e6e4ac 100644 --- a/gui/src/conn_params_panel.cpp +++ b/gui/src/conn_params_panel.cpp @@ -40,11 +40,10 @@ #define wxAtoi(arg) atoi(arg) #endif - /** A wxStaticText bold label with correct width, see #2538 */ -class ConnBoldLabel: public wxStaticText { +class ConnBoldLabel : public wxStaticText { public: - ConnBoldLabel(wxWindow* parent, const wxString& label) + ConnBoldLabel(wxWindow *parent, const wxString &label) : wxStaticText(parent, wxID_ANY, "") { font = parent->GetFont(); font.MakeBold(); @@ -55,7 +54,7 @@ class ConnBoldLabel: public wxStaticText { parent); } - void SetLabel(const wxString& label) { + void SetLabel(const wxString &label) { wxStaticText::SetLabel(label); dc.SetFont(font); auto size = dc.GetTextExtent(label).Scale(1.1, 1.1); @@ -67,7 +66,6 @@ class ConnBoldLabel: public wxStaticText { wxFont font; }; - extern "C" bool GetGlobalColor(wxString colorName, wxColour *pcolour); BEGIN_EVENT_TABLE(ConnectionParamsPanel, wxPanel) @@ -308,7 +306,7 @@ void ConnectionParamsPanel::CreateControls(void) { wxMouseEventHandler(ConnectionParamsPanel::OnSelected), NULL, this); - // line 2 + // line 2 t2 = new wxStaticText(this, wxID_ANY, _("Network")); t2->SetFont(*bFont); netGrid->Add(t2, 0, wxALIGN_CENTER_HORIZONTAL); diff --git a/gui/src/connection_edit.cpp b/gui/src/connection_edit.cpp index e8b4385eb8..4bc5eb1f87 100644 --- a/gui/src/connection_edit.cpp +++ b/gui/src/connection_edit.cpp @@ -215,6 +215,7 @@ void ConnectionEditDialog::Init() { m_BTScanTimer.SetOwner(this, ID_BT_SCANTIMER); m_BTscanning = 0; + wxSize displaySize = wxGetDisplaySize(); // Create the UI @@ -287,11 +288,14 @@ void ConnectionEditDialog::Init() { m_rbTypeCAN->Hide(); #endif + wxBoxSizer* bSizer15a = new wxBoxSizer(wxHORIZONTAL); + sbSizerConnectionProps->Add(bSizer15a, 0, wxEXPAND, 5); + if (OCPNPlatform::hasInternalGPS()) { m_rbTypeInternalGPS = new wxRadioButton(m_scrolledwin, wxID_ANY, _("Built-in GPS"), wxDefaultPosition, wxDefaultSize, 0); - bSizer15->Add(m_rbTypeInternalGPS, 0, wxALL, 5); + bSizer15a->Add(m_rbTypeInternalGPS, 0, wxALL, 5); } else m_rbTypeInternalGPS = NULL; @@ -300,7 +304,7 @@ void ConnectionEditDialog::Init() { m_rbTypeInternalBT = new wxRadioButton(m_scrolledwin, wxID_ANY, _("Built-in Bluetooth SPP"), wxDefaultPosition, wxDefaultSize, 0); - bSizer15->Add(m_rbTypeInternalBT, 0, wxALL, 5); + bSizer15a->Add(m_rbTypeInternalBT, 0, wxALL, 5); m_buttonScanBT = new wxButton(m_scrolledwin, wxID_ANY, _("BT Scan"), wxDefaultPosition, wxDefaultSize); @@ -334,7 +338,7 @@ void ConnectionEditDialog::Init() { } else m_rbTypeInternalBT = NULL; - gSizerNetProps = new wxFlexGridSizer(0, 4, 0, 0); + gSizerNetProps = new wxFlexGridSizer(0, 2, 0, 0); sbSizerConnectionProps->Add(gSizerNetProps, 0, wxEXPAND, 5); @@ -346,6 +350,9 @@ void ConnectionEditDialog::Init() { wxBoxSizer* bSizer16; bSizer16 = new wxBoxSizer(wxHORIZONTAL); + gSizerNetProps->Add(bSizer16, 1, wxEXPAND, 5); + gSizerNetProps->AddSpacer(1); + gSizerNetProps->AddSpacer(1); m_rbNetProtoTCP = new wxRadioButton(m_scrolledwin, wxID_ANY, _("TCP"), wxDefaultPosition, @@ -361,20 +368,37 @@ void ConnectionEditDialog::Init() { bSizer16->Add(m_rbNetProtoUDP, 0, wxALL, 5); - m_rbNetProtoGPSD = new wxRadioButton(m_scrolledwin, wxID_ANY, _("GPSD"), - wxDefaultPosition, wxDefaultSize, 0); - m_rbNetProtoGPSD->Enable(TRUE); - bSizer16->Add(m_rbNetProtoGPSD, 0, wxALL, 5); - - m_rbNetProtoSignalK = - new wxRadioButton(m_scrolledwin, wxID_ANY, _("Signal K"), - wxDefaultPosition, wxDefaultSize, 0); - m_rbNetProtoSignalK->Enable(TRUE); - bSizer16->Add(m_rbNetProtoSignalK, 0, wxALL, 5); + //Optimize for Portrait mode handheld devices + if (displaySize.x < displaySize.y){ + wxBoxSizer* bSizer16a; + bSizer16a = new wxBoxSizer(wxHORIZONTAL); + gSizerNetProps->AddSpacer(1); + gSizerNetProps->Add(bSizer16a, 1, wxEXPAND, 5); + gSizerNetProps->AddSpacer(1); + gSizerNetProps->AddSpacer(1); + m_rbNetProtoGPSD = new wxRadioButton(m_scrolledwin, wxID_ANY, _("GPSD"), + wxDefaultPosition, wxDefaultSize, 0); + m_rbNetProtoGPSD->Enable(TRUE); + bSizer16a->Add(m_rbNetProtoGPSD, 0, wxALL, 5); + + m_rbNetProtoSignalK = + new wxRadioButton(m_scrolledwin, wxID_ANY, _("Signal K"), + wxDefaultPosition, wxDefaultSize, 0); + m_rbNetProtoSignalK->Enable(TRUE); + bSizer16a->Add(m_rbNetProtoSignalK, 0, wxALL, 5); + } + else { + m_rbNetProtoGPSD = new wxRadioButton(m_scrolledwin, wxID_ANY, _("GPSD"), + wxDefaultPosition, wxDefaultSize, 0); + m_rbNetProtoGPSD->Enable(TRUE); + bSizer16->Add(m_rbNetProtoGPSD, 0, wxALL, 5); - gSizerNetProps->Add(bSizer16, 1, wxEXPAND, 5); - gSizerNetProps->AddSpacer(1); - gSizerNetProps->AddSpacer(1); + m_rbNetProtoSignalK = + new wxRadioButton(m_scrolledwin, wxID_ANY, _("Signal K"), + wxDefaultPosition, wxDefaultSize, 0); + m_rbNetProtoSignalK->Enable(TRUE); + bSizer16->Add(m_rbNetProtoSignalK, 0, wxALL, 5); + } m_stNetDataProtocol = new wxStaticText(m_scrolledwin, wxID_ANY, _("Data Protocol"), @@ -1667,10 +1691,10 @@ void ConnectionEditDialog::OnNetProtocolSelected(wxCommandEvent& event) { } m_tNetAddress->SetValue(DEFAULT_IP_ADDRESS); if (m_cbInput->GetValue() && !m_cbMultiCast->GetValue() && - m_rbNetProtoUDP->GetValue()) - m_tNetAddress->SetValue(DEFAULT_IP_ADDRESS); + m_rbNetProtoUDP->GetValue()) + m_tNetAddress->SetValue(DEFAULT_IP_ADDRESS); else if (m_cbOutput->GetValue() && !m_cbMultiCast->GetValue()) - m_tNetPort->SetValue(DEFAULT_UDP_OUT_ADDRESS); + m_tNetPort->SetValue(DEFAULT_UDP_OUT_ADDRESS); if (m_cbInput->GetValue() && m_cbOutput->GetValue()) m_cbOutput->SetValue(false); @@ -1729,7 +1753,7 @@ void ConnectionEditDialog::OnCbOutput(wxCommandEvent& event) { if (checked) { m_tNetAddress->SetValue( DEFAULT_UDP_OUT_ADDRESS); // IP address for output - // Check for an UDP input connection on the same port + // Check for an UDP input connection on the same port NetworkProtocol proto = UDP; for (size_t i = 0; i < TheConnectionParams()->Count(); i++) { ConnectionParams* cp = TheConnectionParams()->Item(i); @@ -1745,26 +1769,26 @@ void ConnectionEditDialog::OnCbOutput(wxCommandEvent& event) { wxString mes; bool warn = false; if (cp->bEnabled) { - mes = _("There is an enabled UDP input connection that uses the " - "same data port."); + mes = + _("There is an enabled UDP input connection that uses the " + "same data port."); mes << "\n" - << _("Please apply a filter on both connections to avoid a " - "feedback loop."); + << _("Please apply a filter on both connections to avoid a " + "feedback loop."); warn = true; - } - else { - mes = _("There is a disabled UDP Input connection that uses the " - "same Dataport."); - mes - << "\n" + } else { + mes = + _("There is a disabled UDP Input connection that uses the " + "same Dataport."); + mes << "\n" << _("If you enable that input please apply a filter on both " "connections to avoid a feedback loop."); } mes << "\n" - << _("Or consider using a different data port for one of them"); + << _("Or consider using a different data port for one of them"); if (warn) OCPNMessageBox(this, mes, _("OpenCPN Warning"), - wxOK | wxICON_EXCLAMATION, 60); + wxOK | wxICON_EXCLAMATION, 60); else OCPNMessageBox(this, mes, _("OpenCPN info"), wxOK | wxICON_INFORMATION, 60); diff --git a/gui/src/connections_dialog.cpp b/gui/src/connections_dialog.cpp index 78ff23f785..a48637d056 100644 --- a/gui/src/connections_dialog.cpp +++ b/gui/src/connections_dialog.cpp @@ -46,11 +46,14 @@ #include "priority_gui.h" #include "connection_edit.h" +#ifdef __ANDROID__ +#include "androidUTIL.h" +#endif + extern bool g_bfilter_cogsog; extern int g_COGFilterSec; extern int g_SOGFilterSec; - //------------------------------------------------------------------------------ // ConnectionsDialog Implementation //------------------------------------------------------------------------------ @@ -69,7 +72,6 @@ ConnectionsDialog::ConnectionsDialog(wxScrolledWindow* container, ConnectionsDialog::~ConnectionsDialog() {} void ConnectionsDialog::SetInitialSettings(void) { - m_cbNMEADebug->SetValue(false); if (NMEALogWindow::GetInstance().GetTTYWindow()) { if (NMEALogWindow::GetInstance().GetTTYWindow()->IsShown()) { @@ -83,10 +85,8 @@ void ConnectionsDialog::SetInitialSettings(void) { SetSelectedConnectionPanel(nullptr); } - -void ::ConnectionsDialog::OnSize(wxSizeEvent &ev){ - if (m_sbSizerLB) - m_sbSizerLB->Layout(); +void ::ConnectionsDialog::OnSize(wxSizeEvent& ev) { + if (m_sbSizerLB) m_sbSizerLB->Layout(); } void ConnectionsDialog::Init() { @@ -99,8 +99,13 @@ void ConnectionsDialog::Init() { // Looking for small devices in landscape mode. bool bcompact = false; wxSize displaySize = wxGetDisplaySize(); - if ((displaySize.y < 500) && (displaySize.x > displaySize.y)) - bcompact = true; + + // This test especially for 7" rPI display + if ((displaySize.y < 500) && (displaySize.x > displaySize.y)) bcompact = true; + +#ifdef __ANDROID__ + bcompact = true; +#endif wxBoxSizer* bSizer4 = new wxBoxSizer(wxVERTICAL); m_container->SetSizer(bSizer4); @@ -113,7 +118,6 @@ void ConnectionsDialog::Init() { else m_container->SetScrollRate(0, 0); - m_bSizerOuterContainer = new wxBoxSizer(wxVERTICAL); bSizer4->Add(m_bSizerOuterContainer, 1, wxEXPAND, 5); @@ -148,9 +152,9 @@ void ConnectionsDialog::Init() { #endif bSizer171->Add(m_stFilterSec, 0, wxALL, nspace); - m_tFilterSec = new wxTextCtrl(m_container, wxID_ANY, wxEmptyString, - wxDefaultPosition, - wxSize(50, 3 * m_container->GetCharWidth()), 0); + m_tFilterSec = + new wxTextCtrl(m_container, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxSize(50, 3 * m_container->GetCharWidth()), 0); wxString sfilt; sfilt.Printf("%d", g_COGFilterSec); m_tFilterSec->SetValue(sfilt); @@ -159,9 +163,9 @@ void ConnectionsDialog::Init() { int cb_space = 1; - // On smaller displays, squeeze the dialog slightly - if (bcompact){ - wxFlexGridSizer *GenProps = new wxFlexGridSizer(0, 2, 0, 0); + // On smaller displays, in Landscape mode, squeeze the dialog slightly + if (bcompact && (displaySize.x > displaySize.y)) { + wxFlexGridSizer* GenProps = new wxFlexGridSizer(0, 2, 0, 0); bSizer161->Add(GenProps, 0, wxALL, cb_space); m_cbNMEADebug = @@ -189,32 +193,31 @@ void ConnectionsDialog::Init() { m_cbAPBMagnetic->SetValue(g_bMagneticAPB); GenProps->Add(m_cbAPBMagnetic, 0, wxALL, cb_space); - wxSizer *talkerSizer = new wxBoxSizer(wxHORIZONTAL); + wxSizer* talkerSizer = new wxBoxSizer(wxHORIZONTAL); bSizer161->Add(talkerSizer, 0, wxALL, 1); - m_ButtonPriorityDialog = new wxButton(m_container, wxID_ANY, - _("Adjust communication priorities..."), - wxDefaultPosition, wxDefaultSize, 0); + m_ButtonPriorityDialog = new wxButton( + m_container, wxID_ANY, _("Adjust communication priorities..."), + wxDefaultPosition, wxDefaultSize, 0); talkerSizer->Add(m_ButtonPriorityDialog, 0, wxALL, cb_space); talkerSizer->AddSpacer(12 * m_container->GetCharWidth()); m_stTalkerIdText = new wxStaticText( - m_container, wxID_ANY, - wxString::Format("%s", _("NMEA0183 Talker ID")), + m_container, wxID_ANY, wxString::Format("%s", _("NMEA0183 Talker ID")), wxDefaultPosition, wxDefaultSize, 0); m_stTalkerIdText->Wrap(-1); talkerSizer->Add(m_stTalkerIdText, 0, wxALL, 2); talkerSizer->AddSpacer(2 * m_container->GetCharWidth()); - m_TalkerIdText = new wxTextCtrl(m_container, -1, "", wxDefaultPosition, - wxSize(50, 3 * m_container->GetCharWidth()), 0); + m_TalkerIdText = + new wxTextCtrl(m_container, -1, "", wxDefaultPosition, + wxSize(50, 3 * m_container->GetCharWidth()), 0); m_TalkerIdText->SetMaxLength(2); m_TalkerIdText->SetValue(g_TalkerIdText.MakeUpper()); - talkerSizer->Add(m_TalkerIdText, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); - } - else { + talkerSizer->Add(m_TalkerIdText, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); + } else { cb_space = 2; m_cbNMEADebug = new wxCheckBox(m_container, wxID_ANY, _("Show NMEA Debug Window"), @@ -295,28 +298,27 @@ void ConnectionsDialog::Init() { m_buttonRemove->Enable(FALSE); bSizer18->Add(m_buttonRemove, 0, wxALL, 5); - wxStaticLine *staticline5 = new wxStaticLine(m_container, wxID_ANY, wxDefaultPosition, - wxDefaultSize, wxLI_HORIZONTAL); + wxStaticLine* staticline5 = new wxStaticLine( + m_container, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL); m_sbSizerLB->Add(staticline5, 0, wxEXPAND | wxALL, 5); + // m_cPanel = + // new wxPanel(m_container, wxID_ANY, wxDefaultPosition, + // wxDLG_UNIT(m_parent, wxSize(-1, -1))); + // sbSizerLB->Add(m_cPanel, 0, wxALL | wxEXPAND, 0); - //m_cPanel = - // new wxPanel(m_container, wxID_ANY, wxDefaultPosition, - // wxDLG_UNIT(m_parent, wxSize(-1, -1))); - //sbSizerLB->Add(m_cPanel, 0, wxALL | wxEXPAND, 0); - - - //wxBoxSizer* boxSizercPanel = new wxBoxSizer(wxVERTICAL); - //m_cPanel->SetSizer(boxSizercPanel); + // wxBoxSizer* boxSizercPanel = new wxBoxSizer(wxVERTICAL); + // m_cPanel->SetSizer(boxSizercPanel); #ifdef __ANDROID__ m_scrollWinConnections = new wxPanel(m_container, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_RAISED | wxBG_STYLE_ERASE); #else - m_scrollWinConnections = new wxScrolledWindow( - m_container, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_parent, wxSize(-1, -1)), - wxBORDER_RAISED | wxVSCROLL | wxBG_STYLE_ERASE); + m_scrollWinConnections = + new wxScrolledWindow(m_container, wxID_ANY, wxDefaultPosition, + wxDLG_UNIT(m_parent, wxSize(-1, -1)), + wxBORDER_RAISED | wxVSCROLL | wxBG_STYLE_ERASE); // In compact mode, we scroll the entire dialog // Otherwise, we scroll only the connection list @@ -350,23 +352,23 @@ void ConnectionsDialog::Init() { wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(ConnectionsDialog::OnShowGpsWindowCheckboxClick), NULL, this); - //m_cbFilterSogCog->Connect( - // wxEVT_COMMAND_CHECKBOX_CLICKED, - // wxCommandEventHandler(ConnectionsDialog::OnValChange), NULL, this); - //m_tFilterSec->Connect(wxEVT_COMMAND_TEXT_UPDATED, - // wxCommandEventHandler(ConnectionsDialog::OnValChange), - // NULL, this); - //m_cbAPBMagnetic->Connect( - // wxEVT_COMMAND_CHECKBOX_CLICKED, - // wxCommandEventHandler(ConnectionsDialog::OnValChange), NULL, this); + // m_cbFilterSogCog->Connect( + // wxEVT_COMMAND_CHECKBOX_CLICKED, + // wxCommandEventHandler(ConnectionsDialog::OnValChange), NULL, this); + // m_tFilterSec->Connect(wxEVT_COMMAND_TEXT_UPDATED, + // wxCommandEventHandler(ConnectionsDialog::OnValChange), + // NULL, this); + // m_cbAPBMagnetic->Connect( + // wxEVT_COMMAND_CHECKBOX_CLICKED, + // wxCommandEventHandler(ConnectionsDialog::OnValChange), NULL, this); m_ButtonPriorityDialog->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ConnectionsDialog::OnPriorityDialog), NULL, this); - // Catch SizeEvents to force a layout honoring proportions - m_container->Connect(wxEVT_SIZE, wxSizeEventHandler(ConnectionsDialog::OnSize), NULL, this); - + // Catch SizeEvents to force a layout honoring proportions + m_container->Connect( + wxEVT_SIZE, wxSizeEventHandler(ConnectionsDialog::OnSize), NULL, this); } void ConnectionsDialog::SetSelectedConnectionPanel( @@ -453,11 +455,11 @@ void ConnectionsDialog::FillSourceList(void) { // Add new panels as necessary for (size_t i = 0; i < TheConnectionParams()->Count(); i++) { - ConnectionParams *cp = TheConnectionParams()->Item(i); + ConnectionParams* cp = TheConnectionParams()->Item(i); if (!cp->m_optionsPanel) { - ConnectionParamsPanel* pPanel = new ConnectionParamsPanel( - m_scrollWinConnections, wxID_ANY, wxDefaultPosition, wxDefaultSize, - cp, this); + ConnectionParamsPanel* pPanel = + new ConnectionParamsPanel(m_scrollWinConnections, wxID_ANY, + wxDefaultPosition, wxDefaultSize, cp, this); pPanel->SetSelected(false); boxSizerConnections->Add(pPanel, 0, wxEXPAND | wxRIGHT, 10); cp->m_optionsPanel = pPanel; @@ -471,6 +473,8 @@ void ConnectionsDialog::FillSourceList(void) { mSelectedConnection = NULL; m_buttonAdd->Enable(true); m_buttonAdd->Show(); + + m_scrollWinConnections->Layout(); } void ConnectionsDialog::UpdateSourceList(bool bResort) { @@ -488,12 +492,16 @@ void ConnectionsDialog::UpdateSourceList(bool bResort) { } void ConnectionsDialog::OnAddDatasourceClick(wxCommandEvent& event) { +#ifdef __ANDROID__ + androidDisableRotation(); +#endif + // Unselect all panels for (size_t i = 0; i < TheConnectionParams()->Count(); i++) TheConnectionParams()->Item(i)->m_optionsPanel->SetSelected(false); ConnectionEditDialog dialog(m_parent, this); - dialog.SetSize(wxSize(m_parent->GetSize().x, m_parent->GetSize().y * 8/10)); + dialog.SetSize(wxSize(m_parent->GetSize().x, m_parent->GetSize().y * 8 / 10)); dialog.SetPropsLabel(_("Configure new connection")); dialog.SetDefaultConnectionParams(); @@ -506,8 +514,13 @@ void ConnectionsDialog::OnAddDatasourceClick(wxCommandEvent& event) { FillSourceList(); } UpdateDatastreams(); + + m_container->FitInside(); m_sbSizerLB->Layout(); } +#ifdef __ANDROID__ + androidEnableRotation(); +#endif } void ConnectionsDialog::OnRemoveDatasourceClick(wxCommandEvent& event) { @@ -539,6 +552,9 @@ void ConnectionsDialog::OnRemoveDatasourceClick(wxCommandEvent& event) { } void ConnectionsDialog::OnEditDatasourceClick(wxCommandEvent& event) { +#ifdef __ANDROID__ + androidDisableRotation(); +#endif if (mSelectedConnection) { // Find the index int index = -1; @@ -553,13 +569,14 @@ void ConnectionsDialog::OnEditDatasourceClick(wxCommandEvent& event) { if ((index >= 0) && (cp)) { ConnectionEditDialog dialog(m_parent, this); - dialog.SetSize(wxSize(m_parent->GetSize().x, m_parent->GetSize().y * 8/10)); + dialog.SetSize( + wxSize(m_parent->GetSize().x, m_parent->GetSize().y * 8 / 10)); dialog.SetPropsLabel(_("Edit Selected Connection")); // Preload the dialog contents dialog.PreloadControls(cp); auto rv = dialog.ShowModal(); - if (rv == wxID_OK){ + if (rv == wxID_OK) { ConnectionParams* cp_edited = dialog.GetParamsFromControls(); delete cp->m_optionsPanel; StopAndRemoveCommDriver(cp->GetStrippedDSPort(), cp->GetCommProtocol()); @@ -572,10 +589,11 @@ void ConnectionsDialog::OnEditDatasourceClick(wxCommandEvent& event) { } } } +#ifdef __ANDROID__ + androidEnableRotation(); +#endif } - - void ConnectionsDialog::OnShowGpsWindowCheckboxClick(wxCommandEvent& event) { if (!m_cbNMEADebug->GetValue()) { NMEALogWindow::GetInstance().DestroyWindow(); @@ -622,14 +640,14 @@ void ConnectionsDialog::ApplySettings() { void ConnectionsDialog::UpdateDatastreams() { // Recreate datastreams that are new, or have been edited - std::vectorenabled_conns; + std::vector enabled_conns; for (size_t i = 0; i < TheConnectionParams()->Count(); i++) { ConnectionParams* cp = TheConnectionParams()->Item(i); // Connection already setup? - if (cp->b_IsSetup){ - if(cp->bEnabled){ + if (cp->b_IsSetup) { + if (cp->bEnabled) { enabled_conns.push_back(cp->GetStrippedDSPort()); } continue; @@ -641,7 +659,7 @@ void ConnectionsDialog::UpdateDatastreams() { // This will handle multiple connections with same port, // but possibly different filters // Also protect against some user config errors - if ( std::find(enabled_conns.begin(), enabled_conns.end(), + if (std::find(enabled_conns.begin(), enabled_conns.end(), cp->GetStrippedDSPort()) != enabled_conns.end()) { continue; } diff --git a/gui/src/displays.cpp b/gui/src/displays.cpp index 25be7d71dd..6e1a6a0fb8 100644 --- a/gui/src/displays.cpp +++ b/gui/src/displays.cpp @@ -60,15 +60,19 @@ BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, UINT effectivedpiX, effectivedpiY; /* In newer SDKs (Windows 8.1+) it is much simpler to get DPI for each * monitor as GetDpiForMonitor actually is exposed */ - HRESULT hr = GetDpiForMonitor(hMonitor, MDT_EFFECTIVE_DPI, &effectivedpiX, &effectivedpiY); + HRESULT hr = GetDpiForMonitor(hMonitor, MDT_EFFECTIVE_DPI, &effectivedpiX, + &effectivedpiY); if (!SUCCEEDED(hr)) { - WARNING_LOG << "GetDpiForMonitor MDT_EFFECTIVE_DPI failed, falling back to 96 DPI"; + WARNING_LOG << "GetDpiForMonitor MDT_EFFECTIVE_DPI failed, falling back " + "to 96 DPI"; effectivedpiX = 96; effectivedpiY = 96; } hr = GetDpiForMonitor(hMonitor, MDT_RAW_DPI, &rawdpiX, &rawdpiY); if (!SUCCEEDED(hr) || rawdpiX == 0 || rawdpiY == 0) { - WARNING_LOG << "GetDpiForMonitor MDT_RAW_DPI failed, falling back to " << effectivedpiX <<" DPI"; // This happens in virtualized environments + WARNING_LOG << "GetDpiForMonitor MDT_RAW_DPI failed, falling back to " + << effectivedpiX + << " DPI"; // This happens in virtualized environments rawdpiX = effectivedpiX; rawdpiY = effectivedpiY; } @@ -93,9 +97,9 @@ BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, DEBUG_LOG << " Scale factor:" << scaleFactor; g_monitor_info.push_back( {std::string(ws.begin(), ws.end()), static_cast(mmx), - static_cast(mmy), static_cast(width), static_cast(height), - static_cast(width), static_cast(height), - static_cast(scaleFactor)}); + static_cast(mmy), static_cast(width), + static_cast(height), static_cast(width), + static_cast(height), static_cast(scaleFactor)}); } else { DEBUG_LOG << "GetMonitorInfo failed"; } @@ -139,20 +143,30 @@ void EnumerateMonitors() { scale = gdk_monitor_get_scale_factor(monitor) * 100; } if (outputInfo && crtcInfo) { - // Physical size can be unknown and reported as zero (For example over VNC, assume a "standard" DPI of 96 in that case to guess it) - size_t mm_width = outputInfo->mm_width > 0 ? outputInfo->mm_width : crtcInfo->width * 25.4 / 96.0; - size_t mm_height = outputInfo->mm_height > 0 ? outputInfo->mm_height : crtcInfo->height * 25.4 / 96.0; + // Physical size can be unknown and reported as zero (For example over + // VNC, assume a "standard" DPI of 96 in that case to guess it) + size_t mm_width = outputInfo->mm_width > 0 + ? outputInfo->mm_width + : crtcInfo->width * 25.4 / 96.0; + size_t mm_height = outputInfo->mm_height > 0 + ? outputInfo->mm_height + : crtcInfo->height * 25.4 / 96.0; DEBUG_LOG << "Monitor " << i + 1 << ":"; DEBUG_LOG << " Name: " << outputInfo->name; - DEBUG_LOG << " Physical Size (mm): " << mm_width << " x " - << mm_height; + DEBUG_LOG << " Connection: " + << (outputInfo->connection == RR_Connected + ? "Connected" + : "Disconnected/Unknown"); + DEBUG_LOG << " Physical Size (mm): " << mm_width << " x " << mm_height; DEBUG_LOG << " Resolution: " << crtcInfo->width << " x " << crtcInfo->height; DEBUG_LOG << " Scale: " << scale; - g_monitor_info.push_back({outputInfo->name, mm_width, - mm_height, crtcInfo->width, - crtcInfo->height, crtcInfo->width, - crtcInfo->height, scale}); + if (outputInfo->connection == RR_Connected && crtcInfo->width > 0 && + crtcInfo->height > 0) { + g_monitor_info.push_back({outputInfo->name, mm_width, mm_height, + crtcInfo->width, crtcInfo->height, + crtcInfo->width, crtcInfo->height, scale}); + } } XRRFreeOutputInfo(outputInfo); XRRFreeCrtcInfo(crtcInfo); @@ -220,29 +234,39 @@ void EnumerateMonitors() { CGSize displayPhysicalSize = CGDisplayScreenSize(displayID); int width = CGDisplayModeGetWidth(CGDisplayCopyDisplayMode(displayID)); int height = CGDisplayModeGetHeight(CGDisplayCopyDisplayMode(displayID)); - int pixel_width = CGDisplayModeGetPixelWidth(CGDisplayCopyDisplayMode(displayID)); - int pixel_height = CGDisplayModeGetPixelHeight(CGDisplayCopyDisplayMode(displayID)); + int pixel_width = + CGDisplayModeGetPixelWidth(CGDisplayCopyDisplayMode(displayID)); + int pixel_height = + CGDisplayModeGetPixelHeight(CGDisplayCopyDisplayMode(displayID)); DEBUG_LOG << "Display " << i + 1 << ":"; DEBUG_LOG << " Physical Size: " << displayPhysicalSize.width << "x" << displayPhysicalSize.height << " mm"; DEBUG_LOG << " Resolution: " << width << "x" << height << " pixels"; - DEBUG_LOG << " Pixel resolution: " << pixel_width << "x" << pixel_height << " pixels"; + DEBUG_LOG << " Pixel resolution: " << pixel_width << "x" << pixel_height + << " pixels"; g_monitor_info.push_back( {std::to_string(i + 1), static_cast(displayPhysicalSize.width), static_cast(displayPhysicalSize.height), - static_cast(width), static_cast(height), static_cast(pixel_width), static_cast(pixel_height), 100}); + static_cast(width), static_cast(height), + static_cast(pixel_width), static_cast(pixel_height), + 100}); } #endif if (g_monitor_info.size() == 0) { // This should never happen, but just in case... - // If we didn't find any monitors at all, add some dummy default that makes at least some sense (15.6 inch full HD) - // We might also use wxDisplaySize and wxDisplaySizeMM here, but what the heck would they report? - g_monitor_info.push_back({"Dummy monitor", 340, 190, 1920, 1080, 1920, 1080, 100}); + // If we didn't find any monitors at all, add some dummy default that makes + // at least some sense (15.6 inch full HD) We might also use wxDisplaySize + // and wxDisplaySizeMM here, but what the heck would they report? + g_monitor_info.push_back( + {"Dummy monitor", 340, 190, 1920, 1080, 1920, 1080, 100}); } g_num_monitors = g_monitor_info.size(); DEBUG_LOG << "Number of monitors: " << g_num_monitors; DEBUG_LOG << "Monitor info:"; - for (const auto &monitor : g_monitor_info) { - DEBUG_LOG << "Monitor: " << monitor.name << " " << monitor.width_mm << "x" << monitor.height_mm << "mm " << monitor.width << "x" << monitor.height << "DIP " << monitor.width_px << "x" << monitor.height_px << "px " << monitor.scale << "%"; + for (const auto& monitor : g_monitor_info) { + DEBUG_LOG << "Monitor: " << monitor.name << " " << monitor.width_mm << "x" + << monitor.height_mm << "mm " << monitor.width << "x" + << monitor.height << "DIP " << monitor.width_px << "x" + << monitor.height_px << "px " << monitor.scale << "%"; } } diff --git a/gui/src/download_mgr.cpp b/gui/src/download_mgr.cpp index 6dd94ccb88..50aad8f43a 100644 --- a/gui/src/download_mgr.cpp +++ b/gui/src/download_mgr.cpp @@ -201,9 +201,8 @@ class InstallButton : public wxPanel { public: InstallButton(wxWindow* parent, PluginMetadata metadata) : wxPanel(parent), m_metadata(metadata), m_remove(false) { - PlugInContainer* found = - PlugInByName(metadata.name, - PluginLoader::getInstance()->GetPlugInArray()); + PlugInContainer* found = PlugInByName( + metadata.name, PluginLoader::getInstance()->GetPlugInArray()); std::string label(_("Install")); if (found) { label = getUpdateLabel(found, metadata); diff --git a/gui/src/glChartCanvas.cpp b/gui/src/glChartCanvas.cpp index aa2e6d116f..73d59ef22d 100644 --- a/gui/src/glChartCanvas.cpp +++ b/gui/src/glChartCanvas.cpp @@ -120,10 +120,10 @@ #define GL_DEPTH_STENCIL_ATTACHMENT 0x821A #endif -#if defined(__UNIX__) && !defined(__WXOSX__) +#if defined(__UNIX__) && !defined(__WXOSX__) // high resolution stopwatch for profiling class OCPNStopWatch { - public: +public: OCPNStopWatch() { Reset(); } void Reset() { clock_gettime(CLOCK_REALTIME, &tp); } @@ -134,7 +134,7 @@ class OCPNStopWatch { (tp_end.tv_nsec - tp.tv_nsec) / 1.e6; } - private: +private: timespec tp; }; #endif @@ -145,12 +145,10 @@ class OCPNStopWatch { #include #endif - #ifndef GL_ETC1_RGB8_OES #define GL_ETC1_RGB8_OES 0x8D64 #endif - #include "lz4.h" #ifdef __ANDROID__ @@ -164,7 +162,7 @@ extern "C" void glOrthof(float left, float right, float bottom, float top, #endif -#include "cm93.h" // for chart outline draw +#include "cm93.h" // for chart outline draw #include "s57chart.h" // for ArrayOfS57Obj #include "s52plib.h" @@ -204,7 +202,7 @@ extern ChartDB *ChartData; extern PlugInManager *g_pi_manager; extern RouteList *pRouteList; -extern std::vector g_TrackList; +extern std::vector g_TrackList; extern bool b_inCompressAllCharts; extern bool g_bGLexpert; extern bool g_bcompression_wait; @@ -246,7 +244,7 @@ bool g_b_needFinish; // Need glFinish() call on each frame? #endif #ifndef GL_COMPRESSED_RGB_FXT1_3DFX -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 +#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 #endif PFNGLGENFRAMEBUFFERSEXTPROC s_glGenFramebuffers; @@ -270,8 +268,8 @@ PFNGLBUFFERDATAPROC s_glBufferData; PFNGLDELETEBUFFERSPROC s_glDeleteBuffers; #ifndef USE_ANDROID_GLES2 -//#define glDeleteFramebuffers(a, b) (s_glDeleteFramebuffers)(a, b); -//#define glDeleteRenderbuffers(a, b) (s_glDeleteRenderbuffers)(a, b); +// #define glDeleteFramebuffers(a, b) (s_glDeleteFramebuffers)(a, b); +// #define glDeleteRenderbuffers(a, b) (s_glDeleteRenderbuffers)(a, b); #endif typedef void(APIENTRYP PFNGLGETBUFFERPARAMETERIV)(GLenum target, GLenum value, @@ -298,8 +296,8 @@ extern int pprog_count; extern int pprog_threads; extern MyFrame *gFrame; -//#if defined(__MSVC__) && !defined(ocpnUSE_GLES) /* this compiler doesn't -// support vla */ const #endif extern int g_mipmap_max_level; +// #if defined(__MSVC__) && !defined(ocpnUSE_GLES) /* this compiler doesn't +// support vla */ const #endif extern int g_mipmap_max_level; int panx, pany; bool glChartCanvas::s_b_useScissorTest; @@ -364,7 +362,6 @@ GLboolean QueryExtension(const char *extName) { return GL_FALSE; } - int test_attribs[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, WX_GL_STENCIL_SIZE, 8, 0}; @@ -379,10 +376,12 @@ int attribs[] = {WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 0}; BEGIN_EVENT_TABLE(glChartCanvas, wxGLCanvas) EVT_PAINT(glChartCanvas::OnPaint) -EVT_ACTIVATE(glChartCanvas::OnActivate) EVT_SIZE(glChartCanvas::OnSize) - EVT_MOUSE_EVENTS(glChartCanvas::MouseEvent) END_EVENT_TABLE() +EVT_ACTIVATE(glChartCanvas::OnActivate) +EVT_SIZE(glChartCanvas::OnSize) +EVT_MOUSE_EVENTS(glChartCanvas::MouseEvent) +END_EVENT_TABLE() - glChartCanvas::glChartCanvas(wxWindow *parent, wxGLCanvas *share) +glChartCanvas::glChartCanvas(wxWindow *parent, wxGLCanvas *share) : wxGLCanvas(parent, wxID_ANY, attribs, wxDefaultPosition, wxSize(256, 256), wxFULL_REPAINT_ON_RESIZE | wxBG_STYLE_CUSTOM, _T("")) @@ -392,11 +391,12 @@ EVT_ACTIVATE(glChartCanvas::OnActivate) EVT_SIZE(glChartCanvas::OnSize) Init(); } -std::unordered_map> glChartCanvas::dash_map = { - {wxPENSTYLE_DOT, {1, 1}}, - {wxPENSTYLE_LONG_DASH, {5, 5}}, - {wxPENSTYLE_SHORT_DASH, {1, 5}}, - {wxPENSTYLE_DOT_DASH, {5, 1}}, +std::unordered_map> glChartCanvas::dash_map = + { + {wxPENSTYLE_DOT, {1, 1}}, + {wxPENSTYLE_LONG_DASH, {5, 5}}, + {wxPENSTYLE_SHORT_DASH, {1, 5}}, + {wxPENSTYLE_DOT_DASH, {5, 1}}, }; void glChartCanvas::Init() { @@ -458,13 +458,13 @@ void glChartCanvas::Init() { NULL, this); Connect(GESTURE_EVENT_TIMER, wxEVT_TIMER, - (wxObjectEventFunction)( - wxEventFunction)&glChartCanvas::onGestureTimerEvent, + (wxObjectEventFunction)(wxEventFunction)&glChartCanvas:: + onGestureTimerEvent, NULL, this); Connect(GESTURE_FINISH_TIMER, wxEVT_TIMER, - (wxObjectEventFunction)( - wxEventFunction)&glChartCanvas::onGestureFinishTimerEvent, + (wxObjectEventFunction)(wxEventFunction)&glChartCanvas:: + onGestureFinishTimerEvent, NULL, this); Connect( @@ -490,8 +490,7 @@ void glChartCanvas::Init() { // Gesture support for platforms other than Android #ifdef HAVE_WX_GESTURE_EVENTS - if (!EnableTouchEvents(wxTOUCH_ZOOM_GESTURE | - wxTOUCH_PRESS_GESTURES)) { + if (!EnableTouchEvents(wxTOUCH_ZOOM_GESTURE | wxTOUCH_PRESS_GESTURES)) { wxLogError("Failed to enable touch events"); } @@ -511,7 +510,6 @@ void glChartCanvas::Init() { #endif /* HAVE_WX_GESTURE_EVENTS */ if (!g_glTextureManager) g_glTextureManager = new glTextureManager; - } glChartCanvas::~glChartCanvas() { @@ -558,23 +556,22 @@ void glChartCanvas::OnSize(wxSizeEvent &event) { SetCurrent(*m_pcontext); } - //SetSize(m_pParentCanvas->GetClientSize()); + // SetSize(m_pParentCanvas->GetClientSize()); if (m_bsetup) { wxLogMessage(_T("BuildFBO 3")); BuildFBO(); } - // Set the shader viewport transform matrix - ViewPort *vp = m_pParentCanvas->GetpVP(); - mat4x4 m; - mat4x4_identity(m); - mat4x4_scale_aniso((float(*)[4])vp->vp_matrix_transform, m, - 2.0 / (float)vp->pix_width, -2.0 / (float)vp->pix_height, - 1.0); - mat4x4_translate_in_place((float(*)[4])vp->vp_matrix_transform, -vp->pix_width / 2, - -vp->pix_height / 2, 0); + ViewPort *vp = m_pParentCanvas->GetpVP(); + mat4x4 m; + mat4x4_identity(m); + mat4x4_scale_aniso((float(*)[4])vp->vp_matrix_transform, m, + 2.0 / (float)vp->pix_width, -2.0 / (float)vp->pix_height, + 1.0); + mat4x4_translate_in_place((float(*)[4])vp->vp_matrix_transform, + -vp->pix_width / 2, -vp->pix_height / 2, 0); } void glChartCanvas::MouseEvent(wxMouseEvent &event) { @@ -742,7 +739,7 @@ bool glChartCanvas::buildFBOSize(int fboSize) { if (m_b_useFBOStencil) { // initialize composite depth/stencil renderbuffer glRenderbufferStorage(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8_EXT, - m_cache_tex_x, m_cache_tex_y); + m_cache_tex_x, m_cache_tex_y); int err = glGetError(); if (err) { @@ -752,7 +749,7 @@ bool glChartCanvas::buildFBOSize(int fboSize) { } glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, m_renderbuffer); + GL_RENDERBUFFER_EXT, m_renderbuffer); err = glGetError(); if (err) { wxString msg; @@ -762,7 +759,7 @@ bool glChartCanvas::buildFBOSize(int fboSize) { } glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, m_renderbuffer); + GL_RENDERBUFFER_EXT, m_renderbuffer); err = glGetError(); if (err) { wxString msg; @@ -783,7 +780,7 @@ bool glChartCanvas::buildFBOSize(int fboSize) { // initialize depth renderbuffer glRenderbufferStorage(GL_RENDERBUFFER_EXT, depth_format, m_cache_tex_x, - m_cache_tex_y); + m_cache_tex_y); int err = glGetError(); if (err) { wxString msg; @@ -795,7 +792,7 @@ bool glChartCanvas::buildFBOSize(int fboSize) { } glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, m_renderbuffer); + GL_RENDERBUFFER_EXT, m_renderbuffer); err = glGetError(); if (err) { @@ -814,7 +811,7 @@ bool glChartCanvas::buildFBOSize(int fboSize) { glBindFramebuffer(GL_FRAMEBUFFER_EXT, m_fb0); glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - g_texture_rectangle_format, m_cache_tex[0], 0); + g_texture_rectangle_format, m_cache_tex[0], 0); GLenum fb_status = glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT); @@ -1057,7 +1054,8 @@ void glChartCanvas::SetupOpenGL() { wxLogMessage(msg); char GLSL_version_string[80]; - strncpy(GLSL_version_string, (char *)glGetString(GL_SHADING_LANGUAGE_VERSION), 79); + strncpy(GLSL_version_string, (char *)glGetString(GL_SHADING_LANGUAGE_VERSION), + 79); msg.Printf(_T("OpenGL-> GLSL Version reported: ")); m_GLSLversion = wxString(GLSL_version_string, wxConvUTF8); msg += m_GLSLversion; @@ -1074,10 +1072,8 @@ void glChartCanvas::SetupOpenGL() { { printf("GLEW init failed: %s\n", glewGetErrorString(err)); exit(1); - } - else - { - wxLogMessage("GLEW init success!n"); + } else { + wxLogMessage("GLEW init success!n"); } #endif #endif @@ -1178,15 +1174,15 @@ void glChartCanvas::SetupOpenGL() { g_GLOptions.m_bUseCanvasPanning = false; // TODO - // Temporarily disable FBO on Windows, pending implementation of MSAA to buffers + // Temporarily disable FBO on Windows, pending implementation of MSAA to + // buffers #ifdef __WXMSW__ - //m_b_DisableFBO = true; + // m_b_DisableFBO = true; #endif // Accelerated pan is not used for MacOS Retina display // So there is no advantage to using FBO - if (m_displayScale > 1) - m_b_DisableFBO = true; + if (m_displayScale > 1) m_b_DisableFBO = true; // Maybe build FBO(s) BuildFBO(); @@ -1198,7 +1194,7 @@ void glChartCanvas::SetupOpenGL() { glBindFramebuffer(GL_FRAMEBUFFER_EXT, m_fb0); glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - g_texture_rectangle_format, m_cache_tex[0], 0); + g_texture_rectangle_format, m_cache_tex[0], 0); GLenum fb_status = glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT); glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); @@ -1258,7 +1254,6 @@ void glChartCanvas::SetupOpenGL() { g_GLMinSymbolLineWidth); wxLogMessage(lwmsg); - if (!g_bGLexpert) g_GLOptions.m_bUseAcceleratedPanning = !m_b_DisableFBO && m_b_BuiltFBO; @@ -1283,11 +1278,10 @@ void glChartCanvas::SetupOpenGL() { // Inform the S52 PLIB of options determined if (ps52plib) - ps52plib->SetGLOptions(s_b_useStencil, s_b_useStencilAP, s_b_useScissorTest, - s_b_useFBO, g_b_EnableVBO, - g_texture_rectangle_format, - g_GLMinCartographicLineWidth, - g_GLMinSymbolLineWidth ); + ps52plib->SetGLOptions( + s_b_useStencil, s_b_useStencilAP, s_b_useScissorTest, s_b_useFBO, + g_b_EnableVBO, g_texture_rectangle_format, g_GLMinCartographicLineWidth, + g_GLMinSymbolLineWidth); m_bsetup = true; @@ -1339,8 +1333,7 @@ void glChartCanvas::SetupCompression() { compress in software using libsquish for superior quality anyway */ if ((QueryExtension("GL_EXT_texture_compression_s3tc") || - QueryExtension("GL_EXT_texture_compression_dxt1")) - ) { + QueryExtension("GL_EXT_texture_compression_dxt1"))) { /* buggy opensource nvidia driver, renders incorrectly, workaround is to use format with alpha... */ if (GetRendererString().Find(_T("Gallium")) != wxNOT_FOUND && @@ -1350,8 +1343,7 @@ void glChartCanvas::SetupCompression() { g_raster_format = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; wxLogMessage(_T("OpenGL-> Using s3tc dxt1 compression")); - } else if (QueryExtension("GL_3DFX_texture_compression_FXT1") - ) { + } else if (QueryExtension("GL_3DFX_texture_compression_FXT1")) { g_raster_format = GL_COMPRESSED_RGB_FXT1_3DFX; wxLogMessage(_T("OpenGL-> Using 3dfx fxt1 compression")); @@ -1361,7 +1353,7 @@ void glChartCanvas::SetupCompression() { } } -#ifdef ocpnUSE_GLES /* gles doesn't have GetTexLevelParameter */ +#ifdef ocpnUSE_GLES /* gles doesn't have GetTexLevelParameter */ g_tile_size = 512 * 512 / 2; /* 4bpp */ #else /* determine compressed size of a level 0 single tile */ @@ -1564,7 +1556,7 @@ void glChartCanvas::DrawStaticRoutesTracksAndWaypoints(ViewPort &vp) { if (!m_pParentCanvas->m_bShowNavobjects) return; ocpnDC dc(*this); - for (Track* pTrackDraw : g_TrackList) { + for (Track *pTrackDraw : g_TrackList) { /* defer rendering active tracks until later */ ActiveTrack *pActiveTrack = dynamic_cast(pTrackDraw); if (pActiveTrack && pActiveTrack->IsRunning()) continue; @@ -1585,7 +1577,7 @@ void glChartCanvas::DrawStaticRoutesTracksAndWaypoints(ViewPort &vp) { if (pRouteDraw->m_bIsBeingEdited) continue; RouteGui(*pRouteDraw).DrawGL(vp, m_pParentCanvas, dc); -// pRouteDraw->DrawGL(vp, m_pParentCanvas, dc); + // pRouteDraw->DrawGL(vp, m_pParentCanvas, dc); } /* Waypoints not drawn as part of routes, and not being edited */ @@ -1597,7 +1589,7 @@ void glChartCanvas::DrawStaticRoutesTracksAndWaypoints(ViewPort &vp) { if (pWP && (!pWP->m_bRPIsBeingEdited) && (!pWP->m_bIsInRoute)) if (vp.GetBBox().ContainsMarge(pWP->m_lat, pWP->m_lon, .5)) RoutePointGui(*pWP).DrawGL(vp, m_pParentCanvas, dc); -// pWP->DrawGL(vp, m_pParentCanvas, dc); + // pWP->DrawGL(vp, m_pParentCanvas, dc); } } } @@ -1605,7 +1597,7 @@ void glChartCanvas::DrawStaticRoutesTracksAndWaypoints(ViewPort &vp) { void glChartCanvas::DrawDynamicRoutesTracksAndWaypoints(ViewPort &vp) { ocpnDC dc(*this); - for (Track* pTrackDraw : g_TrackList) { + for (Track *pTrackDraw : g_TrackList) { ActiveTrack *pActiveTrack = dynamic_cast(pTrackDraw); if (pActiveTrack && pActiveTrack->IsRunning()) TrackGui(*pTrackDraw).Draw(m_pParentCanvas, dc, vp, vp.GetBBox()); @@ -1632,7 +1624,7 @@ void glChartCanvas::DrawDynamicRoutesTracksAndWaypoints(ViewPort &vp) { const LLBBox &vp_box = vp.GetBBox(), &test_box = pRouteDraw->GetBBox(); if (!vp_box.IntersectOut(test_box)) RouteGui(*pRouteDraw).DrawGL(vp, m_pParentCanvas, dc); -// pRouteDraw->DrawGL(vp, m_pParentCanvas, dc); + // pRouteDraw->DrawGL(vp, m_pParentCanvas, dc); } } @@ -1644,7 +1636,7 @@ void glChartCanvas::DrawDynamicRoutesTracksAndWaypoints(ViewPort &vp) { RoutePoint *pWP = pnode->GetData(); if (pWP && pWP->m_bRPIsBeingEdited && !pWP->m_bIsInRoute) RoutePointGui(*pWP).DrawGL(vp, m_pParentCanvas, dc); -// pWP->DrawGL(vp, m_pParentCanvas, dc); + // pWP->DrawGL(vp, m_pParentCanvas, dc); } } } @@ -1700,7 +1692,6 @@ void glChartCanvas::RenderChartOutline(ocpnDC &dc, int dbIndex, ViewPort &vp) { // chart is outside of viewport lat/lon bounding box if (box.IntersectOutGetBias(vp.GetBBox(), lon_bias)) return; - wxColour color; if (ChartData->GetDBChartType(dbIndex) == CHART_TYPE_CM93) color = GetGlobalColor(_T ( "YELO1" )); @@ -1816,7 +1807,7 @@ void glChartCanvas::RenderChartOutline(ocpnDC &dc, int dbIndex, ViewPort &vp) { wxPENSTYLE_SOLID)); float plylat1, plylon1; - int pixx1, pixy1; + int pixx1, pixy1; // Are there any aux ply entries? int nAuxPlyEntries = ChartData->GetnAuxPlyEntries(dbIndex); @@ -2034,7 +2025,7 @@ void glChartCanvas::GridDraw() { } // draw text labels - if( abs(vp.rotation) < .1){ + if (abs(vp.rotation) < .1) { glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); for (lat = startlat; lat < nlat; lat += gridlatMajor) { @@ -2280,7 +2271,7 @@ void glChartCanvas::ShipDraw(ocpnDC &dc) { // Another draw test ,based on pixels, assuming the ship icon is a fixed // nominal size and is just barely outside the viewport .... BoundingBox bb_screen(0, 0, m_pParentCanvas->GetVP().pix_width, - m_pParentCanvas->GetVP().pix_height); + m_pParentCanvas->GetVP().pix_height); // TODO: fix to include actual size of boat that will be rendered int img_height = 0; @@ -2311,12 +2302,15 @@ void glChartCanvas::ShipDraw(ocpnDC &dc) { wxPen ppSmallScaleShip; if (SHIP_NORMAL == m_pParentCanvas->m_ownship_state) - ppSmallScaleShip = wxPen(GetGlobalColor(_T ( "URED" )), v / 5, wxPENSTYLE_SOLID); + ppSmallScaleShip = + wxPen(GetGlobalColor(_T ( "URED" )), v / 5, wxPENSTYLE_SOLID); else - ppSmallScaleShip = wxPen(GetGlobalColor(_T ( "YELO1" )), v / 5, wxPENSTYLE_SOLID); + ppSmallScaleShip = + wxPen(GetGlobalColor(_T ( "YELO1" )), v / 5, wxPENSTYLE_SOLID); dc.SetPen(ppSmallScaleShip); - dc.SetBrush(wxBrush(GetGlobalColor(_T ( "URED" )), wxBRUSHSTYLE_TRANSPARENT)); + dc.SetBrush( + wxBrush(GetGlobalColor(_T ( "URED" )), wxBRUSHSTYLE_TRANSPARENT)); // start with cross dc.DrawLine((-v * 1.2) + lShipMidPoint.x, lShipMidPoint.y, @@ -2470,7 +2464,6 @@ void glChartCanvas::ShipDraw(ocpnDC &dc) { float nominal_ownship_size_pixels = m_pParentCanvas->GetPixPerMM() * nominal_ownship_size_mm; - if (m_pParentCanvas->GetContentScaleFactor() == 1.0) { nominal_ownship_size_pixels = wxMax( 20.0, nominal_ownship_size_pixels); // not less than 20 pixel @@ -2699,7 +2692,7 @@ void glChartCanvas::DrawFloatingOverlayObjects(ocpnDC &dc) { m_pParentCanvas->RenderShipToActive(dc, true); m_pParentCanvas->ScaleBarDraw(dc); s57_DrawExtendedLightSectorsGL(dc, m_pParentCanvas->VPoint, - m_pParentCanvas->extendedSectorLegs); + m_pParentCanvas->extendedSectorLegs); if (g_pi_manager) { g_pi_manager->RenderAllGLCanvasOverlayPlugIns( m_pcontext, vp, m_pParentCanvas->m_canvasIndex, OVERLAY_OVER_SHIPS); @@ -2707,14 +2700,12 @@ void glChartCanvas::DrawFloatingOverlayObjects(ocpnDC &dc) { } void glChartCanvas::DrawChartBar(ocpnDC &dc) { - if (m_pParentCanvas->GetPiano()){ - + if (m_pParentCanvas->GetPiano()) { int canvas_height = GetClientSize().y; canvas_height *= m_displayScale; m_pParentCanvas->GetPiano()->DrawGL( - canvas_height - - m_pParentCanvas->GetPiano()->GetHeight()); + canvas_height - m_pParentCanvas->GetPiano()->GetHeight()); } } @@ -2836,7 +2827,8 @@ void endCallbackD_GLSL() { GLShaderProgram *shader = pStaticShader; shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)s_tessVP.vp_matrix_transform); + shader->SetUniformMatrix4fv("MVMatrix", + (GLfloat *)s_tessVP.vp_matrix_transform); mat4x4 identityMatrix; mat4x4_identity(identityMatrix); @@ -2856,23 +2848,13 @@ void endCallbackD_GLSL() { glDrawArrays(s_tess_mode, 0, s_nvertex); shader->UnBind(); - } #else -void vertexCallbackD(GLvoid *vertex) -{ - glVertex3dv( (GLdouble *)vertex); -} +void vertexCallbackD(GLvoid *vertex) { glVertex3dv((GLdouble *)vertex); } -void beginCallbackD( GLenum mode) -{ - glBegin( mode ); -} +void beginCallbackD(GLenum mode) { glBegin(mode); } -void endCallbackD() -{ - glEnd(); -} +void endCallbackD() { glEnd(); } #endif @@ -2881,9 +2863,7 @@ void glChartCanvas::DrawRegion(ViewPort &vp, const LLRegion ®ion) { GetLatLonCurveDist(vp, lat_dist, lon_dist); GLUtesselator *tobj = gluNewTess(); - if (!pStaticShader) - pStaticShader = GetStaticTriShader(); - + if (!pStaticShader) pStaticShader = GetStaticTriShader(); #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) gluTessCallback(tobj, GLU_TESS_VERTEX, (_GLUfuncptr)&vertexCallbackD_GLSL); @@ -2935,13 +2915,13 @@ void glChartCanvas::DrawRegion(ViewPort &vp, const LLRegion ®ion) { double *p = new double[6]; - //p[0] = q.m_x, p[1] = q.m_y, p[2] = 0; - // It is reasonable to use wxRound() here, - // since we are working with pixel coordinates at this point + // p[0] = q.m_x, p[1] = q.m_y, p[2] = 0; + // It is reasonable to use wxRound() here, + // since we are working with pixel coordinates at this point p[0] = wxRound(q.m_x), p[1] = wxRound(q.m_y), p[2] = 0; - //wxPoint pt = vp.GetPixFromLL(lat, lon); - //p[0] = pt.x, p[1] = pt.y, p[2] = 0; + // wxPoint pt = vp.GetPixFromLL(lat, lon); + // p[0] = pt.x, p[1] = pt.y, p[2] = 0; gluTessVertex(tobj, p, p); combine_work_data.push_back(p); @@ -2958,7 +2938,7 @@ void glChartCanvas::DrawRegion(ViewPort &vp, const LLRegion ®ion) { for (std::list::iterator i = combine_work_data.begin(); i != combine_work_data.end(); i++) - delete[] * i; + delete[] *i; combine_work_data.clear(); } @@ -2978,7 +2958,7 @@ void glChartCanvas::SetClipRegion(ViewPort &vp, const LLRegion ®ion) { glStencilFunc(GL_ALWAYS, 1, 1); glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); } -//#ifndef USE_ANDROID_GLES2 +// #ifndef USE_ANDROID_GLES2 #if !defined(USE_ANDROID_GLES2) && !defined(ocpnUSE_GLSL) else // Use depth buffer for clipping @@ -3004,7 +2984,7 @@ void glChartCanvas::SetClipRegion(ViewPort &vp, const LLRegion ®ion) { } #endif - s_regionColor = wxColor(0,0,0,255); + s_regionColor = wxColor(0, 0, 0, 255); DrawRegion(vp, region); if (s_b_useStencil) { @@ -3013,7 +2993,7 @@ void glChartCanvas::SetClipRegion(ViewPort &vp, const LLRegion ®ion) { glStencilFunc(GL_EQUAL, 1, 1); glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); } -//#ifndef USE_ANDROID_GLES2 +// #ifndef USE_ANDROID_GLES2 #if !defined(USE_ANDROID_GLES2) && !defined(ocpnUSE_GLSL) else { glDepthFunc(GL_GREATER); // Set the test value @@ -3148,7 +3128,8 @@ void glChartCanvas::RenderRasterChartRegionGL(ChartBase *chart, ViewPort &vp, } #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) - RenderTextures(m_gldc, coords, tile->m_texcoords, 4, m_pParentCanvas->GetpVP()); + RenderTextures(m_gldc, coords, tile->m_texcoords, 4, + m_pParentCanvas->GetpVP()); #else if (!texture) { // failed to load, draw red glDisable(GL_TEXTURE_2D); @@ -3217,8 +3198,7 @@ void glChartCanvas::RenderQuiltViewGL(ViewPort &vp, if (!get_region.Empty()) { if (chart->GetChartFamily() == CHART_FAMILY_RASTER) { ChartBaseBSB *Patch_Ch_BSB = dynamic_cast(chart); - if (Patch_Ch_BSB ) { - + if (Patch_Ch_BSB) { SetClipRegion(vp, get_region /*pqp->quilt_region*/); RenderRasterChartRegionGL(chart, vp, pqp->ActiveRegion); DisableClipRegion(); @@ -3342,7 +3322,8 @@ void glChartCanvas::RenderQuiltViewGL(ViewPort &vp, ViewPort vph = m_pParentCanvas->GetVP(); for (auto &index : m_pParentCanvas->m_pQuilt->GetHiLiteIndexArray()) { const ChartTableEntry &cte = ChartData->GetChartTableEntry(index); - LLRegion hiregion = m_pParentCanvas->m_pQuilt->GetChartQuiltRegion(cte, vph); + LLRegion hiregion = + m_pParentCanvas->m_pQuilt->GetChartQuiltRegion(cte, vph); if (!hiregion.Empty()) { glEnable(GL_BLEND); @@ -3589,7 +3570,6 @@ void glChartCanvas::RenderNoDTA(ViewPort &vp, const LLRegion ®ion, DrawRegion(vp, region); } - /* render world chart, but only in this rectangle */ void glChartCanvas::RenderWorldChart(ocpnDC &dc, ViewPort &vp, wxRect &rect, bool &world_view) { @@ -3598,7 +3578,7 @@ void glChartCanvas::RenderWorldChart(ocpnDC &dc, ViewPort &vp, wxRect &rect, glEnable(GL_SCISSOR_TEST); glScissor(rect.x, vp.pix_height - rect.height - rect.y, rect.width, - rect.height); + rect.height); // clear background if (!world_view) { @@ -3636,11 +3616,10 @@ void glChartCanvas::RenderWorldChart(ocpnDC &dc, ViewPort &vp, wxRect &rect, } } - //m_pParentCanvas->pWorldBackgroundChart->RenderViewOnDC(dc, vp); + // m_pParentCanvas->pWorldBackgroundChart->RenderViewOnDC(dc, vp); gShapeBasemap.RenderViewOnDC(dc, vp); glDisable(GL_SCISSOR_TEST); - } /* these are the overlay objects which move with the charts and @@ -3777,7 +3756,7 @@ void glChartCanvas::DrawGLTidesInBBox(ocpnDC &dc, LLBBox &BBox) { RenderTextures(dc, coords, uv, 4, m_pParentCanvas->GetpVP()); } } // type 'T" - } // loop + } // loop #endif @@ -3843,7 +3822,7 @@ void glChartCanvas::Render() { // initial screen update SwapBuffers(); #endif - if(!g_PrintingInProgress) return; + if (!g_PrintingInProgress) return; } #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) @@ -4072,14 +4051,15 @@ void glChartCanvas::Render() { // So, disable accelerated pan ops on this case. if (m_displayScale > 1) accelerated_pan = false; - // FIXME (dave) There are some display artifact troubles using accPan on rotation. + // FIXME (dave) There are some display artifact troubles using accPan on + // rotation. // Especially seen on sparse RNC rendering if (fabs(VPoint.rotation) > 0) accelerated_pan = false; // do we allow accelerated panning? can we perform it here? #if !defined(USE_ANDROID_GLES2) && !defined(ocpnUSE_GLSL) -#else // GLES2 - // enable rendering to texture in framebuffer object +#else // GLES2 + // enable rendering to texture in framebuffer object glBindFramebuffer(GL_FRAMEBUFFER, m_fb0); if (VPoint.chart_scale < 5000) b_full = true; @@ -4130,11 +4110,13 @@ void glChartCanvas::Render() { glDisable(g_texture_rectangle_format); glUseProgram(0); - // Next, render the cached texture as quad to FBO(m_blit_tex) with offsets + // Next, render the cached texture as quad to FBO(m_blit_tex) with + // offsets glBindTexture(GL_TEXTURE_2D, m_cache_tex[!m_cache_page]); glEnable(GL_TEXTURE_2D); - // Blit the existing content onto the alternate FBO, at the correct location + // Blit the existing content onto the alternate FBO, at the correct + // location float x1, x2, y1, y2; if (dx > 0) @@ -4231,7 +4213,7 @@ void glChartCanvas::Render() { glUseProgram(0); } - } // accelerated pan + } // accelerated pan else { // must redraw the entire screen // qDebug() << "Fullpage"; @@ -4258,14 +4240,14 @@ void glChartCanvas::Render() { m_cache_page = !m_cache_page; /* page flip */ - } // full page render + } // full page render // Disable Render to FBO glBindFramebuffer(GL_FRAMEBUFFER, 0); #endif // gles2 for accpan - } // newview + } // newview useFBO = true; } @@ -4448,7 +4430,7 @@ void glChartCanvas::Render() { g_pi_manager->RenderAllGLCanvasOverlayPlugIns( m_pcontext, vp, m_pParentCanvas->m_canvasIndex, OVERLAY_OVER_EMBOSS); } - if(!g_PrintingInProgress){ + if (!g_PrintingInProgress) { if (m_pParentCanvas->m_pTrackRolloverWin) m_pParentCanvas->m_pTrackRolloverWin->Draw(gldc); @@ -4458,7 +4440,6 @@ void glChartCanvas::Render() { if (m_pParentCanvas->m_pAISRolloverWin) m_pParentCanvas->m_pAISRolloverWin->Draw(gldc); - if (m_pParentCanvas->GetMUIBar()) m_pParentCanvas->GetMUIBar()->DrawGL(gldc, m_displayScale); @@ -4469,9 +4450,9 @@ void glChartCanvas::Render() { g_iENCToolbar->DrawGL(gldc, m_displayScale); } - // On some platforms, the opengl context window is always on top of any - // standard DC windows, so we need to draw the Chart Info Window - // as overlayed bmps. + // On some platforms, the opengl context window is always on top of any + // standard DC windows, so we need to draw the Chart Info Window + // as overlayed bmps. #ifdef __WXOSX__ if (m_pParentCanvas->m_pCIWin && m_pParentCanvas->m_pCIWin->IsShown()) { @@ -4573,6 +4554,62 @@ void glChartCanvas::RenderS57TextOverlay(ViewPort &VPoint) { } } } +void glChartCanvas::RenderSingleMBTileOverlay(const int dbIndex, bool bOverlay, + ViewPort &vp, + OCPNRegion &screen_region, + LLRegion &screenLLRegion) { + ChartBase *chart = ChartData->OpenChartFromDBAndLock(dbIndex, FULL_INIT); + + // Chart may have been prevented from initial loading due to size, or some + // other reason... + if (chart == NULL) return; + + ChartMBTiles *pcmbt = dynamic_cast(chart); + if (!pcmbt) return; + + // Is tile an OVERLAY type? + // Render, or not, depending on passed flag. + if (bOverlay && pcmbt->GetTileType() != MBTilesType::OVERLAY) return; + + wxFileName tileFile(chart->GetFullPath()); + // Size test for 5 GByte + wxULongLong tileSizeMB = tileFile.GetSize() >> 20; + + if (!ChartData->CheckAnyCanvasExclusiveTileGroup() || + (tileSizeMB.GetLo() > 5000)) { + // Check to see if the tile has been "clicked". + // If so, do not add to no-show array again. + if (!m_pParentCanvas->IsTileOverlayIndexInYesShow(dbIndex)) { + if (!m_pParentCanvas->IsTileOverlayIndexInNoShow(dbIndex)) { + m_pParentCanvas->m_tile_noshow_index_array.push_back(dbIndex); + } + } + } + + // This test catches the case where the chart is added to no_show list + // when first loaded by OpenChartFromDBAndLock + if (m_pParentCanvas->IsTileOverlayIndexInNoShow(dbIndex)) { + return; + } + + pcmbt->RenderRegionViewOnGL(*m_pcontext, vp, screen_region, screenLLRegion); + + // Light up the piano key if the chart was rendered + std::vector piano_active_array_tiles = + m_pParentCanvas->m_Piano->GetActiveKeyArray(); + bool bfound = false; + + if (std::find(piano_active_array_tiles.begin(), + piano_active_array_tiles.end(), + dbIndex) != piano_active_array_tiles.end()) { + bfound = true; + } + + if (!bfound) { + piano_active_array_tiles.push_back(dbIndex); + m_pParentCanvas->m_Piano->SetActiveKeyArray(piano_active_array_tiles); + } +} void glChartCanvas::RenderMBTilesOverlay(ViewPort &VPoint) { // Render MBTiles as overlay @@ -4633,58 +4670,18 @@ void glChartCanvas::RenderMBTilesOverlay(ViewPort &VPoint) { } } - // We need to show the tilesets in reverse order to have the largest scale + // Render in two passes, to render the OVERLAY types last + + // Show the tilesets in reverse order to have the largest scale // on top + for (std::vector::reverse_iterator rit = tiles_to_show.rbegin(); rit != tiles_to_show.rend(); ++rit) { - ChartBase *chart = ChartData->OpenChartFromDBAndLock(*rit, FULL_INIT); - - // Chart may have been prevented from initial loading due to size, or some - // other reason... - if (chart == NULL) continue; - - wxFileName tileFile(chart->GetFullPath()); - // Size test for 5 GByte - wxULongLong tileSizeMB = tileFile.GetSize() >> 20; - - if (!ChartData->CheckAnyCanvasExclusiveTileGroup() || - (tileSizeMB.GetLo() > 5000)) { - // Check to see if the tile has been "clicked". - // If so, do not add to no-show array again. - if (!m_pParentCanvas->IsTileOverlayIndexInYesShow(*rit)) { - if (!m_pParentCanvas->IsTileOverlayIndexInNoShow(*rit)) { - m_pParentCanvas->m_tile_noshow_index_array.push_back(*rit); - } - } - } - - // This test catches the case where the chart is added to no_show list - // when first loaded by OpenChartFromDBAndLock - if (m_pParentCanvas->IsTileOverlayIndexInNoShow(*rit)) { - continue; - } - - ChartMBTiles *pcmbt = dynamic_cast(chart); - if (pcmbt) { - pcmbt->RenderRegionViewOnGL(*m_pcontext, vp, screen_region, - screenLLRegion); - - // Light up the piano key if the chart was rendered - std::vector piano_active_array_tiles = - m_pParentCanvas->m_Piano->GetActiveKeyArray(); - bool bfound = false; - - if (std::find(piano_active_array_tiles.begin(), - piano_active_array_tiles.end(), - *rit) != piano_active_array_tiles.end()) { - bfound = true; - } - - if (!bfound) { - piano_active_array_tiles.push_back(*rit); - m_pParentCanvas->m_Piano->SetActiveKeyArray(piano_active_array_tiles); - } - } + RenderSingleMBTileOverlay(*rit, FALSE, vp, screen_region, screenLLRegion); + } + for (std::vector::reverse_iterator rit = tiles_to_show.rbegin(); + rit != tiles_to_show.rend(); ++rit) { + RenderSingleMBTileOverlay(*rit, TRUE, vp, screen_region, screenLLRegion); } // Render the HiLite on piano rollover of mbTile key @@ -4863,7 +4860,6 @@ void glChartCanvas::ZoomProject(float offset_x, float offset_y, float swidth, // on-screen due to address wrapping in the frame buffer. Detect this case, // and render some simple solid covering quads to avoid a confusing display. - SwapBuffers(); } @@ -5107,8 +5103,7 @@ void glChartCanvas::OnEvtPinchGesture(wxQT_PinchGestureEvent &event) { #endif - total_zoom_val = - 1.0 - ((1.0 - event.GetTotalScaleFactor()) * zoom_gain); + total_zoom_val = 1.0 - ((1.0 - event.GetTotalScaleFactor()) * zoom_gain); double projected_scale = m_pParentCanvas->GetVP().chart_scale / total_zoom_val; @@ -5162,9 +5157,9 @@ void glChartCanvas::OnEvtPinchGesture(wxQT_PinchGestureEvent &event) { float dy = pinchPoint.y - m_lpinchPoint.y; if ((projected_scale > max_zoom_scale) && - (projected_scale < min_zoom_scale)) - FastZoom(zoom_val, m_pinchStart.x, m_pinchStart.y, - -dx / total_zoom_val, dy / total_zoom_val); + (projected_scale < min_zoom_scale)) + FastZoom(zoom_val, m_pinchStart.x, m_pinchStart.y, + -dx / total_zoom_val, dy / total_zoom_val); m_lpinchPoint = pinchPoint; @@ -5211,7 +5206,6 @@ void glChartCanvas::OnEvtPinchGesture(wxQT_PinchGestureEvent &event) { dx = (cc_x - m_cc_x) * tzoom; dy = -(cc_y - m_cc_y) * tzoom; - if (zoomTimer.IsRunning()) { // qDebug() << "Final zoom"; m_zoomFinal = true; @@ -5294,111 +5288,111 @@ void glChartCanvas::onGestureFinishTimerEvent(wxTimerEvent &event) { #endif -void glChartCanvas::configureShaders(ViewPort & vp) { +void glChartCanvas::configureShaders(ViewPort &vp) { #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) - mat4x4 I; - mat4x4_identity(I); - - ViewPort *pvp = (ViewPort *)&vp; - - GLShaderProgram *shader = pcolor_tri_shader_program[GetCanvasIndex()]; - shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); - shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); - shader->UnBind(); + mat4x4 I; + mat4x4_identity(I); -// glUseProgram(color_tri_shader_program); -// GLint matloc = glGetUniformLocation(color_tri_shader_program, "MVMatrix"); -// glUniformMatrix4fv(matloc, 1, GL_FALSE, -// (const GLfloat *)pvp->vp_transform); -// GLint transloc = -// glGetUniformLocation(color_tri_shader_program, "TransformMatrix"); -// glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); + ViewPort *pvp = (ViewPort *)&vp; + GLShaderProgram *shader = pcolor_tri_shader_program[GetCanvasIndex()]; + shader->Bind(); + shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); + shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); + shader->UnBind(); -// glUseProgram(texture_2D_shader_program); -// matloc = glGetUniformLocation(texture_2D_shader_program, "MVMatrix"); -// glUniformMatrix4fv(matloc, 1, GL_FALSE, -// (const GLfloat *)pvp->vp_transform); -// transloc = -// glGetUniformLocation(texture_2D_shader_program, "TransformMatrix"); -// glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); - - shader = ptexture_2D_shader_program[GetCanvasIndex()]; - shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); - shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); - shader->UnBind(); - -// glUseProgram(circle_filled_shader_program); -// matloc = glGetUniformLocation(circle_filled_shader_program, "MVMatrix"); -// glUniformMatrix4fv(matloc, 1, GL_FALSE, -// (const GLfloat *)pvp->vp_transform); -// transloc = -// glGetUniformLocation(circle_filled_shader_program, "TransformMatrix"); -// glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); + // glUseProgram(color_tri_shader_program); + // GLint matloc = glGetUniformLocation(color_tri_shader_program, + // "MVMatrix"); glUniformMatrix4fv(matloc, 1, GL_FALSE, + // (const GLfloat *)pvp->vp_transform); + // GLint transloc = + // glGetUniformLocation(color_tri_shader_program, + // "TransformMatrix"); + // glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); + + // glUseProgram(texture_2D_shader_program); + // matloc = glGetUniformLocation(texture_2D_shader_program, "MVMatrix"); + // glUniformMatrix4fv(matloc, 1, GL_FALSE, + // (const GLfloat *)pvp->vp_transform); + // transloc = + // glGetUniformLocation(texture_2D_shader_program, + // "TransformMatrix"); + // glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); + + shader = ptexture_2D_shader_program[GetCanvasIndex()]; + shader->Bind(); + shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); + shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); + shader->UnBind(); - shader = pcircle_filled_shader_program[GetCanvasIndex()]; - shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); - shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); - shader->UnBind(); + // glUseProgram(circle_filled_shader_program); + // matloc = glGetUniformLocation(circle_filled_shader_program, + // "MVMatrix"); glUniformMatrix4fv(matloc, 1, GL_FALSE, + // (const GLfloat *)pvp->vp_transform); + // transloc = + // glGetUniformLocation(circle_filled_shader_program, + // "TransformMatrix"); + // glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); + shader = pcircle_filled_shader_program[GetCanvasIndex()]; + shader->Bind(); + shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); + shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); + shader->UnBind(); - shader = ptexture_2DA_shader_program[GetCanvasIndex()]; - shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); - shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); - shader->UnBind(); + shader = ptexture_2DA_shader_program[GetCanvasIndex()]; + shader->Bind(); + shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); + shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); + shader->UnBind(); - //glUseProgram(AALine_shader_program); - //matloc = glGetUniformLocation(AALine_shader_program, "MVMatrix"); - //glUniformMatrix4fv(matloc, 1, GL_FALSE, - // (const GLfloat *)pvp->vp_transform); + // glUseProgram(AALine_shader_program); + // matloc = glGetUniformLocation(AALine_shader_program, "MVMatrix"); + // glUniformMatrix4fv(matloc, 1, GL_FALSE, + // (const GLfloat *)pvp->vp_transform); - shader = pAALine_shader_program[GetCanvasIndex()]; - shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); - shader->UnBind(); + shader = pAALine_shader_program[GetCanvasIndex()]; + shader->Bind(); + shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); + shader->UnBind(); - shader = pring_shader_program[GetCanvasIndex()]; - shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); - shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); - shader->UnBind(); + shader = pring_shader_program[GetCanvasIndex()]; + shader->Bind(); + shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)pvp->vp_matrix_transform); + shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)I); + shader->UnBind(); - // Leftover shader required by some older Android plugins - if (texture_2DA_shader_program){ - glUseProgram(texture_2DA_shader_program); - GLint matloc = glGetUniformLocation(texture_2DA_shader_program, "MVMatrix"); - glUniformMatrix4fv(matloc, 1, GL_FALSE, - (const GLfloat *)pvp->vp_matrix_transform); - GLint transloc = - glGetUniformLocation(texture_2DA_shader_program, "TransformMatrix"); - glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); - } + // Leftover shader required by some older Android plugins + if (texture_2DA_shader_program) { + glUseProgram(texture_2DA_shader_program); + GLint matloc = glGetUniformLocation(texture_2DA_shader_program, "MVMatrix"); + glUniformMatrix4fv(matloc, 1, GL_FALSE, + (const GLfloat *)pvp->vp_matrix_transform); + GLint transloc = + glGetUniformLocation(texture_2DA_shader_program, "TransformMatrix"); + glUniformMatrix4fv(transloc, 1, GL_FALSE, (const GLfloat *)I); + } - m_gldc.m_texfont.PrepareShader(vp.pix_width, vp.pix_height, vp.rotation); + m_gldc.m_texfont.PrepareShader(vp.pix_width, vp.pix_height, vp.rotation); #endif - } - +} void glChartCanvas::RenderTextures(ocpnDC &dc, float *coords, float *uvCoords, - int nVertex, ViewPort *vp) { -//#ifdef USE_ANDROID_GLES2 + int nVertex, ViewPort *vp) { +// #ifdef USE_ANDROID_GLES2 #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) - int nl = nVertex / 4; - float *lc = coords; - float *luv = uvCoords; + int nl = nVertex / 4; + float *lc = coords; + float *luv = uvCoords; - while (nl) { - RenderSingleTexture(dc, lc, luv, vp, 0, 0, 0); + while (nl) { + RenderSingleTexture(dc, lc, luv, vp, 0, 0, 0); - lc += 8; - luv += 8; - nl--; - } + lc += 8; + luv += 8; + nl--; + } #else glEnableClientState(GL_VERTEX_ARRAY); @@ -5410,40 +5404,38 @@ void glChartCanvas::RenderTextures(ocpnDC &dc, float *coords, float *uvCoords, #endif - return; - } + return; +} -void glChartCanvas::RenderSingleTexture(ocpnDC &dc, float *coords, float *uvCoords, - ViewPort *vp, float dx, float dy, - float angle_rad) { +void glChartCanvas::RenderSingleTexture(ocpnDC &dc, float *coords, + float *uvCoords, ViewPort *vp, float dx, + float dy, float angle_rad) { #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) - GLShaderProgram *shader = ptexture_2D_shader_program[dc.m_canvasIndex]; - if(!shader) return; + GLShaderProgram *shader = ptexture_2D_shader_program[dc.m_canvasIndex]; + if (!shader) return; - shader->Bind(); - - // Set up the texture sampler to texture unit 0 - shader->SetUniform1i("uTex", 0); - - // Rotate - mat4x4 I, Q; - mat4x4_identity(I); - mat4x4_rotate_Z(Q, I, angle_rad); + shader->Bind(); - // Translate - Q[3][0] = dx; - Q[3][1] = dy; + // Set up the texture sampler to texture unit 0 + shader->SetUniform1i("uTex", 0); + // Rotate + mat4x4 I, Q; + mat4x4_identity(I); + mat4x4_rotate_Z(Q, I, angle_rad); - shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)Q); + // Translate + Q[3][0] = dx; + Q[3][1] = dy; - float co1[8]; - float tco1[8]; + shader->SetUniformMatrix4fv("TransformMatrix", (GLfloat *)Q); - shader->SetAttributePointerf("aPos", co1); - shader->SetAttributePointerf("aUV", tco1); + float co1[8]; + float tco1[8]; + shader->SetAttributePointerf("aPos", co1); + shader->SetAttributePointerf("aUV", tco1); // Perform the actual drawing. @@ -5454,130 +5446,130 @@ void glChartCanvas::RenderSingleTexture(ocpnDC &dc, float *coords, float *uvCoor glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, indices1); #else - co1[0] = coords[0]; - co1[1] = coords[1]; - co1[2] = coords[2]; - co1[3] = coords[3]; - co1[4] = coords[6]; - co1[5] = coords[7]; - co1[6] = coords[4]; - co1[7] = coords[5]; - - tco1[0] = uvCoords[0]; - tco1[1] = uvCoords[1]; - tco1[2] = uvCoords[2]; - tco1[3] = uvCoords[3]; - tco1[4] = uvCoords[6]; - tco1[5] = uvCoords[7]; - tco1[6] = uvCoords[4]; - tco1[7] = uvCoords[5]; - - //glVertexAttribPointer(mPosAttrib, 2, GL_FLOAT, GL_FALSE, 0, co1); - //glVertexAttribPointer(mUvAttrib, 2, GL_FLOAT, GL_FALSE, 0, tco1); + co1[0] = coords[0]; + co1[1] = coords[1]; + co1[2] = coords[2]; + co1[3] = coords[3]; + co1[4] = coords[6]; + co1[5] = coords[7]; + co1[6] = coords[4]; + co1[7] = coords[5]; + + tco1[0] = uvCoords[0]; + tco1[1] = uvCoords[1]; + tco1[2] = uvCoords[2]; + tco1[3] = uvCoords[3]; + tco1[4] = uvCoords[6]; + tco1[5] = uvCoords[7]; + tco1[6] = uvCoords[4]; + tco1[7] = uvCoords[5]; + + // glVertexAttribPointer(mPosAttrib, 2, GL_FLOAT, GL_FALSE, 0, co1); + // glVertexAttribPointer(mUvAttrib, 2, GL_FLOAT, GL_FALSE, 0, tco1); + + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - shader->UnBind(); + shader->UnBind(); #endif #else #endif - return; - } + return; +} -void glChartCanvas::RenderColorRect(wxRect r, wxColor & color) { +void glChartCanvas::RenderColorRect(wxRect r, wxColor &color) { #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) - GLShaderProgram *shader = pcolor_tri_shader_program[GetCanvasIndex()]; - shader->Bind(); + GLShaderProgram *shader = pcolor_tri_shader_program[GetCanvasIndex()]; + shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_pParentCanvas->GetpVP()->vp_matrix_transform); + shader->SetUniformMatrix4fv( + "MVMatrix", (GLfloat *)m_pParentCanvas->GetpVP()->vp_matrix_transform); - float colorv[4]; - colorv[0] = color.Red() / float(256); - colorv[1] = color.Green() / float(256); - colorv[2] = color.Blue() / float(256); - colorv[3] = 1.0; - shader->SetUniform4fv("color", colorv); + float colorv[4]; + colorv[0] = color.Red() / float(256); + colorv[1] = color.Green() / float(256); + colorv[2] = color.Blue() / float(256); + colorv[3] = 1.0; + shader->SetUniform4fv("color", colorv); - float pf[8]; - pf[0] = r.x + r.width; - pf[1] = r.y; - pf[2] = r.x; - pf[3] = r.y; - pf[4] = r.x + r.width; - pf[5] = r.y + r.height; - pf[6] = r.x; - pf[7] = r.y + r.height; - shader->SetAttributePointerf("position", pf); + float pf[8]; + pf[0] = r.x + r.width; + pf[1] = r.y; + pf[2] = r.x; + pf[3] = r.y; + pf[4] = r.x + r.width; + pf[5] = r.y + r.height; + pf[6] = r.x; + pf[7] = r.y + r.height; + shader->SetAttributePointerf("position", pf); - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - shader->UnBind(); + shader->UnBind(); #else #endif - } +} void glChartCanvas::RenderScene(bool bRenderCharts, bool bRenderOverlays) { - #if defined(USE_ANDROID_GLES2) || defined(ocpnUSE_GLSL) - ViewPort VPoint = m_pParentCanvas->VPoint; - ocpnDC gldc(*this); + ViewPort VPoint = m_pParentCanvas->VPoint; + ocpnDC gldc(*this); - int w, h; - GetClientSize(&w, &h); - int sx = GetSize().x; - int sy = GetSize().y; + int w, h; + GetClientSize(&w, &h); + int sx = GetSize().x; + int sy = GetSize().y; - OCPNRegion screen_region(wxRect(0, 0, VPoint.pix_width, VPoint.pix_height)); + OCPNRegion screen_region(wxRect(0, 0, VPoint.pix_width, VPoint.pix_height)); - glViewport(0, 0, (GLint)w, (GLint)h); + glViewport(0, 0, (GLint)w, (GLint)h); - if (s_b_useStencil) { - glEnable(GL_STENCIL_TEST); - glStencilMask(0xff); - glClear(GL_STENCIL_BUFFER_BIT); - glDisable(GL_STENCIL_TEST); - } + if (s_b_useStencil) { + glEnable(GL_STENCIL_TEST); + glStencilMask(0xff); + glClear(GL_STENCIL_BUFFER_BIT); + glDisable(GL_STENCIL_TEST); + } - // Make sure we have a valid quilt composition - m_pParentCanvas->m_pQuilt->Compose(m_pParentCanvas->VPoint); + // Make sure we have a valid quilt composition + m_pParentCanvas->m_pQuilt->Compose(m_pParentCanvas->VPoint); - // set opengl settings that don't normally change - // this should be able to go in SetupOpenGL, but it's - // safer here incase a plugin mangles these - glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); - glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + // set opengl settings that don't normally change + // this should be able to go in SetupOpenGL, but it's + // safer here incase a plugin mangles these + glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); + glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - // enable rendering to texture in framebuffer object - glBindFramebuffer(GL_FRAMEBUFFER_EXT, m_fb0); + // enable rendering to texture in framebuffer object + glBindFramebuffer(GL_FRAMEBUFFER_EXT, m_fb0); - glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, - g_texture_rectangle_format, - m_cache_tex[m_cache_page], 0); + glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, + g_texture_rectangle_format, m_cache_tex[m_cache_page], + 0); - m_fbo_offsetx = 0; - m_fbo_offsety = 0; - m_fbo_swidth = sx; - m_fbo_sheight = sy; + m_fbo_offsetx = 0; + m_fbo_offsety = 0; + m_fbo_swidth = sx; + m_fbo_sheight = sy; - if (bRenderCharts) RenderCharts(gldc, screen_region); + if (bRenderCharts) RenderCharts(gldc, screen_region); - if (bRenderOverlays) { - RenderS57TextOverlay(m_pParentCanvas->VPoint); - RenderMBTilesOverlay(m_pParentCanvas->VPoint); - DrawStaticRoutesTracksAndWaypoints(m_pParentCanvas->VPoint); - DrawDynamicRoutesTracksAndWaypoints(VPoint); - DrawFloatingOverlayObjects(m_gldc); - } + if (bRenderOverlays) { + RenderS57TextOverlay(m_pParentCanvas->VPoint); + RenderMBTilesOverlay(m_pParentCanvas->VPoint); + DrawStaticRoutesTracksAndWaypoints(m_pParentCanvas->VPoint); + DrawDynamicRoutesTracksAndWaypoints(VPoint); + DrawFloatingOverlayObjects(m_gldc); + } - // All done, so disable Render to FBO - glBindFramebuffer(GL_FRAMEBUFFER, 0); + // All done, so disable Render to FBO + glBindFramebuffer(GL_FRAMEBUFFER, 0); #endif - } +} diff --git a/gui/src/glTexCache.cpp b/gui/src/glTexCache.cpp index c06fbb82aa..5657f0a0a8 100644 --- a/gui/src/glTexCache.cpp +++ b/gui/src/glTexCache.cpp @@ -567,8 +567,8 @@ bool glTexFactory::BuildTexture(glTextureDescriptor *ptd, int base_level, int size = TextureTileSize(level, true); int status = GetTextureLevel(ptd, rect, level, ptd->m_colorscheme); int dim = TextureDim(level); - glCompressedTexImage2D(GL_TEXTURE_2D, texture_level, g_raster_format, - dim, dim, 0, size, ptd->comp_array[level]); + glCompressedTexImage2D(GL_TEXTURE_2D, texture_level, g_raster_format, dim, + dim, 0, size, ptd->comp_array[level]); ptd->tex_mem_used += size; g_tex_mem_used += size; diff --git a/gui/src/glTextureManager.cpp b/gui/src/glTextureManager.cpp index ef716bf0b8..4e020db977 100644 --- a/gui/src/glTextureManager.cpp +++ b/gui/src/glTextureManager.cpp @@ -747,10 +747,10 @@ glTextureManager::~glTextureManager() { // ClearAllRasterTextures(); ClearJobList(); for (int i = 0; i < m_max_jobs; i++) { - delete(progList[i]); + delete (progList[i]); } progList.Clear(); - for(auto hash : m_chart_texfactory_hash) { + for (auto hash : m_chart_texfactory_hash) { delete hash.second; } m_chart_texfactory_hash.clear(); diff --git a/gui/src/gshhs.cpp b/gui/src/gshhs.cpp index 78417e1d11..f4c1edb0c6 100644 --- a/gui/src/gshhs.cpp +++ b/gui/src/gshhs.cpp @@ -59,7 +59,7 @@ #include "gshhs.h" #include "chartbase.h" // for projections #ifdef ocpnUSE_GL - #include "shaders.h" +#include "shaders.h" #endif #ifdef __WXMSW__ @@ -102,7 +102,7 @@ static const GLfloat vertices3[] = { enum Consts { INFOLOG_LEN = 512 }; GLchar infoLog[INFOLOG_LEN]; GLint fragment_shader; -//GLint shader_program; +// GLint shader_program; GLint success; GLint vertex_shader; @@ -405,8 +405,8 @@ void __CALL_CONVENTION gshhsbeginCallback(GLenum type) { void __CALL_CONVENTION gshhsendCallback() {} -void GshhsPolyCell::DrawPolygonFilledGL(ocpnDC &pnt, contour_list *p, float_2Dpt **pv, - int *pvc, ViewPort &vp, +void GshhsPolyCell::DrawPolygonFilledGL(ocpnDC &pnt, contour_list *p, + float_2Dpt **pv, int *pvc, ViewPort &vp, wxColor const &color, bool idl) { if (!p->size()) // size of 0 is very common, exit early return; @@ -579,16 +579,15 @@ void GshhsPolyCell::DrawPolygonFilledGL(ocpnDC &pnt, contour_list *p, float_2Dpt shader->UnBind(); } - #else #endif } -#endif //#ifdef ocpnUSE_GL +#endif // #ifdef ocpnUSE_GL #define DRAW_POLY_FILLED(POLY, COL) \ if (POLY) DrawPolygonFilled(pnt, POLY, dx, vp, COL); #define DRAW_POLY_FILLED_GL(NUM, COL) \ - DrawPolygonFilledGL(pnt,&poly##NUM, &polyv[NUM], &polyc[NUM], vp, COL, idl); + DrawPolygonFilledGL(pnt, &poly##NUM, &polyv[NUM], &polyc[NUM], vp, COL, idl); void GshhsPolyCell::drawMapPlain(ocpnDC &pnt, double dx, ViewPort &vp, wxColor seaColor, wxColor landColor, @@ -1258,8 +1257,8 @@ bool GshhsReader::gshhsFilesExists(int quality) { // Borders disabled anyway since the perf optimizations if( ! wxFile::Access( // GshhsReader::getFileName_boundaries( quality ), wxFile::read ) ) return // false; Rivers disabled anyway since the perf optimizations if( ! - // wxFile::Access( GshhsReader::getFileName_rivers( quality ), wxFile::read ) ) - // return false; + // wxFile::Access( GshhsReader::getFileName_rivers( quality ), wxFile::read ) + // ) return false; return true; } diff --git a/gui/src/gui_lib.cpp b/gui/src/gui_lib.cpp index 2d5d971d9f..d1a3d37fad 100644 --- a/gui/src/gui_lib.cpp +++ b/gui/src/gui_lib.cpp @@ -1,4 +1,4 @@ - /************************************************************************** +/************************************************************************** * Copyright (C) 2010 by David S. Register * * * * This program is free software; you can redistribute it and/or modify * @@ -41,14 +41,13 @@ extern OCPNPlatform* g_Platform; extern int g_GUIScaleFactor; CopyableText::CopyableText(wxWindow* parent, const char* text) - : wxTextCtrl(parent, wxID_ANY, text, wxDefaultPosition, - wxDefaultSize, wxBORDER_NONE) { + : wxTextCtrl(parent, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, + wxBORDER_NONE) { SetEditable(false); wxStaticText tmp(parent, wxID_ANY, text); SetBackgroundColour(tmp.GetBackgroundColour()); } - wxFont* GetOCPNScaledFont(wxString item, int default_size) { wxFont* dFont = FontMgr::Get().GetFont(item, default_size); int req_size = dFont->GetPointSize(); @@ -105,40 +104,39 @@ wxFont GetOCPNGUIScaledFont(wxString item) { return qFont; } -int OCPNMessageBox( wxWindow *parent, const wxString& message, const wxString& caption, int style, - int timeout_sec, int x, int y ) -{ +int OCPNMessageBox(wxWindow* parent, const wxString& message, + const wxString& caption, int style, int timeout_sec, int x, + int y) { #ifdef __OCPN__ANDROID__ - androidDisableRotation(); - int style_mod = style; + androidDisableRotation(); + int style_mod = style; - auto dlg = new wxMessageDialog(parent, message, caption, style_mod); - int ret = dlg->ShowModal(); - qDebug() << "OCPNMB-1 ret" << ret; + auto dlg = new wxMessageDialog(parent, message, caption, style_mod); + int ret = dlg->ShowModal(); + qDebug() << "OCPNMB-1 ret" << ret; - //int ret= dlg->GetReturnCode(); + // int ret= dlg->GetReturnCode(); - // Not sure why we need this, maybe on wx3? - if( ((style & wxYES_NO) == wxYES_NO) && (ret == wxID_OK)) - ret = wxID_YES; + // Not sure why we need this, maybe on wx3? + if (((style & wxYES_NO) == wxYES_NO) && (ret == wxID_OK)) ret = wxID_YES; - dlg->Destroy(); + dlg->Destroy(); - androidEnableRotation(); - qDebug() << "OCPNMB-2 ret" << ret; - return ret; + androidEnableRotation(); + qDebug() << "OCPNMB-2 ret" << ret; + return ret; #else - int ret = wxID_OK; + int ret = wxID_OK; - TimedMessageBox tbox(parent, message, caption, style, timeout_sec, wxPoint( x, y ) ); - ret = tbox.GetRetVal() ; + TimedMessageBox tbox(parent, message, caption, style, timeout_sec, + wxPoint(x, y)); + ret = tbox.GetRetVal(); #endif - return ret; + return ret; } - BEGIN_EVENT_TABLE(OCPNMessageDialog, wxDialog) EVT_BUTTON(wxID_YES, OCPNMessageDialog::OnYes) EVT_BUTTON(wxID_NO, OCPNMessageDialog::OnNo) @@ -280,7 +278,7 @@ EVT_BUTTON(wxID_NO, OCPN_TimedHTMLMessageDialog::OnNo) EVT_BUTTON(wxID_CANCEL, OCPN_TimedHTMLMessageDialog::OnCancel) EVT_CLOSE(OCPN_TimedHTMLMessageDialog::OnClose) EVT_TIMER(-1, OCPN_TimedHTMLMessageDialog::OnTimer) -EVT_HTML_LINK_CLICKED( wxID_ANY, OCPN_TimedHTMLMessageDialog::OnHtmlLinkClicked ) +EVT_HTML_LINK_CLICKED(wxID_ANY, OCPN_TimedHTMLMessageDialog::OnHtmlLinkClicked) END_EVENT_TABLE() OCPN_TimedHTMLMessageDialog::OCPN_TimedHTMLMessageDialog( @@ -398,7 +396,6 @@ void OCPN_TimedHTMLMessageDialog::OnTimer(wxTimerEvent& evt) { Hide(); } - // Auto timed popup Window implementation BEGIN_EVENT_TABLE(TimedPopupWin, wxWindow) @@ -408,7 +405,7 @@ EVT_TIMER(POPUP_TIMER, TimedPopupWin::OnTimer) END_EVENT_TABLE() // Define a constructor -TimedPopupWin::TimedPopupWin(wxWindow *parent, int timeout) +TimedPopupWin::TimedPopupWin(wxWindow* parent, int timeout) : wxWindow(parent, wxID_ANY, wxPoint(0, 0), wxSize(1, 1), wxNO_BORDER) { m_pbm = NULL; @@ -419,11 +416,11 @@ TimedPopupWin::TimedPopupWin(wxWindow *parent, int timeout) } TimedPopupWin::~TimedPopupWin() { delete m_pbm; } -void TimedPopupWin::OnTimer(wxTimerEvent &event) { +void TimedPopupWin::OnTimer(wxTimerEvent& event) { if (IsShown()) Hide(); } -void TimedPopupWin::SetBitmap(wxBitmap &bmp) { +void TimedPopupWin::SetBitmap(wxBitmap& bmp) { delete m_pbm; m_pbm = new wxBitmap(bmp); @@ -432,7 +429,7 @@ void TimedPopupWin::SetBitmap(wxBitmap &bmp) { m_timer_timeout.Start(m_timeout_sec * 1000, wxTIMER_ONE_SHOT); } -void TimedPopupWin::OnPaint(wxPaintEvent &event) { +void TimedPopupWin::OnPaint(wxPaintEvent& event) { int width, height; GetClientSize(&width, &height); wxPaintDC dc(this); diff --git a/gui/src/iENCToolbar.cpp b/gui/src/iENCToolbar.cpp index a36ca22aaf..12e6c7bbf5 100644 --- a/gui/src/iENCToolbar.cpp +++ b/gui/src/iENCToolbar.cpp @@ -84,7 +84,8 @@ iENCToolbar::iENCToolbar(wxWindow *parent, wxPoint position, long orient, m_state_timer.SetOwner(this, STATE_TIMER); m_state_timer.Start(100, wxTIMER_CONTINUOUS); - this->Connect( wxEVT_TIMER, wxTimerEventHandler( iENCToolbar::StateTimerEvent ), NULL, this ); + this->Connect(wxEVT_TIMER, wxTimerEventHandler(iENCToolbar::StateTimerEvent), + NULL, this); } iENCToolbar::~iENCToolbar() {} @@ -212,7 +213,6 @@ void iENCToolbar::OnToolLeftClick(wxCommandEvent &event) { } m_ptoolbar->InvalidateBitmaps(); RefreshToolbar(); - } void iENCToolbar::SetDensityToolBitmap(int nDensity) { @@ -270,7 +270,6 @@ void iENCToolbar::SetRangeToolBitmap() { dc.SelectObject(wxNullBitmap); m_ptoolbar->SetToolBitmaps(ID_RMINUS, m_pbmScratch, m_pbmScratch); - } void iENCToolbar::StateTimerEvent(wxTimerEvent &event) { @@ -329,5 +328,4 @@ void iENCToolbar::StateTimerEvent(wxTimerEvent &event) { // Restore runtime timer frequency after startup m_state_timer.Start(500, wxTIMER_CONTINUOUS); - } diff --git a/gui/src/initwiz/wiz_ui.cpp b/gui/src/initwiz/wiz_ui.cpp index 3536162c2f..df697d63fe 100644 --- a/gui/src/initwiz/wiz_ui.cpp +++ b/gui/src/initwiz/wiz_ui.cpp @@ -56,10 +56,10 @@ extern OCPNPlatform* g_Platform; extern std::vector g_sk_servers; -FirstUseWizImpl::FirstUseWizImpl(wxWindow* parent, MyConfig *pConfig, - wxWindowID id, - const wxString& title, const wxBitmap& bitmap, - const wxPoint& pos, long style) +FirstUseWizImpl::FirstUseWizImpl(wxWindow* parent, MyConfig* pConfig, + wxWindowID id, const wxString& title, + const wxBitmap& bitmap, const wxPoint& pos, + long style) : FirstUseWiz(parent, id, title, bitmap, pos, style) { m_pConfig = pConfig; @@ -109,8 +109,7 @@ FirstUseWizImpl::~FirstUseWizImpl() = default; void FirstUseWizImpl::OnWizardFinished(wxWizardEvent& event) { auto cfg = m_pConfig; - if (!cfg) - cfg = g_Platform->GetConfigObject(); + if (!cfg) cfg = g_Platform->GetConfigObject(); // Units cfg->SetPath(_T("/Settings")); @@ -172,8 +171,11 @@ NMEA0183Flavor FirstUseWizImpl::SeemsN0183(std::string& data) { std::regex nmea_crc_regex(".*[\\$!]([a-zA-Z]{5,6})(,.*)(\\*[0-9A-Z]{2})"); while (std::getline(ss, to, '\n')) { if (std::regex_search(to, nmea_regex) && - to.find("$PCDIN") == std::string::npos && // It also must not be SeaSmart encoded NMEA2000 - to.find("$MXPGN") == std::string::npos) { // or Shipmodul MiniPlex encoded NMEA2000 + to.find("$PCDIN") == + std::string::npos && // It also must not be SeaSmart encoded + // NMEA2000 + to.find("$MXPGN") == + std::string::npos) { // or Shipmodul MiniPlex encoded NMEA2000 DEBUG_LOG << "Looks like NMEA0183: " << to; if (std::regex_search(to, nmea_crc_regex)) { DEBUG_LOG << "Has CRC: " << to; @@ -215,7 +217,8 @@ bool FirstUseWizImpl::SeemsN2000(std::string& data) { // Actisense/YD N2K mode - All the binary formats enclose // the payload between 0x10 0x02 and 0x10 0x03 data[0] == ESCAPE && data[1] == STARTOFTEXT && - data[data.length() - 1] == ENDOFTEXT && data[data.length() - 2] == ESCAPE) { + data[data.length() - 1] == ENDOFTEXT && + data[data.length() - 2] == ESCAPE) { DEBUG_LOG << "Looks like NMEA2000: " << to; return true; } @@ -372,8 +375,9 @@ void FirstUseWizImpl::EnumerateUDP() { sock->SetTimeout(1); sock->WaitForRead(1, 0); sock->Read(&buffer, len); - // Binary protocols may contain 0x00 bytes, so we have to treat the buffer as such and avoid string conversion - while (len > 0 && buffer[len-1] == 0x00) { + // Binary protocols may contain 0x00 bytes, so we have to treat the buffer + // as such and avoid string conversion + while (len > 0 && buffer[len - 1] == 0x00) { len--; } if (len > 0) { @@ -486,14 +490,16 @@ void FirstUseWizImpl::EnumerateTCP() { memset(buffer, 0, len); client->WaitForRead(1, 0); client->Read(&buffer, len); - // Binary protocols may contain 0x00 bytes, so we have to treat the buffer as such and avoid string conversion - while (len > 0 && buffer[len-1] == 0x00) { + // Binary protocols may contain 0x00 bytes, so we have to treat the + // buffer as such and avoid string conversion + while (len > 0 && buffer[len - 1] == 0x00) { len--; } if (len > 0) { std::string data(buffer, len); DEBUG_LOG << "Read: " << data; - if (auto flavor = SeemsN0183(data); flavor != NMEA0183Flavor::INVALID) { + if (auto flavor = SeemsN0183(data); + flavor != NMEA0183Flavor::INVALID) { ConnectionParams params; params.Type = ConnectionType::NETWORK; params.NetProtocol = NetworkProtocol::TCP; @@ -506,8 +512,8 @@ void FirstUseWizImpl::EnumerateTCP() { } params.NetworkAddress = ip; params.NetworkPort = port; - params.UserComment = - wxString::Format(_("NMEA0183: %s TCP port %d"), ip.c_str(), port); + params.UserComment = wxString::Format(_("NMEA0183: %s TCP port %d"), + ip.c_str(), port); m_detected_connections.push_back(params); continue; } else if (SeemsN2000(data)) { @@ -518,8 +524,8 @@ void FirstUseWizImpl::EnumerateTCP() { params.LastDataProtocol = DataProtocol::PROTO_NMEA2000; params.NetworkAddress = ip; params.NetworkPort = port; - params.UserComment = - wxString::Format(_("NMEA2000: %s TCP port %d"), ip.c_str(), port); + params.UserComment = wxString::Format(_("NMEA2000: %s TCP port %d"), + ip.c_str(), port); m_detected_connections.push_back(params); continue; } @@ -545,22 +551,22 @@ void FirstUseWizImpl::EnumerateCAN() { wxArrayString output; if (long res = wxExecute(cmd, output); res != 0) { DEBUG_LOG << "Network interface evaluation failed with exit code " << res; - for (const auto &l : output) { + for (const auto& l : output) { DEBUG_LOG << " - " << l; } return; } wxString fis; - for (const auto &l : output) { + for (const auto& l : output) { fis.Append(l); } wxJSONReader reader; wxJSONValue root; reader.Parse(fis, &root); - if (reader.GetErrorCount() > 0){ + if (reader.GetErrorCount() > 0) { DEBUG_LOG << "Failed to parse JSON output from ip."; - for(const auto &l : reader.GetErrors()) { + for (const auto& l : reader.GetErrors()) { DEBUG_LOG << " - " << l; } return; @@ -568,8 +574,7 @@ void FirstUseWizImpl::EnumerateCAN() { if (root.IsArray()) { for (int i = 0; i < root.Size(); i++) { const wxJSONValue iface = root[i]; - if (iface.HasMember("ifname") && - iface.HasMember("link_type")) { + if (iface.HasMember("ifname") && iface.HasMember("link_type")) { wxString ifname = iface.Get("ifname", "").AsString(); wxString link_type = iface.Get("link_type", "").AsString(); if (link_type == "can") { @@ -627,7 +632,8 @@ void FirstUseWizImpl::EnumerateDatasources() { m_rtConnectionInfo->Clear(); wxTheApp->ProcessPendingEvents(); wxYield(); - m_rtConnectionInfo->WriteText(_("Looking for navigation data sources, this may take a while...")); + m_rtConnectionInfo->WriteText( + _("Looking for navigation data sources, this may take a while...")); m_rtConnectionInfo->Newline(); m_rtConnectionInfo->WriteText(_("Scanning USB devices...")); m_rtConnectionInfo->Newline(); diff --git a/gui/src/initwiz/wiz_ui_proto.cpp b/gui/src/initwiz/wiz_ui_proto.cpp index 1a8cc1dd99..878af4fa1c 100644 --- a/gui/src/initwiz/wiz_ui_proto.cpp +++ b/gui/src/initwiz/wiz_ui_proto.cpp @@ -9,244 +9,303 @@ /////////////////////////////////////////////////////////////////////////// -FirstUseWiz::FirstUseWiz( wxWindow* parent, wxWindowID id, const wxString& title, const wxBitmap& bitmap, const wxPoint& pos, long style ) -{ - this->Create( parent, id, title, bitmap, pos, style ); - - this->SetSizeHints( wxSize( 700,600 ), wxDefaultSize ); - - wxWizardPageSimple* m_wpLangUnits = new wxWizardPageSimple( this ); - m_pages.Add( m_wpLangUnits ); - - wxBoxSizer* bSizerLangUnitsTop; - bSizerLangUnitsTop = new wxBoxSizer( wxVERTICAL ); - - m_swLangUnits = new wxScrolledWindow( m_wpLangUnits, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); - m_swLangUnits->SetScrollRate( 5, 5 ); - wxBoxSizer* bSizerLangUnits; - bSizerLangUnits = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer* sbSizerUnits; - sbSizerUnits = new wxStaticBoxSizer( new wxStaticBox( m_swLangUnits, wxID_ANY, _("Units and formats") ), wxVERTICAL ); - - wxFlexGridSizer* fgSizerUnits; - fgSizerUnits = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizerUnits->SetFlexibleDirection( wxBOTH ); - fgSizerUnits->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_stDepth = new wxStaticText( sbSizerUnits->GetStaticBox(), wxID_ANY, _("Depth"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stDepth->Wrap( -1 ); - fgSizerUnits->Add( m_stDepth, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - wxString m_cDepthChoices[] = { _("Feet"), _("Meters"), _("Fathoms") }; - int m_cDepthNChoices = sizeof( m_cDepthChoices ) / sizeof( wxString ); - m_cDepth = new wxChoice( sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cDepthNChoices, m_cDepthChoices, 0 ); - m_cDepth->SetSelection( 0 ); - fgSizerUnits->Add( m_cDepth, 0, wxALL, 5 ); - - m_stDistance = new wxStaticText( sbSizerUnits->GetStaticBox(), wxID_ANY, _("Distance"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stDistance->Wrap( -1 ); - fgSizerUnits->Add( m_stDistance, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - wxString m_cDistanceChoices[] = { _("Nautical miles"), _("Statute miles"), _("Kilometers"), _("Meters") }; - int m_cDistanceNChoices = sizeof( m_cDistanceChoices ) / sizeof( wxString ); - m_cDistance = new wxChoice( sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cDistanceNChoices, m_cDistanceChoices, 0 ); - m_cDistance->SetSelection( 0 ); - fgSizerUnits->Add( m_cDistance, 0, wxALL, 5 ); - - m_stSpeed = new wxStaticText( sbSizerUnits->GetStaticBox(), wxID_ANY, _("Speed"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stSpeed->Wrap( -1 ); - fgSizerUnits->Add( m_stSpeed, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - wxString m_cSpeedChoices[] = { _("Knots"), _("mph"), _("km/h"), _("m/s") }; - int m_cSpeedNChoices = sizeof( m_cSpeedChoices ) / sizeof( wxString ); - m_cSpeed = new wxChoice( sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cSpeedNChoices, m_cSpeedChoices, 0 ); - m_cSpeed->SetSelection( 0 ); - fgSizerUnits->Add( m_cSpeed, 0, wxALL, 5 ); - - m_stWind = new wxStaticText( sbSizerUnits->GetStaticBox(), wxID_ANY, _("Wind speed"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stWind->Wrap( -1 ); - fgSizerUnits->Add( m_stWind, 0, wxALL, 5 ); - - wxString m_cWindChoices[] = { _("Knots"), _("mph"), _("km/h"), _("m/s") }; - int m_cWindNChoices = sizeof( m_cWindChoices ) / sizeof( wxString ); - m_cWind = new wxChoice( sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cWindNChoices, m_cWindChoices, 0 ); - m_cWind->SetSelection( 0 ); - fgSizerUnits->Add( m_cWind, 0, wxALL, 5 ); - - m_stPosition = new wxStaticText( sbSizerUnits->GetStaticBox(), wxID_ANY, _("Position"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stPosition->Wrap( -1 ); - fgSizerUnits->Add( m_stPosition, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - wxString m_cPositionChoices[] = { _("Degrees, decimal minutes (DD MM.MM)"), _("Decimal degrees (DD.DDDDD)"), _("Degrees, minutes, seconds (DD MM SS)"), wxEmptyString }; - int m_cPositionNChoices = sizeof( m_cPositionChoices ) / sizeof( wxString ); - m_cPosition = new wxChoice( sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cPositionNChoices, m_cPositionChoices, 0 ); - m_cPosition->SetSelection( 0 ); - fgSizerUnits->Add( m_cPosition, 0, wxALL, 5 ); - - - fgSizerUnits->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_cbShowTrue = new wxCheckBox( sbSizerUnits->GetStaticBox(), wxID_ANY, _("Show true headings and bearings"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbShowTrue->SetValue(true); - fgSizerUnits->Add( m_cbShowTrue, 0, wxALL, 5 ); - - - fgSizerUnits->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_cbShowMagnetic = new wxCheckBox( sbSizerUnits->GetStaticBox(), wxID_ANY, _("Show magnetic headings and bearings"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerUnits->Add( m_cbShowMagnetic, 0, wxALL, 5 ); - - - sbSizerUnits->Add( fgSizerUnits, 1, wxEXPAND, 5 ); - - - bSizerLangUnits->Add( sbSizerUnits, 1, wxEXPAND, 5 ); - - - bSizerLangUnits->Add( 0, 20, 0, wxEXPAND, 5 ); - - m_rtLangUnitInfo = new wxRichTextCtrl( m_swLangUnits, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS ); - bSizerLangUnits->Add( m_rtLangUnitInfo, 1, wxEXPAND | wxALL, 5 ); - - - m_swLangUnits->SetSizer( bSizerLangUnits ); - m_swLangUnits->Layout(); - bSizerLangUnits->Fit( m_swLangUnits ); - bSizerLangUnitsTop->Add( m_swLangUnits, 1, wxEXPAND | wxALL, 5 ); - - - m_wpLangUnits->SetSizer( bSizerLangUnitsTop ); - m_wpLangUnits->Layout(); - wxWizardPageSimple* m_wpConnections = new wxWizardPageSimple( this ); - m_pages.Add( m_wpConnections ); - - wxBoxSizer* bSizerConnectionsTop; - bSizerConnectionsTop = new wxBoxSizer( wxVERTICAL ); - - m_swConnections = new wxScrolledWindow( m_wpConnections, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); - m_swConnections->SetScrollRate( 5, 5 ); - wxBoxSizer* bSizerConnections; - bSizerConnections = new wxBoxSizer( wxVERTICAL ); - - m_stSources = new wxStaticText( m_swConnections, wxID_ANY, _("Detected navigation data sources:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stSources->Wrap( -1 ); - bSizerConnections->Add( m_stSources, 0, wxALL, 5 ); - - wxArrayString m_clSourcesChoices; - m_clSources = new wxCheckListBox( m_swConnections, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_clSourcesChoices, 0 ); - bSizerConnections->Add( m_clSources, 1, wxALL|wxEXPAND, 5 ); - - m_btnRescanSources = new wxButton( m_swConnections, wxID_ANY, _("Rescan..."), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerConnections->Add( m_btnRescanSources, 0, wxALL, 5 ); - - - bSizerConnections->Add( 0, 20, 0, wxEXPAND, 5 ); - - m_rtConnectionInfo = new wxRichTextCtrl( m_swConnections, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS ); - bSizerConnections->Add( m_rtConnectionInfo, 2, wxEXPAND | wxALL, 5 ); - - - m_swConnections->SetSizer( bSizerConnections ); - m_swConnections->Layout(); - bSizerConnections->Fit( m_swConnections ); - bSizerConnectionsTop->Add( m_swConnections, 1, wxEXPAND | wxALL, 5 ); - - - m_wpConnections->SetSizer( bSizerConnectionsTop ); - m_wpConnections->Layout(); - bSizerConnectionsTop->Fit( m_wpConnections ); - wxWizardPageSimple* m_wpCharts = new wxWizardPageSimple( this ); - m_pages.Add( m_wpCharts ); - - wxBoxSizer* bSizerChartsTop; - bSizerChartsTop = new wxBoxSizer( wxVERTICAL ); - - m_swCharts = new wxScrolledWindow( m_wpCharts, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); - m_swCharts->SetScrollRate( 5, 5 ); - wxBoxSizer* bSizerCharts; - bSizerCharts = new wxBoxSizer( wxVERTICAL ); - - m_stAddCharts = new wxStaticText( m_swCharts, wxID_ANY, _("Add existing charts"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stAddCharts->Wrap( -1 ); - bSizerCharts->Add( m_stAddCharts, 0, wxALL, 5 ); - - m_lbChartsDirs = new wxListBox( m_swCharts, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - bSizerCharts->Add( m_lbChartsDirs, 0, wxALL|wxEXPAND, 5 ); - - m_btnAddChartDir = new wxButton( m_swCharts, wxID_ANY, _("Add chart directory..."), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerCharts->Add( m_btnAddChartDir, 0, wxALL, 5 ); - - - bSizerCharts->Add( 0, 20, 0, wxEXPAND, 5 ); - - m_rtChartDirInfo = new wxRichTextCtrl( m_swCharts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS ); - bSizerCharts->Add( m_rtChartDirInfo, 2, wxEXPAND | wxALL, 5 ); - - - m_swCharts->SetSizer( bSizerCharts ); - m_swCharts->Layout(); - bSizerCharts->Fit( m_swCharts ); - bSizerChartsTop->Add( m_swCharts, 1, wxEXPAND | wxALL, 5 ); - - - m_wpCharts->SetSizer( bSizerChartsTop ); - m_wpCharts->Layout(); - wxWizardPageSimple* m_wpFinish = new wxWizardPageSimple( this ); - m_pages.Add( m_wpFinish ); - - wxBoxSizer* bSizerFinish; - bSizerFinish = new wxBoxSizer( wxVERTICAL ); - - m_htmlWinFinish = new wxHtmlWindow( m_wpFinish, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); - - // Try to detect smaller displays, and adjust wizard size accordingly - // Looking for small devices in landscape mode. - wxSize displaySize = wxGetDisplaySize(); - if ((displaySize.y < 500) && (displaySize.x > displaySize.y)){ - m_htmlWinFinish->SetMinSize( wxSize(displaySize.x * 8/10, displaySize.y * 65 / 100 )); - } - else - m_htmlWinFinish->SetMinSize( wxSize( 800,600 ) ); - - bSizerFinish->Add( m_htmlWinFinish, 1, wxALL|wxEXPAND, 5 ); - - - m_wpFinish->SetSizer( bSizerFinish ); - m_wpFinish->Layout(); - - this->Centre( wxBOTH ); - - for ( unsigned int i = 1; i < m_pages.GetCount(); i++ ) - { - m_pages.Item( i )->SetPrev( m_pages.Item( i - 1 ) ); - m_pages.Item( i - 1 )->SetNext( m_pages.Item( i ) ); - } - - // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( FirstUseWiz::OnInitDialog ) ); - this->Connect( wxID_ANY, wxEVT_WIZARD_CANCEL, wxWizardEventHandler( FirstUseWiz::OnWizardCancel ) ); - this->Connect( wxID_ANY, wxEVT_WIZARD_FINISHED, wxWizardEventHandler( FirstUseWiz::OnWizardFinished ) ); - this->Connect( wxID_ANY, wxEVT_WIZARD_HELP, wxWizardEventHandler( FirstUseWiz::OnWizardHelp ) ); - this->Connect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEventHandler( FirstUseWiz::OnWizardPageChanged ) ); - this->Connect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEventHandler( FirstUseWiz::OnWizardPageChanging ) ); - this->Connect( wxID_ANY, wxEVT_WIZARD_PAGE_SHOWN, wxWizardEventHandler( FirstUseWiz::OnWizardPageShown ) ); - m_btnRescanSources->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FirstUseWiz::m_btnRescanSourcesOnButtonClick ), NULL, this ); - m_btnAddChartDir->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FirstUseWiz::m_btnAddChartDirOnButtonClick ), NULL, this ); +FirstUseWiz::FirstUseWiz(wxWindow* parent, wxWindowID id, const wxString& title, + const wxBitmap& bitmap, const wxPoint& pos, + long style) { + this->Create(parent, id, title, bitmap, pos, style); + + this->SetSizeHints(wxSize(700, 600), wxDefaultSize); + + wxWizardPageSimple* m_wpLangUnits = new wxWizardPageSimple(this); + m_pages.Add(m_wpLangUnits); + + wxBoxSizer* bSizerLangUnitsTop; + bSizerLangUnitsTop = new wxBoxSizer(wxVERTICAL); + + m_swLangUnits = + new wxScrolledWindow(m_wpLangUnits, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxHSCROLL | wxVSCROLL); + m_swLangUnits->SetScrollRate(5, 5); + wxBoxSizer* bSizerLangUnits; + bSizerLangUnits = new wxBoxSizer(wxVERTICAL); + + wxStaticBoxSizer* sbSizerUnits; + sbSizerUnits = new wxStaticBoxSizer( + new wxStaticBox(m_swLangUnits, wxID_ANY, _("Units and formats")), + wxVERTICAL); + + wxFlexGridSizer* fgSizerUnits; + fgSizerUnits = new wxFlexGridSizer(0, 2, 0, 0); + fgSizerUnits->SetFlexibleDirection(wxBOTH); + fgSizerUnits->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + + m_stDepth = new wxStaticText(sbSizerUnits->GetStaticBox(), wxID_ANY, + _("Depth"), wxDefaultPosition, wxDefaultSize, 0); + m_stDepth->Wrap(-1); + fgSizerUnits->Add(m_stDepth, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + + wxString m_cDepthChoices[] = {_("Feet"), _("Meters"), _("Fathoms")}; + int m_cDepthNChoices = sizeof(m_cDepthChoices) / sizeof(wxString); + m_cDepth = + new wxChoice(sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_cDepthNChoices, m_cDepthChoices, 0); + m_cDepth->SetSelection(0); + fgSizerUnits->Add(m_cDepth, 0, wxALL, 5); + + m_stDistance = + new wxStaticText(sbSizerUnits->GetStaticBox(), wxID_ANY, _("Distance"), + wxDefaultPosition, wxDefaultSize, 0); + m_stDistance->Wrap(-1); + fgSizerUnits->Add(m_stDistance, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + + wxString m_cDistanceChoices[] = {_("Nautical miles"), _("Statute miles"), + _("Kilometers"), _("Meters")}; + int m_cDistanceNChoices = sizeof(m_cDistanceChoices) / sizeof(wxString); + m_cDistance = + new wxChoice(sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_cDistanceNChoices, m_cDistanceChoices, 0); + m_cDistance->SetSelection(0); + fgSizerUnits->Add(m_cDistance, 0, wxALL, 5); + + m_stSpeed = new wxStaticText(sbSizerUnits->GetStaticBox(), wxID_ANY, + _("Speed"), wxDefaultPosition, wxDefaultSize, 0); + m_stSpeed->Wrap(-1); + fgSizerUnits->Add(m_stSpeed, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + + wxString m_cSpeedChoices[] = {_("Knots"), _("mph"), _("km/h"), _("m/s")}; + int m_cSpeedNChoices = sizeof(m_cSpeedChoices) / sizeof(wxString); + m_cSpeed = + new wxChoice(sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_cSpeedNChoices, m_cSpeedChoices, 0); + m_cSpeed->SetSelection(0); + fgSizerUnits->Add(m_cSpeed, 0, wxALL, 5); + + m_stWind = + new wxStaticText(sbSizerUnits->GetStaticBox(), wxID_ANY, _("Wind speed"), + wxDefaultPosition, wxDefaultSize, 0); + m_stWind->Wrap(-1); + fgSizerUnits->Add(m_stWind, 0, wxALL, 5); + + wxString m_cWindChoices[] = {_("Knots"), _("mph"), _("km/h"), _("m/s")}; + int m_cWindNChoices = sizeof(m_cWindChoices) / sizeof(wxString); + m_cWind = + new wxChoice(sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_cWindNChoices, m_cWindChoices, 0); + m_cWind->SetSelection(0); + fgSizerUnits->Add(m_cWind, 0, wxALL, 5); + + m_stPosition = + new wxStaticText(sbSizerUnits->GetStaticBox(), wxID_ANY, _("Position"), + wxDefaultPosition, wxDefaultSize, 0); + m_stPosition->Wrap(-1); + fgSizerUnits->Add(m_stPosition, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + + wxString m_cPositionChoices[] = { + _("Degrees, decimal minutes (DD MM.MM)"), _("Decimal degrees (DD.DDDDD)"), + _("Degrees, minutes, seconds (DD MM SS)"), wxEmptyString}; + int m_cPositionNChoices = sizeof(m_cPositionChoices) / sizeof(wxString); + m_cPosition = + new wxChoice(sbSizerUnits->GetStaticBox(), wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_cPositionNChoices, m_cPositionChoices, 0); + m_cPosition->SetSelection(0); + fgSizerUnits->Add(m_cPosition, 0, wxALL, 5); + + fgSizerUnits->Add(0, 0, 1, wxEXPAND, 5); + + m_cbShowTrue = new wxCheckBox(sbSizerUnits->GetStaticBox(), wxID_ANY, + _("Show true headings and bearings"), + wxDefaultPosition, wxDefaultSize, 0); + m_cbShowTrue->SetValue(true); + fgSizerUnits->Add(m_cbShowTrue, 0, wxALL, 5); + + fgSizerUnits->Add(0, 0, 1, wxEXPAND, 5); + + m_cbShowMagnetic = new wxCheckBox(sbSizerUnits->GetStaticBox(), wxID_ANY, + _("Show magnetic headings and bearings"), + wxDefaultPosition, wxDefaultSize, 0); + fgSizerUnits->Add(m_cbShowMagnetic, 0, wxALL, 5); + + sbSizerUnits->Add(fgSizerUnits, 1, wxEXPAND, 5); + + bSizerLangUnits->Add(sbSizerUnits, 1, wxEXPAND, 5); + + bSizerLangUnits->Add(0, 20, 0, wxEXPAND, 5); + + m_rtLangUnitInfo = new wxRichTextCtrl( + m_swLangUnits, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, + 0 | wxVSCROLL | wxHSCROLL | wxNO_BORDER | wxWANTS_CHARS); + bSizerLangUnits->Add(m_rtLangUnitInfo, 1, wxEXPAND | wxALL, 5); + + m_swLangUnits->SetSizer(bSizerLangUnits); + m_swLangUnits->Layout(); + bSizerLangUnits->Fit(m_swLangUnits); + bSizerLangUnitsTop->Add(m_swLangUnits, 1, wxEXPAND | wxALL, 5); + + m_wpLangUnits->SetSizer(bSizerLangUnitsTop); + m_wpLangUnits->Layout(); + wxWizardPageSimple* m_wpConnections = new wxWizardPageSimple(this); + m_pages.Add(m_wpConnections); + + wxBoxSizer* bSizerConnectionsTop; + bSizerConnectionsTop = new wxBoxSizer(wxVERTICAL); + + m_swConnections = + new wxScrolledWindow(m_wpConnections, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxHSCROLL | wxVSCROLL); + m_swConnections->SetScrollRate(5, 5); + wxBoxSizer* bSizerConnections; + bSizerConnections = new wxBoxSizer(wxVERTICAL); + + m_stSources = new wxStaticText(m_swConnections, wxID_ANY, + _("Detected navigation data sources:"), + wxDefaultPosition, wxDefaultSize, 0); + m_stSources->Wrap(-1); + bSizerConnections->Add(m_stSources, 0, wxALL, 5); + + wxArrayString m_clSourcesChoices; + m_clSources = new wxCheckListBox(m_swConnections, wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_clSourcesChoices, 0); + bSizerConnections->Add(m_clSources, 1, wxALL | wxEXPAND, 5); + + m_btnRescanSources = new wxButton(m_swConnections, wxID_ANY, _("Rescan..."), + wxDefaultPosition, wxDefaultSize, 0); + bSizerConnections->Add(m_btnRescanSources, 0, wxALL, 5); + + bSizerConnections->Add(0, 20, 0, wxEXPAND, 5); + + m_rtConnectionInfo = new wxRichTextCtrl( + m_swConnections, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxDefaultSize, 0 | wxVSCROLL | wxHSCROLL | wxNO_BORDER | wxWANTS_CHARS); + bSizerConnections->Add(m_rtConnectionInfo, 2, wxEXPAND | wxALL, 5); + + m_swConnections->SetSizer(bSizerConnections); + m_swConnections->Layout(); + bSizerConnections->Fit(m_swConnections); + bSizerConnectionsTop->Add(m_swConnections, 1, wxEXPAND | wxALL, 5); + + m_wpConnections->SetSizer(bSizerConnectionsTop); + m_wpConnections->Layout(); + bSizerConnectionsTop->Fit(m_wpConnections); + wxWizardPageSimple* m_wpCharts = new wxWizardPageSimple(this); + m_pages.Add(m_wpCharts); + + wxBoxSizer* bSizerChartsTop; + bSizerChartsTop = new wxBoxSizer(wxVERTICAL); + + m_swCharts = new wxScrolledWindow(m_wpCharts, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxHSCROLL | wxVSCROLL); + m_swCharts->SetScrollRate(5, 5); + wxBoxSizer* bSizerCharts; + bSizerCharts = new wxBoxSizer(wxVERTICAL); + + m_stAddCharts = + new wxStaticText(m_swCharts, wxID_ANY, _("Add existing charts"), + wxDefaultPosition, wxDefaultSize, 0); + m_stAddCharts->Wrap(-1); + bSizerCharts->Add(m_stAddCharts, 0, wxALL, 5); + + m_lbChartsDirs = new wxListBox(m_swCharts, wxID_ANY, wxDefaultPosition, + wxDefaultSize, 0, NULL, 0); + bSizerCharts->Add(m_lbChartsDirs, 0, wxALL | wxEXPAND, 5); + + m_btnAddChartDir = + new wxButton(m_swCharts, wxID_ANY, _("Add chart directory..."), + wxDefaultPosition, wxDefaultSize, 0); + bSizerCharts->Add(m_btnAddChartDir, 0, wxALL, 5); + + bSizerCharts->Add(0, 20, 0, wxEXPAND, 5); + + m_rtChartDirInfo = new wxRichTextCtrl( + m_swCharts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, + 0 | wxVSCROLL | wxHSCROLL | wxNO_BORDER | wxWANTS_CHARS); + bSizerCharts->Add(m_rtChartDirInfo, 2, wxEXPAND | wxALL, 5); + + m_swCharts->SetSizer(bSizerCharts); + m_swCharts->Layout(); + bSizerCharts->Fit(m_swCharts); + bSizerChartsTop->Add(m_swCharts, 1, wxEXPAND | wxALL, 5); + + m_wpCharts->SetSizer(bSizerChartsTop); + m_wpCharts->Layout(); + wxWizardPageSimple* m_wpFinish = new wxWizardPageSimple(this); + m_pages.Add(m_wpFinish); + + wxBoxSizer* bSizerFinish; + bSizerFinish = new wxBoxSizer(wxVERTICAL); + + m_htmlWinFinish = new wxHtmlWindow(m_wpFinish, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxHW_SCROLLBAR_AUTO); + + // Try to detect smaller displays, and adjust wizard size accordingly + // Looking for small devices in landscape mode. + wxSize displaySize = wxGetDisplaySize(); + if ((displaySize.y < 500) && (displaySize.x > displaySize.y)) { + m_htmlWinFinish->SetMinSize( + wxSize(displaySize.x * 8 / 10, displaySize.y * 65 / 100)); + } else + m_htmlWinFinish->SetMinSize(wxSize(800, 600)); + + bSizerFinish->Add(m_htmlWinFinish, 1, wxALL | wxEXPAND, 5); + + m_wpFinish->SetSizer(bSizerFinish); + m_wpFinish->Layout(); + + this->Centre(wxBOTH); + + for (unsigned int i = 1; i < m_pages.GetCount(); i++) { + m_pages.Item(i)->SetPrev(m_pages.Item(i - 1)); + m_pages.Item(i - 1)->SetNext(m_pages.Item(i)); + } + + // Connect Events + this->Connect(wxEVT_INIT_DIALOG, + wxInitDialogEventHandler(FirstUseWiz::OnInitDialog)); + this->Connect(wxID_ANY, wxEVT_WIZARD_CANCEL, + wxWizardEventHandler(FirstUseWiz::OnWizardCancel)); + this->Connect(wxID_ANY, wxEVT_WIZARD_FINISHED, + wxWizardEventHandler(FirstUseWiz::OnWizardFinished)); + this->Connect(wxID_ANY, wxEVT_WIZARD_HELP, + wxWizardEventHandler(FirstUseWiz::OnWizardHelp)); + this->Connect(wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, + wxWizardEventHandler(FirstUseWiz::OnWizardPageChanged)); + this->Connect(wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, + wxWizardEventHandler(FirstUseWiz::OnWizardPageChanging)); + this->Connect(wxID_ANY, wxEVT_WIZARD_PAGE_SHOWN, + wxWizardEventHandler(FirstUseWiz::OnWizardPageShown)); + m_btnRescanSources->Connect( + wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(FirstUseWiz::m_btnRescanSourcesOnButtonClick), NULL, + this); + m_btnAddChartDir->Connect( + wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(FirstUseWiz::m_btnAddChartDirOnButtonClick), NULL, + this); } -FirstUseWiz::~FirstUseWiz() -{ - // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( FirstUseWiz::OnInitDialog ) ); - this->Disconnect( wxID_ANY, wxEVT_WIZARD_CANCEL, wxWizardEventHandler( FirstUseWiz::OnWizardCancel ) ); - this->Disconnect( wxID_ANY, wxEVT_WIZARD_FINISHED, wxWizardEventHandler( FirstUseWiz::OnWizardFinished ) ); - this->Disconnect( wxID_ANY, wxEVT_WIZARD_HELP, wxWizardEventHandler( FirstUseWiz::OnWizardHelp ) ); - this->Disconnect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEventHandler( FirstUseWiz::OnWizardPageChanged ) ); - this->Disconnect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEventHandler( FirstUseWiz::OnWizardPageChanging ) ); - this->Disconnect( wxID_ANY, wxEVT_WIZARD_PAGE_SHOWN, wxWizardEventHandler( FirstUseWiz::OnWizardPageShown ) ); - m_btnRescanSources->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FirstUseWiz::m_btnRescanSourcesOnButtonClick ), NULL, this ); - m_btnAddChartDir->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FirstUseWiz::m_btnAddChartDirOnButtonClick ), NULL, this ); - - m_pages.Clear(); +FirstUseWiz::~FirstUseWiz() { + // Disconnect Events + this->Disconnect(wxEVT_INIT_DIALOG, + wxInitDialogEventHandler(FirstUseWiz::OnInitDialog)); + this->Disconnect(wxID_ANY, wxEVT_WIZARD_CANCEL, + wxWizardEventHandler(FirstUseWiz::OnWizardCancel)); + this->Disconnect(wxID_ANY, wxEVT_WIZARD_FINISHED, + wxWizardEventHandler(FirstUseWiz::OnWizardFinished)); + this->Disconnect(wxID_ANY, wxEVT_WIZARD_HELP, + wxWizardEventHandler(FirstUseWiz::OnWizardHelp)); + this->Disconnect(wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, + wxWizardEventHandler(FirstUseWiz::OnWizardPageChanged)); + this->Disconnect(wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, + wxWizardEventHandler(FirstUseWiz::OnWizardPageChanging)); + this->Disconnect(wxID_ANY, wxEVT_WIZARD_PAGE_SHOWN, + wxWizardEventHandler(FirstUseWiz::OnWizardPageShown)); + m_btnRescanSources->Disconnect( + wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(FirstUseWiz::m_btnRescanSourcesOnButtonClick), NULL, + this); + m_btnAddChartDir->Disconnect( + wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(FirstUseWiz::m_btnAddChartDirOnButtonClick), NULL, + this); + + m_pages.Clear(); } diff --git a/gui/src/mbtiles/TileCache.hpp b/gui/src/mbtiles/TileCache.hpp index 658f6b6552..155f25eb24 100644 --- a/gui/src/mbtiles/TileCache.hpp +++ b/gui/src/mbtiles/TileCache.hpp @@ -2,6 +2,7 @@ #define _TILECACHE_H_ #include "TileDescriptor.hpp" +#include /// @brief Class managing the tiles of a mbtiles file class TileCache { @@ -18,9 +19,6 @@ class TileCache { ZoomDescriptor *zoomTable; int minZoom, maxZoom, nbZoom; // Chained list parameters - mbTileDescriptor *listStart = nullptr; - mbTileDescriptor *listEnd = nullptr; - uint32_t listSize = 0; public: TileCache(int minZoom, int maxZoom, float LonMin, float LatMin, float LonMax, @@ -46,6 +44,21 @@ class TileCache { virtual ~TileCache() { delete[] zoomTable; } + /// Return mutex to lock given tile. There is a fixed number of mutexes + /// available, the mutex returned might collide with another id causing + /// random serialization. + static std::mutex &GetMutex(uint64_t tile_id) { + static const int kMutexCount = 100; + static std::array mutexes; + return mutexes[tile_id % kMutexCount]; + } + + static std::mutex &GetMutex(const mbTileDescriptor *tile) { + uint64_t key = mbTileDescriptor::GetMapKey(tile->m_zoomLevel, tile->tile_x, + tile->tile_y); + return TileCache::GetMutex(key); + } + /// @brief Flush the tile cache, including OpenGL texture memory if needed void Flush() { for (auto const &it : tileMap) { @@ -57,10 +70,6 @@ class TileCache { delete tile; } } - // Reset the chained list - listStart = nullptr; - listEnd = nullptr; - listSize = 0; } // Get the north limit of the cache area for a given zoom in WMTS coordinates @@ -75,7 +84,7 @@ class TileCache { /// @brief Get the current size of the cache in number of tiles /// @return Number of tiles in the cache - uint32_t GetCacheSize() { return listSize; } + uint32_t GetCacheSize() const { return tileMap.size(); } /// @brief Retreive a tile from the cache. If the tile is not present in the /// cache, an empty tile is created and added. @@ -88,9 +97,7 @@ class TileCache { auto ref = tileMap.find(index); if (ref != tileMap.end()) { // The tile is in the cache - // Move it to the beginning of the tile list so that the list will have - // the most frequently needed tiles at the beginning - MoveTileToListStart(ref->second); + ref->second->SetTimestamp(); return ref->second; } @@ -98,8 +105,6 @@ class TileCache { // map and list mbTileDescriptor *tile = new mbTileDescriptor(z, x, y); tileMap[index] = tile; - AddTileToList(tile); - return tile; } @@ -109,100 +114,55 @@ class TileCache { /// only be called by rendering thread since it uses OpenGL calls. /// @param maxTiles Maximum number of tiles to be kept in the list void CleanCache(uint32_t maxTiles) { - uint64_t index; - - while (listSize > maxTiles) { - // List size exceeds the maximum value : delete the last tile of the list - index = mbTileDescriptor::GetMapKey(listEnd->m_zoomLevel, listEnd->tile_x, - listEnd->tile_y); - auto ref = tileMap.find(index); - if ((ref->second->m_bAvailable) && (ref->second->m_teximage == 0) && - (ref->second->glTextureName == 0)) { - // If the tile is currently used by worker thread, we must not delete - // it. Practically, this case is not supposed to happen, unless the - // system is really, really slow. In that case we exit the function and - // wait the next rendering to try again. - break; - } - // Remove the tile from map and delete it. Tile destructor takes care to - // properly - tileMap.erase(ref); - DeleteTileFromList(listEnd); - } - } + if (tileMap.size() <= maxTiles) return; -private: - /// @brief Add a new tile to the tile list. - /// @param tile Pointer to the tile - void AddTileToList(mbTileDescriptor *tile) { - if (listStart == nullptr) { - // List is empty : add the first element - tile->prev = nullptr; - tile->next = nullptr; - listStart = tile; - listEnd = tile; - } else { - // Insert tile at the start of the list - tile->prev = nullptr; - tile->next = listStart; - listStart->prev = tile; - listStart = tile; - } - // Update list size - listSize++; - } + /** Create a sorted list of keys, oldest first. */ + std::vector keys; + for (auto &kv : tileMap) keys.push_back(kv.first); + auto compare = [&](const uint64_t lhs, const uint64_t rhs) { + return tileMap[lhs]->last_used < tileMap[rhs]->last_used; + }; + std::sort(keys.begin(), keys.end(), compare); - /// @brief Remove a tile from the tile list and delete it. - /// @param tile Pointer to the tile to be deleted - void DeleteTileFromList(mbTileDescriptor *tile) { - if (tile) { - if (tile->prev == nullptr) { - // Tile is at beginning of the list - listStart = tile->next; - } else { - tile->prev->next = tile->next; - } + for (size_t i = 0; i < tileMap.size() - maxTiles; i += 1) { + std::lock_guard lock(TileCache::GetMutex(tileMap[keys[i]])); + auto tile = tileMap[keys[i]]; - if (tile->next == nullptr) { - // Tile is at the end of the list - listEnd = tile->prev; - } else { - tile->next->prev = tile->prev; - } + // Do not remove tiles that may be pending in the worker thread queue + if (tile->m_bAvailable && !tile->glTextureName && !tile->m_teximage) + continue; - // Delete the tile + tileMap.erase(keys[i]); delete tile; - listSize--; } } - /// @brief Move a tile at the beginning of the list. - /// @param tile Tile to be moved - void MoveTileToListStart(mbTileDescriptor *tile) { - if (tile) { - if (tile->prev == nullptr) { - // Tile is already at beginning of list : exit function - return; - } - - if (tile->next == nullptr) { - // Tile is at the end of list : update list end pointer - listEnd = tile->prev; - } else { - // We have a successor : update its previous pointer - tile->next->prev = tile->prev; + void DeepCleanCache() { + using namespace std::chrono; + auto time_now = + duration_cast(system_clock::now().time_since_epoch()); + + auto age_limit = std::chrono::duration(5); // 5 seconds + + std::vector keys; + for (auto &kv : tileMap) keys.push_back(kv.first); + + for (size_t i = 0; i < keys.size(); i += 1) { + std::lock_guard lock(TileCache::GetMutex(tileMap[keys[i]])); + auto tile = tileMap[keys[i]]; + const std::chrono::duration elapsed_seconds{time_now - + tile->last_used}; + + // Looking for tiles that have been fetched from sql, + // but not yet rendered. Such tiles contain a large bitmap allocation. + // After some time, it is likely they never will be needed in short term. + // So safe to delete, and reload as necessary. + if (((!tile->glTextureName) && tile->m_teximage) && + (elapsed_seconds > age_limit)) { + tileMap.erase(keys[i]); + delete tile; } - - // Tile's predecessor must have its next pointer updated - tile->prev->next = tile->next; - - // Insert tile at beginning of list - listStart->prev = tile; - tile->next = listStart; - tile->prev = nullptr; - listStart = tile; } } }; - -#endif \ No newline at end of file +#endif diff --git a/gui/src/mbtiles/TileDescriptor.hpp b/gui/src/mbtiles/TileDescriptor.hpp index 997ed30e05..a9a949820c 100644 --- a/gui/src/mbtiles/TileDescriptor.hpp +++ b/gui/src/mbtiles/TileDescriptor.hpp @@ -2,6 +2,7 @@ #define _MBTILES_TILEDESCRIPTOR_H_ #include +#include #include #include @@ -15,6 +16,7 @@ class mbTileDescriptor { int m_zoomLevel; float latmin, lonmin, latmax, lonmax; LLBBox box; + std::chrono::milliseconds last_used; // Set to true if a load request from main thread is already pending for this // tile @@ -50,6 +52,7 @@ class mbTileDescriptor { latmax = round(mbTileDescriptor::tiley2lat(tile_y, zoomFactor) / eps) * eps; box.Set(latmin, lonmin, latmax, lonmax); + SetTimestamp(); } virtual ~mbTileDescriptor() { @@ -111,8 +114,15 @@ class mbTileDescriptor { return 180.0 / M_PI * latRad; } + /** Update last_used to current time. */ + void SetTimestamp() { + using namespace std::chrono; + last_used = + duration_cast(system_clock::now().time_since_epoch()); + } + private: const double eps = 6e-6; // about 1cm on earth's surface at equator }; -#endif /* _MBTILES_TILEDESCRIPTOR_H_ */ \ No newline at end of file +#endif /* _MBTILES_TILEDESCRIPTOR_H_ */ diff --git a/gui/src/mbtiles/WorkerThread.cpp b/gui/src/mbtiles/WorkerThread.cpp new file mode 100644 index 0000000000..91efc8851d --- /dev/null +++ b/gui/src/mbtiles/WorkerThread.cpp @@ -0,0 +1,192 @@ + +#include +#include +#include "dychart.h" +#include "WorkerThread.hpp" + +#ifdef __WXMSW__ +void my_translate_mbtile(unsigned int code, _EXCEPTION_POINTERS *ep) { + throw SE_Exception(); +} +#endif + +/// @brief Worker thread of the MbTiles chart decoder. It receives requests from +/// the MbTile front-end to load and uncompress tiles from an MbTiles file. Once +/// done, the tile list in memory is updated and a refresh of the map triggered. + +/// @brief Request a tile to be loaded by the thread. This method is thread +/// safe. +/// @param tile Pointer to the tile to load +void MbtTilesThread::RequestTile(mbTileDescriptor *tile) { + tile->m_requested = true; + m_tileQueue.Push(tile); +} + +/// @brief Request the thread to stop/delete itself +void MbtTilesThread::RequestStop() { + // Set the exit request boolean + m_exitThread = true; + // Force worker thread to wake-up + m_tileQueue.Push(nullptr); + while (!m_finished) { + } +} + +size_t MbtTilesThread::GetQueueSize() { return m_tileQueue.GetSize(); } + +/// @brief Main loop of the worker thread +/// @return Always 0 +wxThread::ExitCode MbtTilesThread::Entry() { +#ifdef __MSVC__ + _set_se_translator(my_translate_mbtile); + + // On Windows, if anything in this thread produces a SEH exception (like + // access violation) we handle the exception locally, and simply alow the + // thread to exit smoothly with no results. Upstream will notice that nothing + // got done, and maybe try again later. + +#endif + + mbTileDescriptor *tile; + + do { + // Wait for the next job + tile = m_tileQueue.Pop(); + // Only process non null tiles. A null pointer can be sent to force the + // thread to check for a deletion request + if (tile != nullptr) { + LoadTile(tile); + } + // Only request a refresh of the display when there is no more tiles in + // the queue. + if (m_tileQueue.GetSize() == 0) { + wxGetApp().GetTopWindow()->GetEventHandler()->CallAfter( + &MyFrame::RefreshAllCanvas, true); + } + // Check if the thread has been requested to be destroyed + } while ((TestDestroy() == false) && (m_exitThread == false)); + + // Since the worker is a detached thread, we need a special mecanism to + // allow the main thread to wait for its deletion + m_finished = true; + + return (wxThread::ExitCode)0; +} + +/// @brief Load bitmap data of a tile from the MbTiles file to the tile cache +/// @param tile Pointer to the tile to be loaded +void MbtTilesThread::LoadTile(mbTileDescriptor *tile) { + std::lock_guard lock(TileCache::GetMutex(tile)); + + // If the tile has not been found in the SQL database in a previous attempt, + // don't search for it again + if (!tile->m_bAvailable) return; + + // If the tile has already been uncompressed, don't uncompress it + // again + if (tile->m_teximage != nullptr) return; + if (tile->glTextureName > 0) return; + + // Fetch the tile data from the mbtile database + try { + char qrs[2100]; + + // Compile a SQL query, getting the specific blob + sprintf(qrs, + "select tile_data, length(tile_data) from tiles where zoom_level " + "= %d AND tile_column=%d AND tile_row=%d", + tile->m_zoomLevel, tile->tile_x, tile->tile_y); + SQLite::Statement query(*m_pDB, qrs); + + int queryResult = query.tryExecuteStep(); + if (SQLITE_DONE == queryResult) { + // The tile has not been found in databse, mark it as "not available" so + // that we won't try to find it again later + tile->m_bAvailable = false; + return; + } else { + // Get the blob + SQLite::Column blobColumn = query.getColumn(0); + const void *blob = blobColumn.getBlob(); + // Get the length + int length = query.getColumn(1); + + // Uncompress the tile + wxMemoryInputStream blobStream(blob, length); + wxImage blobImage; + blobImage = wxImage(blobStream, wxBITMAP_TYPE_ANY); + int blobWidth, blobHeight; + unsigned char *imgdata; + + // Check that the tile is OK and rescale it to 256x256 if necessary + if (blobImage.IsOk()) { + blobWidth = blobImage.GetWidth(); + blobHeight = blobImage.GetHeight(); + // Support MapTiler HiDPI tiles, 512x512 + if ((blobWidth != 256) || (blobHeight != 256)) + blobImage.Rescale(256, 256, wxIMAGE_QUALITY_NORMAL); + imgdata = blobImage.GetData(); + } else { + // wxWidget can't uncompress the tile : mark it as not available and + // exit + tile->m_bAvailable = false; + return; + } + + if (!imgdata) { + // wxWidget can't uncompress the tile : mark it as not available and + // exit + tile->m_bAvailable = false; + return; + } + + int stride = 4; + int tex_w = 256; + int tex_h = 256; + // Copy and process the tile + unsigned char *teximage = (unsigned char *)malloc(stride * tex_w * tex_h); + if (!teximage) return; + + bool transparent = blobImage.HasAlpha(); + // *(int*)0 = 0; // test exception + + for (int j = 0; j < tex_w * tex_h; j++) { + for (int k = 0; k < 3; k++) + teximage[j * stride + k] = imgdata[3 * j + k]; + + // Some NOAA Tilesets do not give transparent tiles, so we detect + // NOAA's idea of blank as RGB(1,0,0) and force alpha = 0; + if (imgdata[3 * j] == 1 && imgdata[3 * j + 1] == 0 && + imgdata[3 * j + 2] == 0) { + teximage[j * stride + 3] = 0; + } else { + if (transparent) { + teximage[j * stride + 3] = blobImage.GetAlpha(j % tex_w, j / tex_w); + } else { + teximage[j * stride + 3] = 255; + } + } + } + + // Image buffer will be freed later by the main thread + tile->m_teximage = teximage; + + return; + } + + } +#ifdef __MSVC__ + catch (SE_Exception e) { + wxLogMessage("MbTiles: SE_Exception"); + tile->m_bAvailable = false; + tile->m_teximage = 0; + } +#else + catch (std::exception &e) { + const char *t = e.what(); + wxLogMessage("mbtiles std::exception: %s", e.what()); + } +#endif + + return; +} diff --git a/gui/src/mbtiles/WorkerThread.hpp b/gui/src/mbtiles/WorkerThread.hpp index 074d6e4842..fffa31ab4d 100644 --- a/gui/src/mbtiles/WorkerThread.hpp +++ b/gui/src/mbtiles/WorkerThread.hpp @@ -16,6 +16,20 @@ #include "TileQueue.hpp" +#ifdef __WXMSW__ +class SE_Exception { +private: + unsigned int nSE; + +public: + SE_Exception() {} + SE_Exception(unsigned int n) : nSE(n) {} + ~SE_Exception() {} + unsigned int getSeNumber() { return nSE; } +}; + +#endif + /// @brief Worker thread of the MbTiles chart decoder. It receives requests from /// the MbTile front-end to load and uncompress tiles from an MbTiles file. Once /// done, the tile list in memory is updated and a refresh of the map triggered. @@ -34,20 +48,11 @@ class MbtTilesThread : public wxThread { /// @brief Request a tile to be loaded by the thread. This method is thread /// safe. /// @param tile Pointer to the tile to load - void RequestTile(mbTileDescriptor *tile) { - tile->m_requested = true; - m_tileQueue.Push(tile); - } + void RequestTile(mbTileDescriptor *tile); /// @brief Request the thread to stop/delete itself - void RequestStop() { - // Set the exit request boolean - m_exitThread = true; - // Force worker thread to wake-up - m_tileQueue.Push(nullptr); - while (!m_finished) { - } - } + void RequestStop(); + size_t GetQueueSize(); private: // Set to true to tell the main loop to stop execution @@ -61,136 +66,11 @@ class MbtTilesThread : public wxThread { /// @brief Main loop of the worker thread /// @return Always 0 - virtual ExitCode Entry() { - mbTileDescriptor *tile; - - do { - // Wait for the next job - tile = m_tileQueue.Pop(); - // Only process non null tiles. A null pointer can be sent to force the - // thread to check for a deletion request - if (tile != nullptr) { - LoadTile(tile); - } - // Only request a refresh of the display when there is no more tiles in - // the queue. - if (m_tileQueue.GetSize() == 0) { - wxGetApp().GetTopWindow()->GetEventHandler()->CallAfter( - &MyFrame::RefreshAllCanvas, true); - } - // Check if the thread has been requested to be destroyed - } while ((TestDestroy() == false) && (m_exitThread == false)); - - // Since the worker is a detached thread, we need a special mecanism to - // allow the main thread to wait for its deletion - m_finished = true; - - return (wxThread::ExitCode)0; - } + virtual ExitCode Entry(); /// @brief Load bitmap data of a tile from the MbTiles file to the tile cache /// @param tile Pointer to the tile to be loaded - void LoadTile(mbTileDescriptor *tile) { - // If the tile has not been found in the SQL database in a previous attempt, - // don't search for it again - if (!tile->m_bAvailable) return; - - // If the tile has already been uncompressed, don't uncompress it - // again - if (tile->m_teximage != nullptr) return; - if (tile->glTextureName > 0) return; - - // Fetch the tile data from the mbtile database - try { - char qrs[2100]; - - // Compile a SQL query, getting the specific blob - sprintf(qrs, - "select tile_data, length(tile_data) from tiles where zoom_level " - "= %d AND tile_column=%d AND tile_row=%d", - tile->m_zoomLevel, tile->tile_x, tile->tile_y); - SQLite::Statement query(*m_pDB, qrs); - - int queryResult = query.tryExecuteStep(); - if (SQLITE_DONE == queryResult) { - // The tile has not been found in databse, mark it as "not available" so - // that we won't try to find it again later - tile->m_bAvailable = false; - return; - } else { - // Get the blob - SQLite::Column blobColumn = query.getColumn(0); - const void *blob = blobColumn.getBlob(); - // Get the length - int length = query.getColumn(1); - - // Uncompress the tile - wxMemoryInputStream blobStream(blob, length); - wxImage blobImage; - blobImage = wxImage(blobStream, wxBITMAP_TYPE_ANY); - int blobWidth, blobHeight; - unsigned char *imgdata; - - // Check that the tile is OK and rescale it to 256x256 if necessary - if (blobImage.IsOk()) { - blobWidth = blobImage.GetWidth(); - blobHeight = blobImage.GetHeight(); - // Support MapTiler HiDPI tiles, 512x512 - if ((blobWidth != 256) || (blobHeight != 256)) - blobImage.Rescale(256, 256, wxIMAGE_QUALITY_NORMAL); - imgdata = blobImage.GetData(); - } else { - // wxWidget can't uncompress the tile : mark it as not available and - // exit - tile->m_bAvailable = false; - return; - } - - if (!imgdata) { - // wxWidget can't uncompress the tile : mark it as not available and - // exit - tile->m_bAvailable = false; - return; - } - - int stride = 4; - int tex_w = 256; - int tex_h = 256; - // Copy and process the tile - unsigned char *teximage = - (unsigned char *)malloc(stride * tex_w * tex_h); - bool transparent = blobImage.HasAlpha(); - - for (int j = 0; j < tex_w * tex_h; j++) { - for (int k = 0; k < 3; k++) - teximage[j * stride + k] = imgdata[3 * j + k]; - - // Some NOAA Tilesets do not give transparent tiles, so we detect - // NOAA's idea of blank as RGB(1,0,0) and force alpha = 0; - if (imgdata[3 * j] == 1 && imgdata[3 * j + 1] == 0 && - imgdata[3 * j + 2] == 0) { - teximage[j * stride + 3] = 0; - } else { - if (transparent) { - teximage[j * stride + 3] = - blobImage.GetAlpha(j % tex_w, j / tex_w); - } else { - teximage[j * stride + 3] = 255; - } - } - } - - // Image buffer will be freed later by the main thread - tile->m_teximage = teximage; - - return; - } - - } catch (std::exception &e) { - const char *t = e.what(); - wxLogMessage("mbtiles exception: %s", e.what()); - } - } + void LoadTile(mbTileDescriptor *tile); }; #endif /* _MBTILESTHREAD_H_ */ diff --git a/gui/src/mbtiles/mbtiles.cpp b/gui/src/mbtiles/mbtiles.cpp index d5728629bc..af45c3dceb 100644 --- a/gui/src/mbtiles/mbtiles.cpp +++ b/gui/src/mbtiles/mbtiles.cpp @@ -154,7 +154,8 @@ class OCPNStopWatch { ChartMBTiles::ChartMBTiles() { // Compute scale & MPP for each zoom level - // Initial constants taken from https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames + // Initial constants taken from + // https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames OSM_zoomScale[0] = 554680041; OSM_zoomMPP[0] = 156543.03; for (int i = 1; i < (int)(sizeof(OSM_zoomScale) / sizeof(double)); i++) { @@ -406,9 +407,9 @@ InitReturn ChartMBTiles::Init(const wxString &name, ChartInitFlag init_flags) { } else if (!strncmp(colName, "name", 11)) { m_Name = wxString(colValue, wxConvUTF8); } else if (!strncmp(colName, "type", 11)) { - m_Type = wxString(colValue, wxConvUTF8).Upper().IsSameAs("OVERLAY") - ? MBTilesType::OVERLAY - : MBTilesType::BASE; + m_TileType = wxString(colValue, wxConvUTF8).Upper().IsSameAs("OVERLAY") + ? MBTilesType::OVERLAY + : MBTilesType::BASE; } else if (!strncmp(colName, "scheme", 11)) { m_Scheme = wxString(colValue, wxConvUTF8).Upper().IsSameAs("XYZ") ? MBTilesScheme::XYZ @@ -564,7 +565,8 @@ InitReturn ChartMBTiles::Init(const wxString &name, ChartInitFlag init_flags) { // Start the worker thread. Be careful that the thread must be started after // PostInit() to ensure that SQL database has been opened. - StartThread(); + bool thread_return = StartThread(); + if (!thread_return) return INIT_FAIL_RETRY; if (pi_ret != INIT_OK) return pi_ret; @@ -586,7 +588,7 @@ InitReturn ChartMBTiles::PostInit(void) { m_pDB = new SQLite::Database(name_UTF8); m_pDB->exec("PRAGMA locking_mode=EXCLUSIVE"); - m_pDB->exec("PRAGMA cache_size=-50000"); + m_pDB->exec("PRAGMA cache_size=-10000"); bReadyToRender = true; return INIT_OK; @@ -646,10 +648,15 @@ bool ChartMBTiles::getTileTexture(mbTileDescriptor *tile) { // Tile is not in MbTiles file : no texture to render return false; } else if (tile->m_teximage == 0) { - if (tile->m_requested == false) { - // The tile has not been loaded and decompressed yet : request it - // to the worker thread - m_workerThread->RequestTile(tile); + // Throttle the worker thread + // Avoids unmanaged spikes in memory usage that arise from + // processing very large tiles at small display scale (issue #4043) + if (m_workerThread->GetQueueSize() < 500) { + if (tile->m_requested == false) { + // The tile has not been loaded and decompressed yet : request it + // to the worker thread + m_workerThread->RequestTile(tile); + } } return false; } else { @@ -844,7 +851,6 @@ bool ChartMBTiles::RenderTile(mbTileDescriptor *tile, int zoomLevel, return true; } - bool ChartMBTiles::RenderRegionViewOnGL(const wxGLContext &glc, const ViewPort &VPoint, const OCPNRegion &RectRegion, @@ -908,6 +914,8 @@ bool ChartMBTiles::RenderRegionViewOnGL(const wxGLContext &glc, int maxrenZoom = m_minZoom; LLBBox box = Region.GetBox(); + LLBBox region_box = Region.GetBox(); + bool render_pass = true; // if the full screen box spans IDL, // we need to render the entire screen in two passes. @@ -918,9 +926,16 @@ bool ChartMBTiles::RenderRegionViewOnGL(const wxGLContext &glc, box = screenBox; } + // For tiles declared as "OVERLAY", render only the zoom level that + // corresponds to the currently viewed zoom level + if (m_TileType == MBTilesType::OVERLAY) zoomFactor = viewZoom; + while (zoomFactor <= viewZoom) { // Get the tile numbers of the box corners of this render region, at this // zoom level + vp = VPoint; + + // First pass, right hand side in twopass rendering int topTile = wxMin(m_tileCache->GetNorthLimit(zoomFactor), mbTileDescriptor::lat2tiley(box.GetMaxLat(), zoomFactor)); @@ -931,13 +946,17 @@ bool ChartMBTiles::RenderRegionViewOnGL(const wxGLContext &glc, int rightTile = mbTileDescriptor::long2tilex(box.GetMaxLon(), zoomFactor); if (btwoPass) { - leftTile = mbTileDescriptor::long2tilex(-180 + eps, zoomFactor); - rightTile = mbTileDescriptor::long2tilex(box.GetMaxLon(), zoomFactor); - vp = VPoint; - if (vp.clon > 0) vp.clon -= 360; - - } else vp = VPoint; + if (vp.clon > 0) { + vp.clon -= 360; + leftTile = mbTileDescriptor::long2tilex(-180 + eps, zoomFactor); + rightTile = + mbTileDescriptor::long2tilex(box.GetMaxLon() - 360., zoomFactor); + } else { + leftTile = mbTileDescriptor::long2tilex(-180 + eps, zoomFactor); + rightTile = mbTileDescriptor::long2tilex(box.GetMaxLon(), zoomFactor); + } + } for (int iy = botTile; iy <= topTile; iy++) { for (int ix = leftTile; ix <= rightTile; ix++) { @@ -981,7 +1000,8 @@ bool ChartMBTiles::RenderRegionViewOnGL(const wxGLContext &glc, glDisable(GL_TEXTURE_2D); - m_zoomScaleFactor = 2 * OSM_zoomMPP[maxrenZoom] * VPoint.view_scale_ppm / zoomMod; + m_zoomScaleFactor = + 2 * OSM_zoomMPP[maxrenZoom] * VPoint.view_scale_ppm / zoomMod; glChartCanvas::DisableClipRegion(); @@ -990,6 +1010,12 @@ bool ChartMBTiles::RenderRegionViewOnGL(const wxGLContext &glc, // resolution of the screen and to handle tricky configuration with multiple // screens or hdpi displays m_tileCache->CleanCache(m_tileCount * 3); + + if (m_last_clean_zoom != viewZoom) { + m_tileCache->DeepCleanCache(); + m_last_clean_zoom = viewZoom; + } + #endif return true; } @@ -1004,9 +1030,8 @@ bool ChartMBTiles::RenderRegionViewOnDC(wxMemoryDC &dc, const ViewPort &VPoint, /// @brief Create and start the wortker thread. This thread is dedicated at /// loading and decompressing chart tiles into memory, in the background. If -/// for any reason the thread would fail to load, a fatal error id generated -/// and a message displayed to the user. -void ChartMBTiles::StartThread() { +/// for any reason the thread would fail to load, the method return false +bool ChartMBTiles::StartThread() { // Create the worker thread m_workerThread = new MbtTilesThread(m_pDB); if (m_workerThread->Run() != wxTHREAD_NO_ERROR) { @@ -1014,8 +1039,10 @@ void ChartMBTiles::StartThread() { m_workerThread = nullptr; // Not beeing able to create the worker thread is really a bad situation, // never supposed to happen. So we trigger a fatal error. - wxLogFatalError("MbTiles: Can't create the worker thread"); + wxLogMessage("MbTiles: Can't create an MBTiles worker thread"); + return false; } + return true; } /// @brief Stop and delete the worker thread. This function is called when diff --git a/gui/src/navutil.cpp b/gui/src/navutil.cpp index b64c28bbab..1beb77b387 100644 --- a/gui/src/navutil.cpp +++ b/gui/src/navutil.cpp @@ -35,7 +35,6 @@ #include #include - #ifndef WX_PRECOMP #include #endif // precompiled headers @@ -113,7 +112,7 @@ extern double g_ChartNotRenderScaleFactor; extern int g_restore_stackindex; extern int g_restore_dbindex; extern RouteList *pRouteList; -extern std::vector g_TrackList; +extern std::vector g_TrackList; extern LayerList *pLayerList; extern MyConfig *pConfig; extern double vLat, vLon; @@ -411,8 +410,7 @@ MyConfig::MyConfig(const wxString &LocalFileName) m_pNavObjectChangesSet = NavObjectChanges::getInstance(); } -MyConfig::~MyConfig() { -} +MyConfig::~MyConfig() {} void MyConfig::CreateRotatingNavObjBackup() { // Avoid nonsense log errors... @@ -420,9 +418,10 @@ void MyConfig::CreateRotatingNavObjBackup() { wxLogNull logNo; #endif // Monthly backup, keep max 3 - if(wxFileExists(m_sNavObjSetFile)) { + if (wxFileExists(m_sNavObjSetFile)) { int month = wxDateTime::Now().GetMonth() + 1; - wxString fn = wxString::Format(_T("%s.m%d"), m_sNavObjSetFile.c_str(), month); + wxString fn = + wxString::Format(_T("%s.m%d"), m_sNavObjSetFile.c_str(), month); if (!wxFileExists(fn)) { wxCopyFile(m_sNavObjSetFile, fn); } @@ -748,8 +747,7 @@ int MyConfig::LoadMyConfigRaw(bool bAsTemplate) { // Some undocumented values Read(_T ( "ConfigVersionString" ), &g_config_version_string); Read(_T("CmdSoundString"), &g_CmdSoundString, wxString(OCPN_SOUND_CMD)); - if (wxIsEmpty(g_CmdSoundString)) - g_CmdSoundString = wxString(OCPN_SOUND_CMD); + if (wxIsEmpty(g_CmdSoundString)) g_CmdSoundString = wxString(OCPN_SOUND_CMD); Read(_T ( "NavMessageShown" ), &n_NavMessageShown); Read(_T ( "AndroidVersionCode" ), &g_AndroidVersionCode); @@ -809,8 +807,7 @@ int MyConfig::LoadMyConfigRaw(bool bAsTemplate) { if (!bAsTemplate) { g_config_display_size_mm.clear(); wxStringTokenizer tokenizer(size_mm, ","); - while ( tokenizer.HasMoreTokens() ) - { + while (tokenizer.HasMoreTokens()) { wxString token = tokenizer.GetNextToken(); int size; try { @@ -988,7 +985,8 @@ int MyConfig::LoadMyConfigRaw(bool bAsTemplate) { Read(_T ( "OwnshipCOGPredictorWidth" ), &g_cog_predictor_width); Read(_T ( "OwnshipHDTPredictorStyle" ), &g_ownship_HDTpredictor_style); Read(_T ( "OwnshipHDTPredictorColor" ), &g_ownship_HDTpredictor_color); - Read(_T ( "OwnshipHDTPredictorEndmarker" ), &g_ownship_HDTpredictor_endmarker); + Read(_T ( "OwnshipHDTPredictorEndmarker" ), + &g_ownship_HDTpredictor_endmarker); Read(_T ( "OwnshipHDTPredictorWidth" ), &g_ownship_HDTpredictor_width); Read(_T ( "OwnshipHDTPredictorMiles" ), &g_ownship_HDTpredictor_miles); @@ -1036,9 +1034,9 @@ int MyConfig::LoadMyConfigRaw(bool bAsTemplate) { Read(_T ( "KeepNavobjBackups" ), &g_navobjbackups); NMEALogWindow::GetInstance().SetSize(Read(_T("NMEALogWindowSizeX"), 600L), - Read(_T("NMEALogWindowSizeY"), 400L)); + Read(_T("NMEALogWindowSizeY"), 400L)); NMEALogWindow::GetInstance().SetPos(Read(_T("NMEALogWindowPosX"), 10L), - Read(_T("NMEALogWindowPosY"), 10L)); + Read(_T("NMEALogWindowPosY"), 10L)); NMEALogWindow::GetInstance().CheckPos(display_width, display_height); // Boolean to cater for legacy Input COM Port filer behaviour, i.e. show msg @@ -1163,8 +1161,7 @@ int MyConfig::LoadMyConfigRaw(bool bAsTemplate) { s.ToDouble(&g_ShowMoored_Kts); g_SOGminCOG_kts = 0.2; - if (Read(_T ( "SOGMinimumForCOGDisplay" ), &s)) - s.ToDouble(&g_SOGminCOG_kts); + if (Read(_T ( "SOGMinimumForCOGDisplay" ), &s)) s.ToDouble(&g_SOGminCOG_kts); Read(_T ("bShowScaledTargets"), &g_bAllowShowScaled); Read(_T ( "AISScaledNumber" ), &g_ShowScaled_Num); @@ -1410,10 +1407,13 @@ int MyConfig::LoadMyConfigRaw(bool bAsTemplate) { long dummy; bool bCont = GetFirstEntry(str, dummy); while (bCont) { - Read(str, &val); // Get a file name and add it to the list just in case it is not repeated - // We have seen duplication of dataset entries in https://github.com/OpenCPN/OpenCPN/issues/3042, this - // effectively gets rid of them. - if (std::find(TideCurrentDataSet.begin(), TideCurrentDataSet.end(), val.ToStdString()) == TideCurrentDataSet.end()) { + Read(str, &val); // Get a file name and add it to the list just in case + // it is not repeated + // We have seen duplication of dataset entries in + // https://github.com/OpenCPN/OpenCPN/issues/3042, this effectively gets + // rid of them. + if (std::find(TideCurrentDataSet.begin(), TideCurrentDataSet.end(), + val.ToStdString()) == TideCurrentDataSet.end()) { TideCurrentDataSet.push_back(val.ToStdString()); } bCont = GetNextEntry(str, dummy); @@ -1652,7 +1652,7 @@ void MyConfig::LoadS57Config() { } /** Load changes from a pending changes file path. */ -static bool ReloadPendingChanges(const wxString& changes_path) { +static bool ReloadPendingChanges(const wxString &changes_path) { wxULongLong size = wxFileName::GetSize(changes_path); // We crashed last time :( @@ -1665,8 +1665,7 @@ static bool ReloadPendingChanges(const wxString& changes_path) { // Remove the file before applying the changes, // just in case the changes file itself causes a fault. // If it does fault, at least the next restart will proceed without fault. - if (::wxFileExists(changes_path)) - ::wxRemoveFile(changes_path); + if (::wxFileExists(changes_path)) ::wxRemoveFile(changes_path); if (size == 0 || res.status != pugi::xml_parse_status::status_ok) { wxLogMessage(changes_path + " seems corrupted, not applying it."); @@ -1676,7 +1675,7 @@ static bool ReloadPendingChanges(const wxString& changes_path) { wxLogMessage(_T("Applying NavObjChanges")); pNavObjectChangesSet->ApplyChanges(); - return true; + return true; } wxString MyConfig::FindNewestUsableBackup() const { @@ -1684,7 +1683,9 @@ wxString MyConfig::FindNewestUsableBackup() const { pugi::xml_document doc; for (int i = 1; i <= g_navobjbackups; i++) { wxString backup = m_sNavObjSetFile + "." + wxString::Format("%d", i); - if (wxFileExists(backup) && wxFileName::GetSize(backup) > 461 && doc.load_file(backup.fn_str()).status == pugi::xml_parse_status::status_ok) { + if (wxFileExists(backup) && wxFileName::GetSize(backup) > 461 && + doc.load_file(backup.fn_str()).status == + pugi::xml_parse_status::status_ok) { newest_backup = backup; break; } @@ -1702,51 +1703,78 @@ void MyConfig::LoadNavObjects() { int wpt_dups = 0; wxString newest_backup; if (::wxFileExists(m_sNavObjSetFile)) { - if (wxFileName::GetSize(m_sNavObjSetFile) < 461) { // Empty navobj.xml file with just the gpx tag is 461 bytes, so anything smaller is obvious sign of a fatal crash while saving it last time, replace it with latest backup if available + if (wxFileName::GetSize(m_sNavObjSetFile) < + 461) { // Empty navobj.xml file with just the gpx tag is 461 bytes, so + // anything smaller is obvious sign of a fatal crash while + // saving it last time, replace it with latest backup if + // available wxLogMessage("Navobjects file exists, but seems truncated!"); newest_backup = FindNewestUsableBackup(); if (wxFileExists(newest_backup)) { - wxLogMessage("We do have a backup " + newest_backup + " that looks healthy and will use it."); + wxLogMessage("We do have a backup " + newest_backup + + " that looks healthy and will use it."); wxCopyFile(newest_backup, m_sNavObjSetFile, true); } } - } else { //File does not exist, try to recover from a backup + } else { // File does not exist, try to recover from a backup newest_backup = FindNewestUsableBackup(); if (wxFileExists(newest_backup)) { - wxLogMessage("We do have a backup " + newest_backup + " that looks healthy and will use it."); - wxCopyFile(newest_backup, m_sNavObjSetFile, true); + wxLogMessage("We do have a backup " + newest_backup + + " that looks healthy and will use it."); + wxCopyFile(newest_backup, m_sNavObjSetFile, true); } else { - wxLogMessage("No navobjects.xml file or usable backup exist, will create a new one."); + wxLogMessage( + "No navobjects.xml file or usable backup exist, will create a new " + "one."); } } bool success = false; - // We did all we could to have an usable navobj.xml file in scenarios where it did not exist or was clearly corrupted, let's try to load it - if(::wxFileExists(m_sNavObjSetFile) && m_pNavObjectInputSet->load_file(m_sNavObjSetFile.fn_str()).status == pugi::xml_parse_status::status_ok) { - CreateRotatingNavObjBackup(); // We only create backups when data is good, there is no point in saving something we can't even load + // We did all we could to have an usable navobj.xml file in scenarios where it + // did not exist or was clearly corrupted, let's try to load it + if (::wxFileExists(m_sNavObjSetFile) && + m_pNavObjectInputSet->load_file(m_sNavObjSetFile.fn_str()).status == + pugi::xml_parse_status::status_ok) { + CreateRotatingNavObjBackup(); // We only create backups when data is good, + // there is no point in saving something we + // can't even load success = m_pNavObjectInputSet->LoadAllGPXObjects(false, wpt_dups); } else { - // It was still not valid after all our efforts and did not load as XML, let's rename it to a corrupted file and try to recover from a backup on last time - wxString corrupted_file = m_sNavObjSetFile + wxDateTime::Now().Format(".corrupted.%Y-%m-%d-%H-%M-%S"); + // It was still not valid after all our efforts and did not load as XML, + // let's rename it to a corrupted file and try to recover from a backup on + // last time + wxString corrupted_file = + m_sNavObjSetFile + + wxDateTime::Now().Format(".corrupted.%Y-%m-%d-%H-%M-%S"); wxRenameFile(m_sNavObjSetFile, corrupted_file, true); - wxLogMessage("Error while loading navobjects from " + m_sNavObjSetFile + ", the corrupted file was renamed to " + corrupted_file); - // If we got here with existing navobj.xml file, but it's corrupted, we can still try to recover from a backup - if (newest_backup.IsEmpty()) { // If we got here with empty newest_backup, navobj.xml probably did exist, but was corrupted XML-wise, so we need to find a new backup + wxLogMessage("Error while loading navobjects from " + m_sNavObjSetFile + + ", the corrupted file was renamed to " + corrupted_file); + // If we got here with existing navobj.xml file, but it's corrupted, we can + // still try to recover from a backup + if (newest_backup + .IsEmpty()) { // If we got here with empty newest_backup, + // navobj.xml probably did exist, but was corrupted + // XML-wise, so we need to find a new backup newest_backup = FindNewestUsableBackup(); } m_pNavObjectInputSet->reset(); - if (wxFileExists(newest_backup) && m_pNavObjectInputSet->load_file(newest_backup.fn_str()).status == pugi::xml_parse_status::status_ok) { + if (wxFileExists(newest_backup) && + m_pNavObjectInputSet->load_file(newest_backup.fn_str()).status == + pugi::xml_parse_status::status_ok) { success = m_pNavObjectInputSet->LoadAllGPXObjects(false, wpt_dups); - wxLogMessage("We do have a healthy backup " + newest_backup + " and did load it."); + wxLogMessage("We do have a healthy backup " + newest_backup + + " and did load it."); } else { - wxLogMessage("No usable backup found, a new navobj.xml file will be created."); + wxLogMessage( + "No usable backup found, a new navobj.xml file will be created."); m_pNavObjectInputSet->reset(); } } if (success) { wxLogMessage(_T("Done loading navobjects, %d duplicate waypoints ignored"), - wpt_dups); + wpt_dups); } else { - wxLogMessage(_T("Failed to load navobjects, creating a new navobj.xml file.")); + wxLogMessage( + _T("Failed to load navobjects, creating a new navobj.xml file.")); } delete m_pNavObjectInputSet; @@ -1825,7 +1853,8 @@ bool MyConfig::LoadLayers(wxString &path) { if (::wxFileExists(file_path)) { NavObjectCollection1 *pSet = new NavObjectCollection1; - if (pSet->load_file(file_path.fn_str()).status != pugi::xml_parse_status::status_ok) { + if (pSet->load_file(file_path.fn_str()).status != + pugi::xml_parse_status::status_ok) { wxLogMessage("Error loading GPX file " + file_path); pSet->reset(); } @@ -1910,45 +1939,40 @@ bool MyConfig::LoadChartDirArray(ArrayOfCDI &ChartDirArray) { return true; } -void MyConfig::AddNewRoute(Route *r) { - m_pNavObjectChangesSet->AddNewRoute(r); -} +void MyConfig::AddNewRoute(Route *r) { m_pNavObjectChangesSet->AddNewRoute(r); } -void MyConfig::UpdateRoute(Route *r) { - m_pNavObjectChangesSet->UpdateRoute(r); -} +void MyConfig::UpdateRoute(Route *r) { m_pNavObjectChangesSet->UpdateRoute(r); } void MyConfig::DeleteConfigRoute(Route *pr) { m_pNavObjectChangesSet->DeleteConfigRoute(pr); } void MyConfig::AddNewTrack(Track *pt) { - m_pNavObjectChangesSet->AddNewTrack(pt); + m_pNavObjectChangesSet->AddNewTrack(pt); } void MyConfig::UpdateTrack(Track *pt) { - m_pNavObjectChangesSet->UpdateTrack(pt); + m_pNavObjectChangesSet->UpdateTrack(pt); } void MyConfig::DeleteConfigTrack(Track *pt) { - m_pNavObjectChangesSet->DeleteConfigTrack(pt); + m_pNavObjectChangesSet->DeleteConfigTrack(pt); } void MyConfig::AddNewWayPoint(RoutePoint *pWP, int crm) { - m_pNavObjectChangesSet->AddNewWayPoint(pWP); + m_pNavObjectChangesSet->AddNewWayPoint(pWP); } void MyConfig::UpdateWayPoint(RoutePoint *pWP) { - m_pNavObjectChangesSet->UpdateWayPoint(pWP); + m_pNavObjectChangesSet->UpdateWayPoint(pWP); } void MyConfig::DeleteWayPoint(RoutePoint *pWP) { - m_pNavObjectChangesSet->DeleteWayPoint(pWP); + m_pNavObjectChangesSet->DeleteWayPoint(pWP); } -void MyConfig::AddNewTrackPoint(TrackPoint *pWP, - const wxString &parent_GUID) { - m_pNavObjectChangesSet->AddNewTrackPoint(pWP, parent_GUID); +void MyConfig::AddNewTrackPoint(TrackPoint *pWP, const wxString &parent_GUID) { + m_pNavObjectChangesSet->AddNewTrackPoint(pWP, parent_GUID); } bool MyConfig::UpdateChartDirs(ArrayOfCDI &dir_array) { @@ -2091,7 +2115,6 @@ void MyConfig::LoadCanvasConfigs(bool bApplyAsTemplate) { Read(_T ( "CanvasConfig" ), (int *)&g_canvasConfig, 0); - // Do not recreate canvasConfigs when applying config dynamically if (config_array.GetCount() == 0) { // This is initial load from startup s.Printf(_T("/Canvas/CanvasConfig%d"), 1); @@ -2346,8 +2369,7 @@ void MyConfig::UpdateSettings() { Write(_T ( "CompatOS" ), g_compatOS); Write(_T ( "CompatOsVersion" ), g_compatOsVersion); Write(_T ( "ConfigVersionString" ), g_config_version_string); - if (wxIsEmpty(g_CmdSoundString)) - g_CmdSoundString = wxString(OCPN_SOUND_CMD); + if (wxIsEmpty(g_CmdSoundString)) g_CmdSoundString = wxString(OCPN_SOUND_CMD); Write(_T( "CmdSoundString" ), g_CmdSoundString); Write(_T ( "NavMessageShown" ), n_NavMessageShown); Write(_T ( "InlandEcdis" ), g_bInlandEcdis); @@ -2410,7 +2432,8 @@ void MyConfig::UpdateSettings() { Write(_T ( "ShowCM93DetailSlider" ), g_bShowDetailSlider); Write(_T ( "SkewToNorthUp" ), g_bskew_comp); - if (!g_bdisable_opengl) { // Only modify the saved value if OpenGL is not force-disabled from the command line + if (!g_bdisable_opengl) { // Only modify the saved value if OpenGL is not + // force-disabled from the command line Write(_T ( "OpenGL" ), g_bopengl); } Write(_T ( "SoftwareGL" ), g_bSoftwareGL); @@ -2452,7 +2475,8 @@ void MyConfig::UpdateSettings() { Write(_T ( "OwnshipCOGPredictorWidth" ), g_cog_predictor_width); Write(_T ( "OwnshipHDTPredictorStyle" ), g_ownship_HDTpredictor_style); Write(_T ( "OwnshipHDTPredictorColor" ), g_ownship_HDTpredictor_color); - Write(_T ( "OwnshipHDTPredictorEndmarker" ), g_ownship_HDTpredictor_endmarker); + Write(_T ( "OwnshipHDTPredictorEndmarker" ), + g_ownship_HDTpredictor_endmarker); Write(_T ( "OwnshipHDTPredictorWidth" ), g_ownship_HDTpredictor_width); Write(_T ( "OwnshipHDTPredictorMiles" ), g_ownship_HDTpredictor_miles); @@ -2516,7 +2540,7 @@ void MyConfig::UpdateSettings() { Write(_T ( "TemperatureFormat" ), g_iTempFormat); } Write(_T ( "GPSIdent" ), g_GPS_Ident); - Write("ActiveRoute" , g_active_route); + Write("ActiveRoute", g_active_route); Write("PersistActiveRoute", g_persist_active_route); Write(_T ( "UseGarminHostUpload" ), g_bGarminHostUpload); @@ -2531,7 +2555,7 @@ void MyConfig::UpdateSettings() { for (const auto &mm : g_config_display_size_mm) { st0.Append(wxString::Format(_T ( "%zu," ), mm)); } - st0.RemoveLast(); //Strip last comma + st0.RemoveLast(); // Strip last comma Write(_T ( "DisplaySizeMM" ), st0); Write(_T ( "DisplaySizeManual" ), g_config_display_size_manual); @@ -2762,7 +2786,8 @@ void MyConfig::UpdateSettings() { Write(_T ( "GPXIODir" ), g_gpx_path); Write(_T ( "TCDataDir" ), g_TCData_Dir); Write(_T ( "BasemapDir" ), g_Platform->NormalizePath(gWorldMapLocation)); - Write(_T ( "BaseShapefileDir" ), g_Platform->NormalizePath(gWorldShapefileLocation)); + Write(_T ( "BaseShapefileDir" ), + g_Platform->NormalizePath(gWorldShapefileLocation)); Write(_T ( "pluginInstallDir" ), g_Platform->NormalizePath(g_winPluginDir)); SetPath(_T ( "/Settings/NMEADataSource" )); @@ -2915,8 +2940,10 @@ void MyConfig::UpdateNavObj(bool bRecreate) { m_pNavObjectChangesSet->Init(m_sNavObjSetChangesFile); m_pNavObjectChangesSet->reset(); - if (m_pNavObjectChangesSet->load_file(m_sNavObjSetChangesFile.fn_str()).status != pugi::xml_parse_status::status_ok) { - wxLogMessage("Error while loading " + m_sNavObjSetChangesFile + ", ignoring contents of the file."); + if (m_pNavObjectChangesSet->load_file(m_sNavObjSetChangesFile.fn_str()) + .status != pugi::xml_parse_status::status_ok) { + wxLogMessage("Error while loading " + m_sNavObjSetChangesFile + + ", ignoring contents of the file."); m_pNavObjectChangesSet->reset(); } } @@ -2931,6 +2958,15 @@ static wxFileName exportFileName(wxWindow *parent, // MS-DOS file systems have many more validName.Replace(_T("/"), _T("-")); validName.Replace(_T(":"), _T("_")); + +#ifdef __ANDROID__ + if (!validName.EndsWith(".gpx")) { + wxFileName fn(validName); + fn.ClearExt(); + fn.SetExt("gpx"); + validName = fn.GetFullName(); + } +#endif int response = g_Platform->DoFileSelectorDialog( parent, &path, _("Export GPX file"), g_gpx_path, validName, wxT("*.gpx")); @@ -2980,7 +3016,7 @@ bool ExportGPXRoutes(wxWindow *parent, RouteList *pRoutes, return false; } -bool ExportGPXTracks(wxWindow *parent, std::vector *pTracks, +bool ExportGPXTracks(wxWindow *parent, std::vector *pTracks, const wxString suggestedName) { wxFileName fn = exportFileName(parent, suggestedName); if (fn.IsOk()) { @@ -3085,7 +3121,7 @@ void ExportGPX(wxWindow *parent, bool bviz_only, bool blayer) { node1 = node1->GetNext(); } - for (Track* pTrack : g_TrackList) { + for (Track *pTrack : g_TrackList) { bool b_add = true; if (bviz_only && !pTrack->IsVisible()) b_add = false; @@ -3214,7 +3250,8 @@ void UI_ImportGPX(wxWindow *parent, bool islayer, wxString dirpath, if (::wxFileExists(path)) { NavObjectCollection1 *pSet = new NavObjectCollection1; - if (pSet->load_file(path.fn_str()).status != pugi::xml_parse_status::status_ok) { + if (pSet->load_file(path.fn_str()).status != + pugi::xml_parse_status::status_ok) { wxLogMessage("Error loading GPX file " + path); pSet->reset(); delete pSet; @@ -3413,7 +3450,6 @@ double fromUsrWindSpeed(double usr_wspeed, int unit) { return ret; } - /**************************************************************************/ /* Converts the temperature from the units selected by user to Celsius */ /**************************************************************************/ @@ -3437,8 +3473,8 @@ double fromUsrTemp(double usr_temp, int unit) { wxString formatAngle(double angle) { wxString out; if (g_bShowMag && g_bShowTrue) { - out.Printf(wxT("%03.0f %cT (%.0f %cM)"), angle, 0x00B0, - toMagnetic(angle), 0x00B0); + out.Printf(wxT("%03.0f %cT (%.0f %cM)"), angle, 0x00B0, toMagnetic(angle), + 0x00B0); } else if (g_bShowTrue) { out.Printf(wxT("%03.0f %cT"), angle, 0x00B0); } else { @@ -3549,8 +3585,10 @@ void DimeControl(wxWindow *ctrl) { return; // this is seriously broken on wxqt #endif - if(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW).Red() < 128) { - // Dark system color themes usually do better job than we do on diming UI controls, do not fight with them + if (wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW).Red() < + 128) { + // Dark system color themes usually do better job than we do on diming UI + // controls, do not fight with them return; } @@ -3614,9 +3652,8 @@ void DimeControl(wxWindow *ctrl, wxColour col, wxColour window_back_color, if (win->IsKindOf(CLASSINFO(wxListBox)) || win->IsKindOf(CLASSINFO(wxListCtrl)) || - win->IsKindOf(CLASSINFO(wxTextCtrl)) - || win->IsKindOf(CLASSINFO(wxTimePickerCtrl)) - ) { + win->IsKindOf(CLASSINFO(wxTextCtrl)) || + win->IsKindOf(CLASSINFO(wxTimePickerCtrl))) { win->SetBackgroundColour(col); } else if (win->IsKindOf(CLASSINFO(wxStaticText)) || win->IsKindOf(CLASSINFO(wxCheckBox)) || @@ -3680,20 +3717,19 @@ void DimeControl(wxWindow *ctrl, wxColour col, wxColour window_back_color, #define LUMIMOSITY_NIGHT (-0.8) #define LUMIMOSITY_DUSK (-0.5) -wxColor GetDimedColor(const wxColor& c) -{ - switch (global_color_scheme) { +wxColor GetDimedColor(const wxColor &c) { + switch (global_color_scheme) { case ColorScheme::GLOBAL_COLOR_SCHEME_NIGHT: - return ( - wxColor(wxMax(0, wxMin(c.Red() + c.Red() * LUMIMOSITY_NIGHT, 255)), - wxMax(0, wxMin(c.Green() + c.Green() * LUMIMOSITY_NIGHT, 255)), - wxMax(0, wxMin(c.Blue() + c.Blue() * LUMIMOSITY_NIGHT, 255)))); + return (wxColor( + wxMax(0, wxMin(c.Red() + c.Red() * LUMIMOSITY_NIGHT, 255)), + wxMax(0, wxMin(c.Green() + c.Green() * LUMIMOSITY_NIGHT, 255)), + wxMax(0, wxMin(c.Blue() + c.Blue() * LUMIMOSITY_NIGHT, 255)))); case ColorScheme::GLOBAL_COLOR_SCHEME_DUSK: - return ( - wxColor(wxMax(0, wxMin(c.Red() + c.Red() * LUMIMOSITY_DUSK, 255)), - wxMax(0, wxMin(c.Green() + c.Green() * LUMIMOSITY_DUSK, 255)), - wxMax(0, wxMin(c.Blue() + c.Blue() * LUMIMOSITY_DUSK, 255)))); + return ( + wxColor(wxMax(0, wxMin(c.Red() + c.Red() * LUMIMOSITY_DUSK, 255)), + wxMax(0, wxMin(c.Green() + c.Green() * LUMIMOSITY_DUSK, 255)), + wxMax(0, wxMin(c.Blue() + c.Blue() * LUMIMOSITY_DUSK, 255)))); default: - return c; - } + return c; + } } diff --git a/gui/src/ocpn_app.cpp b/gui/src/ocpn_app.cpp index de4b5865d8..1b52699645 100644 --- a/gui/src/ocpn_app.cpp +++ b/gui/src/ocpn_app.cpp @@ -24,7 +24,6 @@ **************************************************************************/ #include "config.h" - #ifdef __MINGW32__ #undef IPV6STRICT // mingw FTBS fix: missing struct ip_mreq #include @@ -36,7 +35,7 @@ #include #endif // precompiled headers #ifdef __WXMSW__ -//#include "c:\\Program Files\\visual leak detector\\include\\vld.h" +// #include "c:\\Program Files\\visual leak detector\\include\\vld.h" #endif #include @@ -61,7 +60,8 @@ #include #endif -#if (defined(OCPN_GHC_FILESYSTEM) || (defined(__clang_major__) && (__clang_major__ < 15))) +#if (defined(OCPN_GHC_FILESYSTEM) || \ + (defined(__clang_major__) && (__clang_major__ < 15))) // MacOS 1.13 #include namespace fs = ghc::filesystem; @@ -178,7 +178,7 @@ using namespace std::literals::chrono_literals; void RedirectIOToConsole(); #endif -#if defined(__WXMSW__) && defined (__MSVC__LEAK) +#if defined(__WXMSW__) && defined(__MSVC__LEAK) #include "Stackwalker.h" #endif @@ -193,9 +193,8 @@ void RedirectIOToConsole(); #endif #include "wiz_ui.h" - -const char* const kUsage = -R"""(Usage: +const char *const kUsage = + R"""(Usage: opencpn -h | --help opencpn [-p] [-f] [-G] [-g] [-P] [-l ] [-u ] [-U] [-s] [GPX file ...] opencpn --remote [-R] | -q] | -e] |-o ] @@ -228,7 +227,6 @@ Options manipulating already started opencpn GPX file GPX-formatted file with waypoints or routes. )"""; - // comm event definitions wxDEFINE_EVENT(EVT_N2K_129029, wxCommandEvent); wxDEFINE_EVENT(EVT_N2K_129026, wxCommandEvent); @@ -243,7 +241,6 @@ wxDEFINE_EVENT(EVT_N0183_GGA, wxCommandEvent); wxDEFINE_EVENT(EVT_N0183_GLL, wxCommandEvent); wxDEFINE_EVENT(EVT_N0183_AIVDO, wxCommandEvent); - //------------------------------------------------------------------------------ // Fwd Declarations //------------------------------------------------------------------------------ @@ -261,7 +258,6 @@ bool g_bUpgradeInProcess; bool g_bPauseTest; - // Files specified on the command line, if any. MyFrame *gFrame; @@ -503,7 +499,6 @@ bool g_bFullScreenQuilt = true; bool g_bQuiltEnable; bool g_bQuiltStart; - ChartGroupArray *g_pGroupArray; S57QueryDialog *g_pObjectQueryDialog; @@ -528,7 +523,6 @@ int osMajor, osMinor; bool GetMemoryStatus(int *mem_total, int *mem_used); bool g_bHasHwClock; - int g_nAIS_activity_timer; bool g_bEnableZoomToCursor; @@ -561,7 +555,9 @@ double g_n_gps_antenna_offset_y; double g_n_gps_antenna_offset_x; int g_n_ownship_min_mm; -int g_NeedDBUpdate; // 0 - No update needed, 1 - Update needed because there is no chart database, inform user, 2 - Start update right away +int g_NeedDBUpdate; // 0 - No update needed, 1 - Update needed because there is + // no chart database, inform user, 2 - Start update right + // away bool g_bPreserveScaleOnX; AboutFrameImpl *g_pAboutDlg; @@ -639,7 +635,6 @@ bool g_bUIexpert; int g_chart_zoom_modifier_raster; int g_chart_zoom_modifier_vector; - bool g_bAdvanceRouteWaypointOnArrivalOnly; bool g_bSpaceDropMark; @@ -717,7 +712,6 @@ static bool LoadAllPlugIns(bool load_enabled) { #include "bitmaps/opencpn.xpm" #endif - wxString newPrivateFileName(wxString, const char *name, [[maybe_unused]] const char *windowsName) { wxString fname = wxString::FromUTF8(name); @@ -737,7 +731,6 @@ wxString newPrivateFileName(wxString, const char *name, return filePathAndName; } - // `Main program` equivalent, creating windows and returning main app frame //------------------------------------------------------------------------------ // MyApp @@ -758,7 +751,7 @@ static void ActivateRoute(const std::string &guid) { // If this is an auto-created MOB route, always select the second point // (the MOB) // as the destination. - RoutePoint* point; + RoutePoint *point; if (wxNOT_FOUND == route->m_RouteNameString.Find("MOB")) { point = g_pRouteMan->FindBestActivatePoint(route, gLat, gLon, gCog, gSog); } else { @@ -779,22 +772,23 @@ static void ReverseRoute(const std::string &guid) { if (g_pRouteMan) g_pRouteMan->on_routes_update.Notify(); } - void MyApp::InitRestListeners() { auto activate_route = [&](wxCommandEvent ev) { auto guid = ev.GetString().ToStdString(); - ActivateRoute(guid); }; + ActivateRoute(guid); + }; rest_activate_listener.Init(m_rest_server.activate_route, activate_route); auto reverse_route = [&](wxCommandEvent ev) { auto guid = ev.GetString().ToStdString(); - ReverseRoute(guid); }; + ReverseRoute(guid); + }; rest_reverse_listener.Init(m_rest_server.reverse_route, reverse_route); } - bool MyApp::OpenFile(const std::string& path) { +bool MyApp::OpenFile(const std::string &path) { NavObjectCollection1 nav_objects; auto result = nav_objects.load_file(path.c_str()); - if (!result) { + if (!result) { std::string s(_("Cannot load route or waypoint file: ")); s += std::string("\"") + path + "\""; wxMessageBox(s, "OpenCPN", wxICON_WARNING | wxOK); @@ -820,7 +814,7 @@ void MyApp::OnInitCmdLine(wxCmdLineParser &parser) { // is hardcoded in kUsage; parser.AddSwitch("h", "help", "", wxCMD_LINE_OPTION_HELP); parser.AddSwitch("p", "portable"); - parser.AddOption("c", "configdir", "", wxCMD_LINE_VAL_STRING, + parser.AddOption("c", "configdir", "", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL); parser.AddSwitch("f", "fullscreen"); parser.AddSwitch("G", "no_opengl"); @@ -841,7 +835,7 @@ void MyApp::OnInitCmdLine(wxCmdLineParser &parser) { parser.AddOption("o", "open", "", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE); } -#endif // __ANDROID__ +#endif // __ANDROID__ /** Parse --loglevel and set up logging, falling back to defaults. */ #ifdef __ANDROID__ @@ -863,10 +857,10 @@ static void ParseLoglevel(wxCmdLineParser &parser) { } wxLog::SetLogLevel(level); } -#endif // __ANDROID__ +#endif // __ANDROID__ #ifndef __ANDROID__ -bool MyApp::OnCmdLineHelp(wxCmdLineParser& parser) { +bool MyApp::OnCmdLineHelp(wxCmdLineParser &parser) { std::cout << kUsage; return false; } @@ -904,9 +898,17 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser &parser) { bool has_start_options = false; static const std::vector kStartOptions = { - "unit_test_2", "p", "fullscreen", "no_opengl", "rebuild_gl_raster_cache", - "rebuild_chart_db", "parse_all_enc", "unit_test_1", "safe_mode", "loglevel" }; - for (const auto& opt : kStartOptions) { + "unit_test_2", + "p", + "fullscreen", + "no_opengl", + "rebuild_gl_raster_cache", + "rebuild_chart_db", + "parse_all_enc", + "unit_test_1", + "safe_mode", + "loglevel"}; + for (const auto &opt : kStartOptions) { if (parser.Found(opt)) has_start_options = true; } if (has_start_options && parser.Found("remote")) { @@ -916,11 +918,11 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser &parser) { bool has_remote_options = false; static const std::vector kRemoteOptions = { - "raise", "quit", "open", "get_rest_endpoint"}; - for (const auto& opt : kRemoteOptions) { + "raise", "quit", "open", "get_rest_endpoint"}; + for (const auto &opt : kRemoteOptions) { if (parser.Found(opt)) has_remote_options = true; } - if (has_remote_options && ! parser.Found("remote")) { + if (has_remote_options && !parser.Found("remote")) { std::cerr << "This option requires --remote\n"; return false; } @@ -938,11 +940,10 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser &parser) { else if (parser.Found("get_rest_endpoint")) m_parsed_cmdline = ParsedCmdline(CmdlineAction::GetRestEndpoint); else if (parser.Found("open", &optarg)) - m_parsed_cmdline = ParsedCmdline(CmdlineAction::Open, - optarg.ToStdString()); + m_parsed_cmdline = ParsedCmdline(CmdlineAction::Open, optarg.ToStdString()); else if (parser.GetParamCount() == 1) - m_parsed_cmdline = ParsedCmdline(CmdlineAction::Open, - parser.GetParam(0).ToStdString()); + m_parsed_cmdline = + ParsedCmdline(CmdlineAction::Open, parser.GetParam(0).ToStdString()); else if (!has_start_options && !has_remote_options) { // Neither arguments nor options m_parsed_cmdline = ParsedCmdline(CmdlineAction::Raise); @@ -961,10 +962,7 @@ bool MyApp::OnExceptionInMainLoop() { } #endif -void MyApp::OnActivateApp(wxActivateEvent &event) { - return; -} - +void MyApp::OnActivateApp(wxActivateEvent &event) { return; } static wxStopWatch init_sw; @@ -975,20 +973,20 @@ int MyApp::OnRun() { MyApp::MyApp() : m_checker(InstanceCheck::GetInstance()), - m_rest_server(PINCreateDialog::GetDlgCtx(), - RouteCtxFactory(), - g_bportable), + m_rest_server(PINCreateDialog::GetDlgCtx(), RouteCtxFactory(), + g_bportable), m_usb_watcher(UsbWatchDaemon::GetInstance()), - m_exitcode(-2) -{ + m_exitcode(-2) { #ifdef __linux__ // Handle e. g., wayland default display -- see #1166. - if (wxGetEnv( "WAYLAND_DISPLAY", NULL)) { + if (wxGetEnv("WAYLAND_DISPLAY", NULL)) { setenv("GDK_BACKEND", "x11", 1); } - setenv("mesa_glthread", "false", 1); // Explicitly disable glthread. This may have some impact on OpenGL performance, - // but we know it is problematic for us. See #2889 -#endif // __linux__ + setenv( + "mesa_glthread", "false", + 1); // Explicitly disable glthread. This may have some impact on OpenGL + // performance, but we know it is problematic for us. See #2889 +#endif // __linux__ } bool MyApp::OnInit() { @@ -1023,7 +1021,7 @@ bool MyApp::OnInit() { // Server is created on first call to GetInstance() if (m_parsed_cmdline.action == CmdlineAction::Skip) { // Server starts running when referenced. - [[maybe_unused]] auto& server = LocalServerApi::GetInstance(); + [[maybe_unused]] auto &server = LocalServerApi::GetInstance(); } else { std::cerr << "No remote opencpn found. Giving up.\n"; m_exitcode = 1; @@ -1033,7 +1031,7 @@ bool MyApp::OnInit() { std::unique_ptr client; try { client = LocalClientApi::GetClient(); - } catch (LocalApiException& ie) { + } catch (LocalApiException &ie) { WARNING_LOG << "Ipc client exception: " << ie.str(); // If we get here it means that the instance_chk found another // running instance. But that instance is for some reason not @@ -1048,8 +1046,8 @@ bool MyApp::OnInit() { return true; // main program quiet exit. } if (client) { - auto result = - client->HandleCmdline(m_parsed_cmdline.action, m_parsed_cmdline.arg); + auto result = client->HandleCmdline(m_parsed_cmdline.action, + m_parsed_cmdline.arg); if (result.first) { m_exitcode = 0; } else { @@ -1197,7 +1195,8 @@ bool MyApp::OnInit() { // Init the Route Manager - g_pRouteMan = new Routeman(RoutePropDlg::GetDlgCtx(), RoutemanGui::GetDlgCtx(), + g_pRouteMan = + new Routeman(RoutePropDlg::GetDlgCtx(), RoutemanGui::GetDlgCtx(), NMEALogWindow::GetInstance()); // Init the Selectable Route Items List @@ -1219,8 +1218,7 @@ bool MyApp::OnInit() { // Who am I? g_hostname = ::wxGetHostName(); - if(g_hostname.IsEmpty()) - g_hostname = wxGetUserName(); + if (g_hostname.IsEmpty()) g_hostname = wxGetUserName(); #ifdef __ANDROID__ androidGetDeviceInfo(); g_hostname = wxString("Android-") + g_android_Device_Model; @@ -1233,7 +1231,6 @@ bool MyApp::OnInit() { g_hostname = p + g_hostname; } - // Initialize some lists // Layers pLayerList = new LayerList; @@ -1281,14 +1278,6 @@ bool MyApp::OnInit() { // created from scratch if (b_initial_load) g_Platform->SetDefaultOptions(); - if (g_config_wizard || b_initial_load) { - FirstUseWizImpl wiz(gFrame, pConfig); - auto res = wiz.Run(); - if(res) { - g_NeedDBUpdate = 2; - } - } - g_Platform->applyExpertMode(g_bUIexpert); // Now initialize UI Style. @@ -1327,7 +1316,9 @@ bool MyApp::OnInit() { wxLogMessage(msg); // User override.... - if (g_config_display_size_manual && g_config_display_size_mm.size() > g_current_monitor && g_config_display_size_mm[g_current_monitor] > 0) { + if (g_config_display_size_manual && + g_config_display_size_mm.size() > g_current_monitor && + g_config_display_size_mm[g_current_monitor] > 0) { g_display_size_mm = g_config_display_size_mm[g_current_monitor]; wxString msg; msg.Printf(_T("Display size (horizontal) config override: %d mm"), @@ -1367,7 +1358,8 @@ bool MyApp::OnInit() { if (g_locale.IsEmpty()) { g_locale = def_lang_canonical; - cflmsg = _T("Config file language empty, using system default: ") + g_locale; + cflmsg = + _T("Config file language empty, using system default: ") + g_locale; wxLogMessage(cflmsg); } @@ -1391,6 +1383,17 @@ bool MyApp::OnInit() { wxLogMessage(_T("wxLocale support not available")); #endif +#ifndef __ANDROID__ + // Now that locale is established, possibly run the startup wizard. + if (g_config_wizard || b_initial_load) { + FirstUseWizImpl wiz(gFrame, pConfig); + auto res = wiz.Run(); + if (res) { + g_NeedDBUpdate = 2; + } + } +#endif + // Instantiate and initialize the Config Manager ConfigMgr::Get(); @@ -1416,14 +1419,14 @@ bool MyApp::OnInit() { if (g_bSoftwareGL) setenv("LIBGL_ALWAYS_SOFTWARE", "1", 1); #endif - //FIXMW (dave) move to frame - //g_bTransparentToolbarInOpenGLOK = isTransparentToolbarInOpenGLOK(); + // FIXMW (dave) move to frame + // g_bTransparentToolbarInOpenGLOK = isTransparentToolbarInOpenGLOK(); - // On Windows platforms, establish a default cache managment policy - // as allowing OpenCPN a percentage of available physical memory, - // not to exceed 1 GB - // Note that this logic implies that Windows platforms always use - // the memCacheLimit policy, and never use the fallback nCacheLimit policy + // On Windows platforms, establish a default cache managment policy + // as allowing OpenCPN a percentage of available physical memory, + // not to exceed 1 GB + // Note that this logic implies that Windows platforms always use + // the memCacheLimit policy, and never use the fallback nCacheLimit policy #ifdef __WXMSW__ if (0 == g_memCacheLimit) g_memCacheLimit = (int)(g_mem_total * 0.5); g_memCacheLimit = @@ -1478,8 +1481,10 @@ bool MyApp::OnInit() { wxFileName::GetPathSeparator() + _T("HARMONICS_NO_US.IDX")); if (TideCurrentDataSet.empty()) { - TideCurrentDataSet.push_back(g_Platform->NormalizePath(default_tcdata0).ToStdString()); - TideCurrentDataSet.push_back(g_Platform->NormalizePath(default_tcdata1).ToStdString()); + TideCurrentDataSet.push_back( + g_Platform->NormalizePath(default_tcdata0).ToStdString()); + TideCurrentDataSet.push_back( + g_Platform->NormalizePath(default_tcdata1).ToStdString()); } // Check the global AIS alarm sound file @@ -1510,7 +1515,6 @@ bool MyApp::OnInit() { else wxLogWarning("Cannot initiate plugin default jigsaw icon."); - if ((g_nframewin_x > 100) && (g_nframewin_y > 100) && (g_nframewin_x <= cw) && (g_nframewin_y <= ch)) new_frame_size.Set(g_nframewin_x, g_nframewin_y); @@ -1562,8 +1566,7 @@ bool MyApp::OnInit() { const wxPoint ptScreen(position.x, position.y); const int displayIndex = wxDisplay::GetFromPoint(ptScreen); - if (displayIndex == wxNOT_FOUND) - position = wxPoint(10, 30); + if (displayIndex == wxNOT_FOUND) position = wxPoint(10, 30); #endif g_nframewin_posx = position.x; @@ -1589,7 +1592,8 @@ bool MyApp::OnInit() { // Strip the commit SHA number from the string to be shown in frame title. wxString short_version_name = wxString(PACKAGE_VERSION).BeforeFirst('+'); - wxString myframe_window_title = wxString(wxT("OpenCPN ") + short_version_name); + wxString myframe_window_title = + wxString(wxT("OpenCPN ") + short_version_name); if (g_bportable) { myframe_window_title += _(" -- [Portable(-p) executing from "); @@ -1640,7 +1644,7 @@ bool MyApp::OnInit() { // Show the frame gFrame->Show(TRUE); - Yield(); // required for Gnome 45 + Yield(); // required for Gnome 45 gFrame->SetAndApplyColorScheme(global_color_scheme); @@ -1708,7 +1712,8 @@ bool MyApp::OnInit() { // Try to load the current chart list Data file ChartData = new ChartDB(); - if (g_NeedDBUpdate == 0 && !ChartData->LoadBinary(ChartListFileName, ChartDirArray)) { + if (g_NeedDBUpdate == 0 && + !ChartData->LoadBinary(ChartListFileName, ChartDirArray)) { g_NeedDBUpdate = 1; } @@ -1745,9 +1750,9 @@ bool MyApp::OnInit() { } #endif - //FIXME (dave) - // move method to frame - //if (g_parse_all_enc) ParseAllENC(gFrame); + // FIXME (dave) + // move method to frame + // if (g_parse_all_enc) ParseAllENC(gFrame); // establish GPS timeout value as multiple of frame timer // This will override any nonsense or unset value from the config file @@ -1809,13 +1814,13 @@ bool MyApp::OnInit() { // glDeleteTextures. Truly awful. #ifdef ocpnUSE_GL if (g_bopengl) - RoutePoint::delete_gl_textures = - [](unsigned n, const unsigned* texts) { glDeleteTextures(n, texts); }; + RoutePoint::delete_gl_textures = [](unsigned n, const unsigned *texts) { + glDeleteTextures(n, texts); + }; #else - RoutePoint::delete_gl_textures = [](unsigned n, const unsigned* texts) { }; + RoutePoint::delete_gl_textures = [](unsigned n, const unsigned *texts) {}; #endif - if (g_start_fullscreen) gFrame->ToggleFullScreen(); #ifdef __ANDROID__ @@ -1882,6 +1887,7 @@ bool MyApp::OnInit() { if (!n_NavMessageShown || (vs != g_config_version_string)) { if (wxID_CANCEL == ShowNavWarning()) return false; n_NavMessageShown = 1; + pConfig->Flush(); } #endif @@ -1921,7 +1927,7 @@ bool MyApp::OnInit() { std::vector ipv4_addrs = get_local_ipv4_addresses(); - //If network connection is available, start the server and mDNS client + // If network connection is available, start the server and mDNS client if (ipv4_addrs.size()) { std::string ipAddr = ipv4_addrs[0]; @@ -1932,14 +1938,13 @@ bool MyApp::OnInit() { make_certificate(ipAddr, data_dir.ToStdString()); m_rest_server.StartServer(fs::path(data_dir.ToStdString())); - StartMDNSService(g_hostname.ToStdString(), - "opencpn-object-control-service", 8000); + StartMDNSService(g_hostname.ToStdString(), "opencpn-object-control-service", + 8000); } return TRUE; } int MyApp::OnExit() { - wxLogMessage(_T("opencpn::MyApp starting exit.")); m_checker.OnExit(); m_usb_watcher.Stop(); @@ -1985,6 +1990,11 @@ int MyApp::OnExit() { if (ptcmgr) delete ptcmgr; + for (Track *track : g_TrackList) { + delete track; + } + g_TrackList.clear(); + delete pConfig; delete pSelect; delete pSelectTC; @@ -2010,7 +2020,7 @@ int MyApp::OnExit() { delete pInit_Chart_Dir; - for (Track* track : g_TrackList) { + for (Track *track : g_TrackList) { delete track; } g_TrackList.clear(); @@ -2039,9 +2049,8 @@ int MyApp::OnExit() { // Restore any changed system colors - #ifdef __WXMSW__ -void RestoreSystemColors(void); + void RestoreSystemColors(void); RestoreSystemColors(); #endif diff --git a/gui/src/ocpn_fontdlg.cpp b/gui/src/ocpn_fontdlg.cpp new file mode 100644 index 0000000000..87aeadca77 --- /dev/null +++ b/gui/src/ocpn_fontdlg.cpp @@ -0,0 +1,604 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: ocpn_fontdlg +// Purpose: Generic font dialog for OpenCPN +// Author: Julian Smart +// Modified by: David S Register +// Created: 04/01/98 +// Copyright: (c) Julian Smart, David S Register +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if 1 // wxUSE_FONTDLG && (defined(__WXGTK__) || defined(__WXGPE__) || + // defined(__WXUNIVERSAL__)) + +#ifndef WX_PRECOMP +#include +#include "wx/crt.h" +#include "wx/utils.h" +#include "wx/dialog.h" +#include "wx/listbox.h" +#include "wx/button.h" +#include "wx/stattext.h" +#include "wx/layout.h" +#include "wx/dcclient.h" +#include "wx/choice.h" +#include "wx/checkbox.h" +#include "wx/intl.h" +#include "wx/settings.h" +#include "wx/sizer.h" +#endif + +#include +#include + +#include "wx/fontdlg.h" +#include "ocpn_fontdlg.h" + +#if USE_SPINCTRL_FOR_POINT_SIZE +#include "wx/spinctrl.h" +#endif + +//----------------------------------------------------------------------------- +// helper class - wxFontPreviewer +//----------------------------------------------------------------------------- + +class WXDLLEXPORT OCPNFontPreviewer : public wxWindow { +public: + OCPNFontPreviewer(wxWindow* parent, const wxSize& sz = wxDefaultSize) + : wxWindow(parent, wxID_ANY, wxDefaultPosition, sz) {} + +private: + void OnPaint(wxPaintEvent& event); + wxDECLARE_EVENT_TABLE(); +}; + +wxBEGIN_EVENT_TABLE(OCPNFontPreviewer, wxWindow) + EVT_PAINT(OCPNFontPreviewer::OnPaint) wxEND_EVENT_TABLE() + + void OCPNFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event)) { + wxPaintDC dc(this); + + wxSize size = GetSize(); + wxFont font = GetFont(); + + dc.SetPen(*wxBLACK_PEN); + dc.SetBrush(*wxWHITE_BRUSH); + dc.DrawRectangle(0, 0, size.x, size.y); + + if (font.IsOk()) { + dc.SetFont(font); + dc.SetTextForeground(GetForegroundColour()); + dc.SetClippingRegion(2, 2, size.x - 4, size.y - 4); + dc.DrawText(_("ABCDEFGabcdefg12345"), 10, + (size.y - dc.GetTextExtent(wxT("X")).y) / 2); + dc.DestroyClippingRegion(); + } +} + +//----------------------------------------------------------------------------- +// helper functions +//----------------------------------------------------------------------------- + +static const wxChar* ocpnFontWeightIntToString(int weight) { + switch (weight) { + case wxFONTWEIGHT_LIGHT: + return wxT("Light"); + case wxFONTWEIGHT_BOLD: + return wxT("Bold"); + case wxFONTWEIGHT_NORMAL: + default: + return wxT("Normal"); + } +} + +static const wxChar* ocpnFontStyleIntToString(int style) { + switch (style) { + case wxFONTSTYLE_ITALIC: + return wxT("Italic"); + case wxFONTSTYLE_SLANT: + return wxT("Slant"); + case wxFONTSTYLE_NORMAL: + default: + return wxT("Normal"); + } +} + +static const wxChar* ocpnFontFamilyIntToString(int family) { + switch (family) { + case wxFONTFAMILY_ROMAN: + return wxT("Roman"); + case wxFONTFAMILY_DECORATIVE: + return wxT("Decorative"); + case wxFONTFAMILY_MODERN: + return wxT("Modern"); + case wxFONTFAMILY_SCRIPT: + return wxT("Script"); + case wxFONTFAMILY_TELETYPE: + return wxT("Teletype"); + case wxFONTFAMILY_SWISS: + default: + return wxT("Swiss"); + } +} + +static wxFontFamily ocpnFontFamilyStringToInt(const wxString& family) { + if (family.empty()) return wxFONTFAMILY_SWISS; + + if (wxStrcmp(family, wxT("Roman")) == 0) + return wxFONTFAMILY_ROMAN; + else if (wxStrcmp(family, wxT("Decorative")) == 0) + return wxFONTFAMILY_DECORATIVE; + else if (wxStrcmp(family, wxT("Modern")) == 0) + return wxFONTFAMILY_MODERN; + else if (wxStrcmp(family, wxT("Script")) == 0) + return wxFONTFAMILY_SCRIPT; + else if (wxStrcmp(family, wxT("Teletype")) == 0) + return wxFONTFAMILY_TELETYPE; + else + return wxFONTFAMILY_SWISS; +} + +static wxFontStyle ocpnFontStyleStringToInt(const wxString& style) { + if (style.empty()) return wxFONTSTYLE_NORMAL; + if (wxStrcmp(style, wxT("Italic")) == 0) + return wxFONTSTYLE_ITALIC; + else if (wxStrcmp(style, wxT("Slant")) == 0) + return wxFONTSTYLE_SLANT; + else + return wxFONTSTYLE_NORMAL; +} + +static wxFontWeight ocpnFontWeightStringToInt(const wxString& weight) { + if (weight.empty()) return wxFONTWEIGHT_NORMAL; + if (wxStrcmp(weight, wxT("Bold")) == 0) + return wxFONTWEIGHT_BOLD; + else if (wxStrcmp(weight, wxT("Light")) == 0) + return wxFONTWEIGHT_LIGHT; + else + return wxFONTWEIGHT_NORMAL; +} + +//----------------------------------------------------------------------------- +// ocpnGenericFontDialog +//----------------------------------------------------------------------------- + +wxIMPLEMENT_DYNAMIC_CLASS(ocpnGenericFontDialog, wxDialog); + +wxBEGIN_EVENT_TABLE(ocpnGenericFontDialog, wxDialog) + EVT_CHECKBOX(wxID_FONT_UNDERLINE, ocpnGenericFontDialog::OnChangeFont) + EVT_CHOICE(wxID_FONT_STYLE, ocpnGenericFontDialog::OnChangeFont) + EVT_CHOICE(wxID_FONT_WEIGHT, ocpnGenericFontDialog::OnChangeFont) + EVT_CHOICE(wxID_FONT_FAMILY, + ocpnGenericFontDialog::OnChangeFont) + EVT_CHOICE(wxID_FONT_COLOUR, + ocpnGenericFontDialog::OnChangeFont) +#if USE_SPINCTRL_FOR_POINT_SIZE + EVT_SPINCTRL(wxID_FONT_SIZE, + ocpnGenericFontDialog::OnChangeSize) + EVT_TEXT(wxID_FONT_SIZE, + ocpnGenericFontDialog::OnChangeFont) +#else + EVT_CHOICE(wxID_FONT_SIZE, + ocpnGenericFontDialog::OnChangeFont) +#endif + EVT_CLOSE(ocpnGenericFontDialog::OnCloseWindow) + wxEND_EVENT_TABLE() + +#define NUM_COLS 48 + static wxString + ocpnColourDialogNames[NUM_COLS] = {wxT("ORANGE"), + wxT("GOLDENROD"), + wxT("WHEAT"), + wxT("SPRING GREEN"), + wxT("SKY BLUE"), + wxT("SLATE BLUE"), + wxT("MEDIUM VIOLET RED"), + wxT("PURPLE"), + + wxT("RED"), + wxT("YELLOW"), + wxT("MEDIUM SPRING GREEN"), + wxT("PALE GREEN"), + wxT("CYAN"), + wxT("LIGHT STEEL BLUE"), + wxT("ORCHID"), + wxT("LIGHT MAGENTA"), + + wxT("BROWN"), + wxT("YELLOW"), + wxT("GREEN"), + wxT("CADET BLUE"), + wxT("MEDIUM BLUE"), + wxT("MAGENTA"), + wxT("MAROON"), + wxT("ORANGE RED"), + + wxT("FIREBRICK"), + wxT("CORAL"), + wxT("FOREST GREEN"), + wxT("AQUAMARINE"), + wxT("BLUE"), + wxT("NAVY"), + wxT("THISTLE"), + wxT("MEDIUM VIOLET RED"), + + wxT("INDIAN RED"), + wxT("GOLD"), + wxT("MEDIUM SEA GREEN"), + wxT("MEDIUM BLUE"), + wxT("MIDNIGHT BLUE"), + wxT("GREY"), + wxT("PURPLE"), + wxT("KHAKI"), + + wxT("BLACK"), + wxT("MEDIUM FOREST GREEN"), + wxT("KHAKI"), + wxT("DARK GREY"), + wxT("SEA GREEN"), + wxT("LIGHT GREY"), + wxT("MEDIUM SLATE BLUE"), + wxT("WHITE")}; + +/* + * Generic wxFontDialog + */ + +void ocpnGenericFontDialog::Init() { + m_useEvents = false; + m_previewer = NULL; + Create(m_parent); +} + +ocpnGenericFontDialog::~ocpnGenericFontDialog() {} + +void ocpnGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { + EndModal(wxID_CANCEL); +} + +bool ocpnGenericFontDialog::DoCreate(wxWindow* parent) { + parent = GetParentForModalDialog(parent, 0); + + if (!wxDialog::Create(parent, wxID_ANY, wxT("Choose Font"), wxDefaultPosition, + wxDefaultSize, wxDEFAULT_DIALOG_STYLE, + wxT("fontdialog"))) { + wxFAIL_MSG(wxT("wxFontDialog creation failed")); + return false; + } + + InitializeFont(); + CreateWidgets(); + + // sets initial font in preview area + DoChangeFont(); + + return true; +} + +int ocpnGenericFontDialog::ShowModal() { + int ret = wxDialog::ShowModal(); + + if (ret != wxID_CANCEL) { + m_fontData.m_chosenFont = m_dialogFont; + } + + return ret; +} + +// This should be application-settable +static bool ShowToolTips() { return false; } + +void ocpnGenericFontDialog::CreateWidgets() { + wxString *families = new wxString[6], *styles = new wxString[3], + *weights = new wxString[3]; + families[0] = _("Roman"); + families[1] = _("Decorative"); + families[2] = _("Modern"); + families[3] = _("Script"); + families[4] = _("Swiss"); + families[5] = _("Teletype"); + styles[0] = _("Normal"); + styles[1] = _("Italic"); + styles[2] = _("Slant"); + weights[0] = _("Normal"); + weights[1] = _("Light"); + weights[2] = _("Bold"); + + // #if !USE_SPINCTRL_FOR_POINT_SIZE + wxString* pointSizes = new wxString[40]; + int i; + for (i = 0; i < 40; i++) { + wxChar buf[5]; + wxSprintf(buf, wxT("%d"), i + 1); + pointSizes[i] = buf; + } + // #endif + + // layout + + bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); + int noCols, noRows; + if (is_pda) { + noCols = 2; + noRows = 3; + } else { + noCols = 3; + noRows = 2; + } + + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); + this->SetSizer(itemBoxSizer2); + + wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW | wxALL, 5); + + wxFlexGridSizer* itemGridSizer4 = new wxFlexGridSizer(noRows, noCols, 0, 0); + itemBoxSizer3->Add(itemGridSizer4, 0, wxGROW, 5); + + wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); + itemGridSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_HORIZONTAL | wxGROW, 5); + wxStaticText* itemStaticText6 = + new wxStaticText(this, wxID_STATIC, _("&Font family:"), wxDefaultPosition, + wxDefaultSize, 0); + itemBoxSizer5->Add(itemStaticText6, 0, + wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5); + + m_familyChoice = new wxChoice(this, wxID_FONT_FAMILY, wxDefaultPosition, + wxDefaultSize, 5, families, 0); + m_familyChoice->SetHelpText(_("The font family.")); + if (ShowToolTips()) m_familyChoice->SetToolTip(_("The font family.")); + itemBoxSizer5->Add(m_familyChoice, 0, wxALIGN_LEFT | wxALL, 5); + + wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL); + itemGridSizer4->Add(itemBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL | wxGROW, 5); + wxStaticText* itemStaticText9 = new wxStaticText( + this, wxID_STATIC, _("&Style:"), wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer8->Add(itemStaticText9, 0, + wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5); + + m_styleChoice = new wxChoice(this, wxID_FONT_STYLE, wxDefaultPosition, + wxDefaultSize, 3, styles, 0); + m_styleChoice->SetHelpText(_("The font style.")); + if (ShowToolTips()) m_styleChoice->SetToolTip(_("The font style.")); + itemBoxSizer8->Add(m_styleChoice, 0, wxALIGN_LEFT | wxALL, 5); + + wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL); + itemGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL | wxGROW, 5); + wxStaticText* itemStaticText12 = new wxStaticText( + this, wxID_STATIC, _("&Weight:"), wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer11->Add(itemStaticText12, 0, + wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5); + + m_weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxDefaultPosition, + wxDefaultSize, 3, weights, 0); + m_weightChoice->SetHelpText(_("The font weight.")); + if (ShowToolTips()) m_weightChoice->SetToolTip(_("The font weight.")); + itemBoxSizer11->Add(m_weightChoice, 0, wxALIGN_LEFT | wxALL, 5); + + wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxVERTICAL); + itemGridSizer4->Add(itemBoxSizer14, 0, wxALIGN_CENTER_HORIZONTAL | wxGROW, 5); + m_colourChoice = NULL; + if (m_fontData.GetEnableEffects()) { + wxStaticText* itemStaticText15 = new wxStaticText( + this, wxID_STATIC, _("C&olour:"), wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer14->Add(itemStaticText15, 0, + wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5); + + wxSize colourSize = wxDefaultSize; + if (is_pda) colourSize.x = 100; + + m_colourChoice = + new wxChoice(this, wxID_FONT_COLOUR, wxDefaultPosition, colourSize, + NUM_COLS, ocpnColourDialogNames, 0); + m_colourChoice->SetHelpText(_("The font colour.")); + if (ShowToolTips()) m_colourChoice->SetToolTip(_("The font colour.")); + itemBoxSizer14->Add(m_colourChoice, 0, wxALIGN_LEFT | wxALL, 5); + } + + wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL); + itemGridSizer4->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL | wxGROW, 5); + wxStaticText* itemStaticText18 = + new wxStaticText(this, wxID_STATIC, _("&Point size:"), wxDefaultPosition, + wxDefaultSize, 0); + itemBoxSizer17->Add(itemStaticText18, 0, + wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5); + +#if USE_SPINCTRL_FOR_POINT_SIZE + m_pointSizeSpin = + new wxSpinCtrl(this, wxID_FONT_SIZE, wxT("12"), wxDefaultPosition, + wxSize(80, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 500, 12); + m_pointSizeSpin->SetHelpText(_("The font point size.")); + if (ShowToolTips()) m_pointSizeSpin->SetToolTip(_("The font point size.")); + itemBoxSizer17->Add(m_pointSizeSpin, 0, wxALIGN_LEFT | wxALL, 5); +#else + m_pointSizeChoice = new wxChoice(this, wxID_FONT_SIZE, wxDefaultPosition, + wxDefaultSize, 40, pointSizes, 0); + m_pointSizeChoice->SetHelpText(_("The font point size.")); + if (ShowToolTips()) m_pointSizeChoice->SetToolTip(_("The font point size.")); + itemBoxSizer17->Add(m_pointSizeChoice, 0, wxALIGN_LEFT | wxALL, 5); +#endif + + m_underLineCheckBox = NULL; + if (m_fontData.GetEnableEffects()) { + wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxVERTICAL); + itemGridSizer4->Add(itemBoxSizer20, 0, + wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 5); + m_underLineCheckBox = + new wxCheckBox(this, wxID_FONT_UNDERLINE, _("&Underline"), + wxDefaultPosition, wxDefaultSize, 0); + m_underLineCheckBox->SetValue(false); + m_underLineCheckBox->SetHelpText(_("Whether the font is underlined.")); + if (ShowToolTips()) + m_underLineCheckBox->SetToolTip(_("Whether the font is underlined.")); + itemBoxSizer20->Add(m_underLineCheckBox, 0, wxALIGN_LEFT | wxALL, 5); + } + + if (!is_pda) + itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 5); + + wxStaticText* itemStaticText23 = new wxStaticText( + this, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer3->Add(itemStaticText23, 0, + wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5); + + m_previewer = new OCPNFontPreviewer(this); + m_previewer->SetHelpText(_("Shows the font preview.")); + if (ShowToolTips()) m_previewer->SetToolTip(_("Shows the font preview.")); + itemBoxSizer3->Add(m_previewer, 1, wxGROW | wxALL, 5); + + wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer3->Add(itemBoxSizer25, 0, wxGROW, 5); + itemBoxSizer25->Add(5, 5, 1, wxGROW | wxALL, 5); + +#ifdef __WXMAC__ + wxButton* itemButton28 = new wxButton(this, wxID_CANCEL, _("&Cancel"), + wxDefaultPosition, wxDefaultSize, 0); + if (ShowToolTips()) + itemButton28->SetToolTip(_("Click to cancel the font selection.")); + itemBoxSizer25->Add(itemButton28, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + + wxButton* itemButton27 = new wxButton(this, wxID_OK, _("&OK"), + wxDefaultPosition, wxDefaultSize, 0); + itemButton27->SetDefault(); + itemButton27->SetHelpText(_("Click to confirm the font selection.")); + if (ShowToolTips()) + itemButton27->SetToolTip(_("Click to confirm the font selection.")); + itemBoxSizer25->Add(itemButton27, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); +#else + wxButton* itemButton27 = new wxButton(this, wxID_OK, _("&OK"), + wxDefaultPosition, wxDefaultSize, 0); + itemButton27->SetDefault(); + itemButton27->SetHelpText(_("Click to confirm the font selection.")); + if (ShowToolTips()) + itemButton27->SetToolTip(_("Click to confirm the font selection.")); + itemBoxSizer25->Add(itemButton27, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + + wxButton* itemButton28 = new wxButton(this, wxID_CANCEL, _("&Cancel"), + wxDefaultPosition, wxDefaultSize, 0); + if (ShowToolTips()) + itemButton28->SetToolTip(_("Click to cancel the font selection.")); + itemBoxSizer25->Add(itemButton28, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); +#endif + + m_familyChoice->SetStringSelection( + ocpnFontFamilyIntToString(m_dialogFont.GetFamily())); + m_styleChoice->SetStringSelection( + ocpnFontStyleIntToString(m_dialogFont.GetStyle())); + m_weightChoice->SetStringSelection( + ocpnFontWeightIntToString(m_dialogFont.GetWeight())); + + if (m_colourChoice) { + wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour())); + if (name.empty()) + m_colourChoice->SetStringSelection(wxT("BLACK")); + else + m_colourChoice->SetStringSelection(name); + } + + if (m_underLineCheckBox) { + m_underLineCheckBox->SetValue(m_dialogFont.GetUnderlined()); + } + +#if USE_SPINCTRL_FOR_POINT_SIZE + m_pointSizeSpin->SetValue(m_dialogFont.GetPointSize()); +#else + m_pointSizeChoice->SetSelection(m_dialogFont.GetPointSize() - 1); +#endif + + GetSizer()->SetItemMinSize(m_previewer, is_pda ? 100 : 430, + is_pda ? 40 : 100); + GetSizer()->SetSizeHints(this); + + Centre(wxBOTH); + + delete[] families; + delete[] styles; + delete[] weights; +#if !USE_SPINCTRL_FOR_POINT_SIZE + delete[] pointSizes; +#endif + + // Don't block events any more + m_useEvents = true; +} + +void ocpnGenericFontDialog::InitializeFont() { + wxFontFamily fontFamily = wxFONTFAMILY_SWISS; + wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL; + wxFontStyle fontStyle = wxFONTSTYLE_NORMAL; + int fontSize = 12; + bool fontUnderline = false; + + if (m_fontData.m_initialFont.IsOk()) { + fontFamily = m_fontData.m_initialFont.GetFamily(); + fontWeight = m_fontData.m_initialFont.GetWeight(); + fontStyle = m_fontData.m_initialFont.GetStyle(); + fontSize = m_fontData.m_initialFont.GetPointSize(); + fontUnderline = m_fontData.m_initialFont.GetUnderlined(); + } + + m_dialogFont = + wxFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderline); + + if (m_previewer) m_previewer->SetFont(m_dialogFont); +} + +void ocpnGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event)) { + DoChangeFont(); +} + +void ocpnGenericFontDialog::DoChangeFont() { + if (!m_useEvents) return; + + wxFontFamily fontFamily = + ocpnFontFamilyStringToInt(m_familyChoice->GetStringSelection()); + wxFontWeight fontWeight = + ocpnFontWeightStringToInt(m_weightChoice->GetStringSelection()); + wxFontStyle fontStyle = + ocpnFontStyleStringToInt(m_styleChoice->GetStringSelection()); +#if USE_SPINCTRL_FOR_POINT_SIZE + int fontSize = m_pointSizeSpin->GetValue(); +#else + int fontSize = wxAtoi(m_pointSizeChoice->GetStringSelection()); +#endif + + // Start with previous underline setting, we want to retain it even if we + // can't edit it m_dialogFont is always initialized because of the call to + // InitializeFont + int fontUnderline = m_dialogFont.GetUnderlined(); + + if (m_underLineCheckBox) { + fontUnderline = m_underLineCheckBox->GetValue(); + } + + m_dialogFont = + wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0)); + m_previewer->SetFont(m_dialogFont); + + if (m_colourChoice) { + if (!m_colourChoice->GetStringSelection().empty()) { + wxColour col = + wxTheColourDatabase->Find(m_colourChoice->GetStringSelection()); + if (col.IsOk()) { + m_fontData.m_fontColour = col; + } + } + } + // Update color here so that we can also use the color originally passed in + // (EnableEffects may be false) + if (m_fontData.m_fontColour.IsOk()) + m_previewer->SetForegroundColour(m_fontData.m_fontColour); + + m_previewer->Refresh(); +} + +#if USE_SPINCTRL_FOR_POINT_SIZE +void ocpnGenericFontDialog::OnChangeSize(wxSpinEvent& WXUNUSED(event)) { + DoChangeFont(); +} +#endif + +#endif diff --git a/gui/src/ocpn_frame.cpp b/gui/src/ocpn_frame.cpp index f4c88a8cf0..c867b80a4d 100644 --- a/gui/src/ocpn_frame.cpp +++ b/gui/src/ocpn_frame.cpp @@ -36,10 +36,9 @@ #endif // precompiled headers #ifdef __WXMSW__ -//#include "c:\\Program Files\\visual leak detector\\include\\vld.h" +// #include "c:\\Program Files\\visual leak detector\\include\\vld.h" #endif - #ifdef __WXMSW__ #include #include @@ -347,7 +346,6 @@ DWORD color_inactiveborder; #endif - #ifdef __MSVC__ #define _CRTDBG_MAP_ALLOC #include @@ -405,7 +403,8 @@ void BuildiENCToolbar(bool bnew) { if (bnew) { if (g_iENCToolbar) { wxPoint locn = g_iENCToolbar->GetToolbarPosition(); - wxPoint tbp_incanvas = locn; //gFrame->GetPrimaryCanvas()->ScreenToClient(locn); + wxPoint tbp_incanvas = + locn; // gFrame->GetPrimaryCanvas()->ScreenToClient(locn); g_iENCToolbarPosY = tbp_incanvas.y; g_iENCToolbarPosX = tbp_incanvas.x; @@ -421,7 +420,8 @@ void BuildiENCToolbar(bool bnew) { // Overlapping main toolbar? if (g_MainToolbar) { if ((g_iENCToolbarPosY > g_maintoolbar_y) && - (g_iENCToolbarPosY < g_maintoolbar_y + g_MainToolbar->GetToolSize().y)) + (g_iENCToolbarPosY < + g_maintoolbar_y + g_MainToolbar->GetToolSize().y)) g_iENCToolbarPosY = -1; // force a reposition } @@ -430,8 +430,9 @@ void BuildiENCToolbar(bool bnew) { posn.y = 100; if (g_MainToolbar) - posn = wxPoint(g_maintoolbar_x + g_MainToolbar->GetToolbarSize().x + 4, - g_maintoolbar_y); + posn = + wxPoint(g_maintoolbar_x + g_MainToolbar->GetToolbarSize().x + 4, + g_maintoolbar_y); } double tool_scale_factor = @@ -633,13 +634,15 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, const wxPoint &pos, const wxSize &size, long style) : wxFrame(frame, -1, title, pos, size, style, kTopLevelWindowName), comm_overflow_dlg(this) { - g_current_monitor = wxDisplay::GetFromWindow(this); #ifdef __WXOSX__ - // On retina displays there is a difference between the physical size of the OpenGL canvas and the DIP - // This is not observed anywhere else so far, so g_current_monitor_dip_px_ratio cna be kept 1.0 everywhere else + // On retina displays there is a difference between the physical size of the + // OpenGL canvas and the DIP This is not observed anywhere else so far, so + // g_current_monitor_dip_px_ratio cna be kept 1.0 everywhere else if (g_bopengl) { - g_current_monitor_dip_px_ratio = g_monitor_info[g_current_monitor].width_px / g_monitor_info[g_current_monitor].width; + g_current_monitor_dip_px_ratio = + g_monitor_info[g_current_monitor].width_px / + g_monitor_info[g_current_monitor].width; } #endif m_last_track_rotation_ts = 0; @@ -707,28 +710,33 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, const wxPoint &pos, // Establish my children struct MuxLogCallbacks log_callbacks; - log_callbacks.log_is_active = []() { return NMEALogWindow::GetInstance().Active(); }; - log_callbacks.log_message = [](const std::string& s) { - NMEALogWindow::GetInstance().Add(s); }; + log_callbacks.log_is_active = []() { + return NMEALogWindow::GetInstance().Active(); + }; + log_callbacks.log_message = [](const std::string &s) { + NMEALogWindow::GetInstance().Add(s); + }; g_pMUX = new Multiplexer(log_callbacks, g_b_legacy_input_filter_behaviour); - struct AisDecoderCallbacks ais_callbacks; + struct AisDecoderCallbacks ais_callbacks; ais_callbacks.confirm_stop_track = []() { - int r = OCPNMessageBox(NULL, - _("This AIS target has Persistent tracking selected by MMSI properties\n" - "A Persistent track recording will therefore be restarted for this target.\n\n" - "Do you instead want to stop Persistent tracking for this target?"), - _("OpenCPN Info"), wxYES_NO | wxCENTER, 60); + int r = OCPNMessageBox( + NULL, + _("This AIS target has Persistent tracking selected by MMSI " + "properties\n" + "A Persistent track recording will therefore be restarted for this " + "target.\n\n" + "Do you instead want to stop Persistent tracking for this target?"), + _("OpenCPN Info"), wxYES_NO | wxCENTER, 60); return r == wxID_YES; }; - ais_callbacks.get_target_mmsi = []() { + ais_callbacks.get_target_mmsi = []() { auto alert_dlg_active = - dynamic_cast(g_pais_alert_dialog_active); + dynamic_cast(g_pais_alert_dialog_active); assert(alert_dlg_active); return alert_dlg_active->Get_Dialog_MMSI(); }; - g_pAIS = new AisDecoder(ais_callbacks); g_pAISGUI = new AisInfoGui(); @@ -743,9 +751,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, const wxPoint &pos, Connect(wxEVT_OCPN_MSG, (wxObjectEventFunction)(wxEventFunction)&MyFrame::OnEvtPlugInMessage); - //FIXME (dave) - //Connect(wxEVT_OCPN_THREADMSG, - // (wxObjectEventFunction)(wxEventFunction)&MyFrame::OnEvtTHREADMSG); + // FIXME (dave) + // Connect(wxEVT_OCPN_THREADMSG, + // (wxObjectEventFunction)(wxEventFunction)&MyFrame::OnEvtTHREADMSG); // And from the thread SENC creator Connect(wxEVT_OCPN_BUILDSENCTHREAD, @@ -787,7 +795,6 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, const wxPoint &pos, m_routes_update_listener.Init(g_pRouteMan->on_routes_update, [&](wxCommandEvent) { Refresh(); }); - #ifdef __WXOSX__ // Enable native fullscreen on macOS EnableFullScreenView(); @@ -816,9 +823,9 @@ MyFrame::~MyFrame() { Disconnect( wxEVT_OCPN_MSG, (wxObjectEventFunction)(wxEventFunction)&MyFrame::OnEvtPlugInMessage); - //FIXME (dave) Was in some datastream file? - //Disconnect(wxEVT_OCPN_THREADMSG, - // (wxObjectEventFunction)(wxEventFunction)&MyFrame::OnEvtTHREADMSG); + // FIXME (dave) Was in some datastream file? + // Disconnect(wxEVT_OCPN_THREADMSG, + // (wxObjectEventFunction)(wxEventFunction)&MyFrame::OnEvtTHREADMSG); } void MyFrame::OnSENCEvtThread(OCPN_BUILDSENC_ThreadEvent &event) { @@ -860,13 +867,13 @@ void MyFrame::RebuildChartDatabase() { if (ChartDirArray.GetCount()) { // Create and Save a new Chart Database based on the hints // given in the config file - if(g_NeedDBUpdate == 1) { + if (g_NeedDBUpdate == 1) { wxString msg1( - _("OpenCPN needs to update the chart database from config file " - "entries....")); + _("OpenCPN needs to update the chart database from config file " + "entries....")); OCPNMessageDialog mdlg(gFrame, msg1, wxString(_("OpenCPN Info")), - wxICON_INFORMATION | wxOK); + wxICON_INFORMATION | wxOK); mdlg.ShowModal(); } @@ -1033,8 +1040,8 @@ void MyFrame::SetAndApplyColorScheme(ColorScheme cs) { } if (pWayPointMan) - WayPointmanGui(*pWayPointMan).SetColorScheme(cs, - g_Platform->GetDisplayDPmm()); + WayPointmanGui(*pWayPointMan) + .SetColorScheme(cs, g_Platform->GetDisplayDPmm()); if (ChartData) ChartData->ApplyColorSchemeToCachedCharts(cs); if (g_options) { @@ -1095,11 +1102,11 @@ void MyFrame::SetAndApplyColorScheme(ColorScheme cs) { // CreateMasterToolbar(); if (!btoolbarFull) { - //g_MainToolbar->Hide(); + // g_MainToolbar->Hide(); RequestNewMasterToolbar(); g_MainToolbar->SetColorScheme(cs); CollapseGlobalToolbar(); - //g_MainToolbar->Show(); + // g_MainToolbar->Show(); } else { RequestNewMasterToolbar(); g_MainToolbar->SetColorScheme(cs); @@ -1150,7 +1157,7 @@ void MyFrame::CreateCanvasLayout(bool b_useStoredSize) { ChartCanvas *cc = g_canvasArray.Item(i); if (cc) { // pthumbwin = NULL; // TODO - //cc->DestroyToolbar(); + // cc->DestroyToolbar(); cc->Destroy(); } } @@ -1475,7 +1482,10 @@ void MyFrame::SwitchKBFocus(ChartCanvas *pCanvas) { #ifdef __WXGTK__ nfinalTarget = nTargetGTK; #endif - target = ConfigMgr::Get().GetCanvasConfigArray().Item(nfinalTarget)->canvas; + target = ConfigMgr::Get() + .GetCanvasConfigArray() + .Item(nfinalTarget) + ->canvas; if (target) { wxWindow *win = wxDynamicCast(target, wxWindow); win->SetFocus(); @@ -1589,9 +1599,10 @@ void MyFrame::OnCloseWindow(wxCloseEvent &event) { RestoreScreenBrightness(); // Persist the toolbar locations - // if (g_MainToolbar) { - // g_MainToolbar->GetFrameRelativePosition(&g_maintoolbar_x, &g_maintoolbar_y); - // } + // if (g_MainToolbar) { + // g_MainToolbar->GetFrameRelativePosition(&g_maintoolbar_x, + // &g_maintoolbar_y); + // } #if 0 if (g_iENCToolbar) { @@ -1706,15 +1717,15 @@ void MyFrame::OnCloseWindow(wxCloseEvent &event) { } #ifndef __ANDROID__ - //if (g_MainToolbar) g_MainToolbar->Destroy(); - //g_MainToolbar = NULL; + // if (g_MainToolbar) g_MainToolbar->Destroy(); + // g_MainToolbar = NULL; #endif if (g_iENCToolbar) { - //wxPoint locn = g_iENCToolbar->GetPosition(); - //g_iENCToolbarPosY = locn.y; - //g_iENCToolbarPosX = locn.x; - //g_iENCToolbar->Destroy(); + // wxPoint locn = g_iENCToolbar->GetPosition(); + // g_iENCToolbarPosY = locn.y; + // g_iENCToolbarPosX = locn.x; + // g_iENCToolbar->Destroy(); } if (g_pAISTargetList) { @@ -1770,14 +1781,13 @@ void MyFrame::OnCloseWindow(wxCloseEvent &event) { g_pi_manager = NULL; } - MyApp& app = wxGetApp(); + MyApp &app = wxGetApp(); app.m_comm_bridge.SaveConfig(); delete pConfig; // All done pConfig = NULL; InitBaseConfig(0); - if (g_pAIS) { delete g_pAIS; g_pAIS = NULL; @@ -1792,7 +1802,7 @@ void MyFrame::OnCloseWindow(wxCloseEvent &event) { g_pMUX = NULL; // Close and delete all comm drivers - auto& registry = CommDriverRegistry::GetInstance(); + auto ®istry = CommDriverRegistry::GetInstance(); registry.CloseAllDrivers(); // Clear some global arrays, lists, and hash maps... @@ -1870,32 +1880,41 @@ void MyFrame::OnCloseWindow(wxCloseEvent &event) { void MyFrame::OnMove(wxMoveEvent &event) { auto idx = wxDisplay::GetFromWindow(this); - if (idx != wxNOT_FOUND && g_current_monitor != static_cast(idx) && static_cast(idx) < g_monitor_info.size()) { + if (idx != wxNOT_FOUND && g_current_monitor != static_cast(idx) && + static_cast(idx) < g_monitor_info.size()) { g_current_monitor = idx; #ifdef __WXOSX__ - // On retina displays there is a difference between the physical size of the OpenGL canvas and the DIP - // This is not observed anywhere else so far, so g_current_monitor_dip_px_ratio cna be kept 1.0 everywhere else + // On retina displays there is a difference between the physical size of the + // OpenGL canvas and the DIP This is not observed anywhere else so far, so + // g_current_monitor_dip_px_ratio cna be kept 1.0 everywhere else if (g_bopengl) { - g_current_monitor_dip_px_ratio = g_monitor_info[idx].width_px / g_monitor_info[idx].width; + g_current_monitor_dip_px_ratio = + g_monitor_info[idx].width_px / g_monitor_info[idx].width; } #endif DEBUG_LOG << "Moved to " << idx #if wxCHECK_VERSION(3, 1, 6) - << " PPI: " << wxDisplay(idx).GetPPI().GetX() << "x" << wxDisplay(idx).GetPPI().GetY() - << " SF wxDisplay: " << wxDisplay(idx).GetScaleFactor() -#endif - << " Size wxDisplay: " << wxDisplay(idx).GetGeometry().GetWidth() << "x" << wxDisplay(idx).GetGeometry().GetHeight() - << " MM wxDisplay: " << wxGetDisplaySizeMM().GetX() << "x" << wxGetDisplaySizeMM().GetY() - << " Name wxDisplay: " << wxDisplay(idx).GetName().c_str() - << " Real: " << g_monitor_info[idx].width_mm << "x" << g_monitor_info[idx].height_mm << "mm " - << g_monitor_info[idx].width_mm << "x" << g_monitor_info[idx].height_mm << "mm " - << g_monitor_info[idx].width << "x" << g_monitor_info[idx].height << "DIP " - << g_monitor_info[idx].width_px << "x" << g_monitor_info[idx].height_px << "px" - << g_monitor_info[idx].scale << "%"; - if(g_config_display_size_manual) { - if(g_config_display_size_mm.size() > static_cast(idx)) { + << " PPI: " << wxDisplay(idx).GetPPI().GetX() << "x" + << wxDisplay(idx).GetPPI().GetY() + << " SF wxDisplay: " << wxDisplay(idx).GetScaleFactor() +#endif + << " Size wxDisplay: " << wxDisplay(idx).GetGeometry().GetWidth() + << "x" << wxDisplay(idx).GetGeometry().GetHeight() + << " MM wxDisplay: " << wxGetDisplaySizeMM().GetX() << "x" + << wxGetDisplaySizeMM().GetY() + << " Name wxDisplay: " << wxDisplay(idx).GetName().c_str() + << " Real: " << g_monitor_info[idx].width_mm << "x" + << g_monitor_info[idx].height_mm << "mm " + << g_monitor_info[idx].width_mm << "x" + << g_monitor_info[idx].height_mm << "mm " + << g_monitor_info[idx].width << "x" << g_monitor_info[idx].height + << "DIP " << g_monitor_info[idx].width_px << "x" + << g_monitor_info[idx].height_px << "px" + << g_monitor_info[idx].scale << "%"; + if (g_config_display_size_manual) { + if (g_config_display_size_mm.size() > static_cast(idx)) { g_display_size_mm = g_config_display_size_mm[idx]; - } // Do nothing if the user did not set any value for this monitor + } // Do nothing if the user did not set any value for this monitor } else { g_display_size_mm = g_monitor_info[idx].width_mm; } @@ -1918,9 +1937,9 @@ void MyFrame::OnMove(wxMoveEvent &event) { if (console && console->IsShown()) PositionConsole(); // If global toolbar is shown, reposition it... - //if (g_MainToolbar) { - //g_MainToolbar->RestoreRelativePosition(g_maintoolbar_x, g_maintoolbar_y); - //g_MainToolbar->Realize(); + // if (g_MainToolbar) { + // g_MainToolbar->RestoreRelativePosition(g_maintoolbar_x, g_maintoolbar_y); + // g_MainToolbar->Realize(); //} PositionIENCToolbar(); @@ -2229,10 +2248,10 @@ void MyFrame::PositionConsole(void) { int yOffset = 60; if (consoleHost) { - if(consoleHost->GetCompass()){ + if (consoleHost->GetCompass()) { wxRect compass_rect = consoleHost->GetCompass()->GetRect(); - // Compass is normal upper right position. - if(compass_rect.y < 100) + // Compass is normal upper right position. + if (compass_rect.y < 100) yOffset = compass_rect.y + compass_rect.height + 45; } } @@ -2303,7 +2322,6 @@ void MyFrame::RefreshGroupIndices(void) { void MyFrame::OnToolLeftClick(wxCommandEvent &event) { if (g_MainToolbar) g_MainToolbar->HideTooltip(); - switch (event.GetId()) { case ID_MENU_SCALE_OUT: DoStackDelta(GetPrimaryCanvas(), 1); @@ -2430,7 +2448,7 @@ void MyFrame::OnToolLeftClick(wxCommandEvent &event) { g_bAIS_CPA_Alert = !g_bAIS_CPA_Alert; SetMenubarItemState(ID_MENU_AIS_CPADIALOG, g_bAIS_CPA_Alert); m_pMenuBar->Enable(ID_MENU_AIS_CPASOUND, g_bAIS_CPA_Alert); - if (g_bAIS_CPA_Alert){ + if (g_bAIS_CPA_Alert) { SetMenubarItemState(ID_MENU_AIS_CPASOUND, g_bAIS_CPA_Alert_Audio); } break; @@ -2660,7 +2678,7 @@ void MyFrame::OnToolLeftClick(wxCommandEvent &event) { case ID_DENSITY: case ID_RMINUS: case ID_RPLUS: { - if (g_iENCToolbar ){ + if (g_iENCToolbar) { g_iENCToolbar->OnToolLeftClick(event); } break; @@ -2686,15 +2704,18 @@ void MyFrame::OnToolLeftClick(wxCommandEvent &event) { } // If we didn't handle the event, allow it to bubble up to other handlers. - // This is required for the system menu items (Hide, etc.) on OS X to work. - // This must only be called if we did NOT handle the event, otherwise it - // stops the menu items from working on Windows. + // This is required for the system menu items (Hide, etc.) on OS X to + // work. This must only be called if we did NOT handle the event, + // otherwise it stops the menu items from working on Windows. event.Skip(); break; } } // switch + + // Finally, force a refresh of the main toolbar + if (g_MainToolbar) g_MainToolbar->Realize(); } bool MyFrame::SetGlobalToolbarViz(bool viz) { @@ -2879,7 +2900,7 @@ void MyFrame::ToggleColorScheme() { { is = 1; lastIsNight = false; - } // Goto to Day + } // Goto to Day if (lastIsNight) is = 2; // Back to Dusk on step 3 if (is == 3) lastIsNight = true; // Step 2 Night s = (ColorScheme)is; @@ -2900,7 +2921,7 @@ void MyFrame::ToggleFullScreen() { #endif UpdateAllToolbars(global_color_scheme); - //SurfaceAllCanvasToolbars(); + // SurfaceAllCanvasToolbars(); UpdateControlBar(GetPrimaryCanvas()); Layout(); TriggerRecaptureTimer(); @@ -3282,7 +3303,7 @@ void MyFrame::SetbFollow(ChartCanvas *cc) { JumpToPosition(cc, gLat, gLon, cc->GetVPScale()); cc->m_bFollow = true; - //cc->SetCanvasToolbarItemState(ID_FOLLOW, true); + // cc->SetCanvasToolbarItemState(ID_FOLLOW, true); SetMenubarItemState(ID_MENU_NAV_FOLLOW, true); DoChartUpdate(); @@ -3296,7 +3317,7 @@ void MyFrame::ClearbFollow(ChartCanvas *cc) { vLon = gLon; cc->m_bFollow = false; - //cc->SetCanvasToolbarItemState(ID_FOLLOW, false); + // cc->SetCanvasToolbarItemState(ID_FOLLOW, false); SetMenubarItemState(ID_MENU_NAV_FOLLOW, false); DoChartUpdate(); @@ -3329,14 +3350,17 @@ void MyFrame::SetMenubarItemState(int item_id, bool state) { } void MyFrame::SetMasterToolbarItemState(int tool_id, bool state) { - if (g_MainToolbar && g_MainToolbar->GetToolbar()) + if (g_MainToolbar && g_MainToolbar->GetToolbar()) { g_MainToolbar->GetToolbar()->ToggleTool(tool_id, state); + g_MainToolbar->Realize(); + } } void MyFrame::SetToolbarItemBitmaps(int tool_id, wxBitmap *bmp, wxBitmap *bmpRollover) { if (g_MainToolbar && g_MainToolbar->GetToolbar()) { g_MainToolbar->GetToolbar()->SetToolBitmaps(tool_id, bmp, bmpRollover); + g_MainToolbar->Realize(); } } @@ -3536,10 +3560,10 @@ void MyFrame::RegisterGlobalMenuItems() { #ifndef __WXOSX__ ais_menu->AppendCheckItem(ID_MENU_AIS_CPAWARNING, - _menuText(_("Show CPA Warnings"), _T("W"))); + _menuText(_("Show CPA Warnings"), _T("W"))); #else ais_menu->AppendCheckItem(ID_MENU_AIS_CPAWARNING, - _menuText(_("Show CPA Warnings"), _T("Alt-W"))); + _menuText(_("Show CPA Warnings"), _T("Alt-W"))); #endif ais_menu->AppendSeparator(); @@ -3621,8 +3645,7 @@ void MyFrame::UpdateGlobalMenuItems() { if (g_bAIS_CPA_Alert) { m_pMenuBar->FindItem(ID_MENU_AIS_CPASOUND)->Check(g_bAIS_CPA_Alert_Audio); m_pMenuBar->Enable(ID_MENU_AIS_CPASOUND, true); - } - else { + } else { m_pMenuBar->FindItem(ID_MENU_AIS_CPASOUND)->Check(false); m_pMenuBar->Enable(ID_MENU_AIS_CPASOUND, false); } @@ -3772,7 +3795,8 @@ void MyFrame::JumpToPosition(ChartCanvas *cc, double lat, double lon, void MyFrame::UpdateCanvasConfigDescriptors() { // ..For each canvas... - for (unsigned int i = 0; i < ConfigMgr::Get().GetCanvasConfigArray().GetCount(); i++) { + for (unsigned int i = 0; + i < ConfigMgr::Get().GetCanvasConfigArray().GetCount(); i++) { canvasConfig *cc = ConfigMgr::Get().GetCanvasConfigArray().Item(i); if (cc) { ChartCanvas *chart = cc->canvas; @@ -3795,7 +3819,8 @@ void MyFrame::UpdateCanvasConfigDescriptors() { cc->bFollow = chart->m_bFollow; cc->bLookahead = chart->m_bLookAhead; cc->bCourseUp = false; - cc->bHeadUp = false;; + cc->bHeadUp = false; + ; int upmode = chart->GetUpMode(); if (upmode == COURSE_UP_MODE) cc->bCourseUp = true; @@ -3856,8 +3881,8 @@ int MyFrame::DoOptionsDialog() { #ifdef __WXOSX__ optionsParent = GetPrimaryCanvas(); #endif - g_options = - new options(optionsParent, -1, _("Options"), wxPoint(-1, -1), wxSize(sx, sy)); + g_options = new options(optionsParent, -1, _("Options"), wxPoint(-1, -1), + wxSize(sx, sy)); AbstractPlatform::HideBusySpinner(); } @@ -3898,7 +3923,7 @@ int MyFrame::DoOptionsDialog() { #endif #ifdef __WXOSX__ - //SubmergeAllCanvasToolbars(); + // SubmergeAllCanvasToolbars(); g_MainToolbar->Submerge(); #endif @@ -3993,8 +4018,8 @@ int MyFrame::DoOptionsDialog() { g_MainToolbar->SetDockX(-1); g_MainToolbar->SetDockY(-1); #endif - //g_MainToolbar->Surface(); - //SurfaceAllCanvasToolbars(); + // g_MainToolbar->Surface(); + // SurfaceAllCanvasToolbars(); GetPrimaryCanvas()->SetFocus(); } @@ -4070,7 +4095,8 @@ int MyFrame::DoOptionsDialog() { if (rr & CONFIG_CHANGED) { // Apply the changed canvas configs to each canvas // ..For each canvas... - for (unsigned int i = 0; i < ConfigMgr::Get().GetCanvasConfigArray().GetCount(); i++) { + for (unsigned int i = 0; + i < ConfigMgr::Get().GetCanvasConfigArray().GetCount(); i++) { canvasConfig *cc = ConfigMgr::Get().GetCanvasConfigArray().Item(i); if (cc) { ChartCanvas *chartCanvas = cc->canvas; @@ -4158,7 +4184,7 @@ int MyFrame::DoOptionsDialog() { if (console && console->IsShown()) console->Raise(); auto alert_dlg_active = - dynamic_cast(g_pais_alert_dialog_active); + dynamic_cast(g_pais_alert_dialog_active); if (alert_dlg_active) alert_dlg_active->Raise(); if (NMEALogWindow::GetInstance().Active()) @@ -4331,7 +4357,9 @@ bool MyFrame::ProcessOptionsDialog(int rr, ArrayOfCDI *pNewDirArray) { } #endif - if (g_config_display_size_manual && g_config_display_size_mm.size() > g_current_monitor && g_config_display_size_mm[g_current_monitor] > 0) { + if (g_config_display_size_manual && + g_config_display_size_mm.size() > g_current_monitor && + g_config_display_size_mm[g_current_monitor] > 0) { g_display_size_mm = g_config_display_size_mm[g_current_monitor]; } else { g_display_size_mm = wxMax(50, g_Platform->GetDisplaySizeMM()); @@ -4356,9 +4384,10 @@ bool MyFrame::ProcessOptionsDialog(int rr, ArrayOfCDI *pNewDirArray) { } // update S52 PLIB scale factors - if (ps52plib){ - ps52plib->SetScaleFactorExp(g_Platform->GetChartScaleFactorExp(g_ChartScaleFactor)); - ps52plib-> SetScaleFactorZoomMod(g_chart_zoom_modifier_vector); + if (ps52plib) { + ps52plib->SetScaleFactorExp( + g_Platform->GetChartScaleFactorExp(g_ChartScaleFactor)); + ps52plib->SetScaleFactorZoomMod(g_chart_zoom_modifier_vector); } // Apply any needed updates to each canvas @@ -4721,8 +4750,8 @@ void MyFrame::OnInitTimer(wxTimerEvent &event) { // which is why they have been to defered until here auto colour_func = [](wxString c) { return GetGlobalColor(c); }; pWayPointMan = new WayPointman(colour_func); - WayPointmanGui(*pWayPointMan).SetColorScheme(global_color_scheme, - g_Platform->GetDisplayDPmm()); + WayPointmanGui(*pWayPointMan) + .SetColorScheme(global_color_scheme, g_Platform->GetDisplayDPmm()); // Reload the ownship icon from UserIcons, if present for (unsigned int i = 0; i < g_canvasArray.GetCount(); i++) { ChartCanvas *cc = g_canvasArray.Item(i); @@ -4768,6 +4797,14 @@ void MyFrame::OnInitTimer(wxTimerEvent &event) { console = new ConsoleCanvas(gFrame); // the console console->SetColorScheme(global_color_scheme); + + // Draw console if persisted route is active + if (g_pRouteMan) { + if (g_pRouteMan->IsAnyRouteActive()) { + g_pRouteMan->GetDlgContext().show_with_fresh_fonts(); + } + } + break; case 2: { @@ -4847,7 +4884,7 @@ void MyFrame::OnInitTimer(wxTimerEvent &event) { g_pi_manager->NotifyAuiPlugIns(); // Give the user dialog on any blacklisted PlugIns - g_pi_manager ->ShowDeferredBlacklistMessages(); + g_pi_manager->ShowDeferredBlacklistMessages(); g_pi_manager->CallLateInit(); @@ -4895,12 +4932,12 @@ void MyFrame::OnInitTimer(wxTimerEvent &event) { pConfig->Read("OptionsSizeX", &sx, -1); pConfig->Read("OptionsSizeY", &sy, -1); - wxWindow *optionsParent = this; + wxWindow *optionsParent = this; #ifdef __WXOSX__ - optionsParent = GetPrimaryCanvas(); + optionsParent = GetPrimaryCanvas(); #endif - g_options = - new options(optionsParent, -1, _("Options"), wxPoint(-1, -1), wxSize(sx, sy)); + g_options = new options(optionsParent, -1, _("Options"), wxPoint(-1, -1), + wxSize(sx, sy)); BuildiENCToolbar(true); @@ -5005,7 +5042,7 @@ void MyFrame::InitAppMsgBusListener() { Bind(EVT_BASIC_NAV_DATA, [&](ObservedEvt ev) { auto ptr = ev.GetSharedPtr(); auto basicnav_msg = std::static_pointer_cast(ptr); - HandleBasicNavMsg( basicnav_msg ); + HandleBasicNavMsg(basicnav_msg); }); // GPS Watchdog expiry status @@ -5017,7 +5054,6 @@ void MyFrame::InitAppMsgBusListener() { auto msg = std::static_pointer_cast(ptr); HandleGPSWatchdogMsg(msg); }); - } /** Setup handling of events from the local ipc/dbus API. */ @@ -5027,29 +5063,27 @@ void MyFrame::ReleaseApiListeners() {} #else void MyFrame::InitApiListeners() { - auto& server = LocalServerApi::GetInstance(); - m_on_raise_listener.Init(server.on_raise, [&](ObservedEvt){ Raise(); }); - m_on_quit_listener.Init(server.on_quit, [&](ObservedEvt){ FastClose(); }); + auto &server = LocalServerApi::GetInstance(); + m_on_raise_listener.Init(server.on_raise, [&](ObservedEvt) { Raise(); }); + m_on_quit_listener.Init(server.on_quit, [&](ObservedEvt) { FastClose(); }); server.SetGetRestApiEndpointCb( - [&]{ return wxGetApp().m_rest_server.GetEndpoint(); }); - server.open_file_cb = - [](const std::string& path) { return wxGetApp().OpenFile(path); }; - + [&] { return wxGetApp().m_rest_server.GetEndpoint(); }); + server.open_file_cb = [](const std::string &path) { + return wxGetApp().OpenFile(path); + }; } void MyFrame::ReleaseApiListeners() { LocalServerApi::ReleaseInstance(); } #endif void MyFrame::HandleGPSWatchdogMsg(std::shared_ptr msg) { - - if (msg->gps_watchdog <= 0){ - if (msg->wd_source == GPSWatchdogMsg::WDSource::position){ + if (msg->gps_watchdog <= 0) { + if (msg->wd_source == GPSWatchdogMsg::WDSource::position) { bool last_bGPSValid = bGPSValid; bGPSValid = false; - m_fixtime = 0; // Invalidate fix time + m_fixtime = 0; // Invalidate fix time if (last_bGPSValid != bGPSValid) UpdateGPSCompassStatusBoxes(true); - } - else if (msg->wd_source == GPSWatchdogMsg::WDSource::velocity){ + } else if (msg->wd_source == GPSWatchdogMsg::WDSource::velocity) { bool last_bVelocityValid = bVelocityValid; bVelocityValid = false; } @@ -5061,7 +5095,7 @@ void MyFrame::HandleGPSWatchdogMsg(std::shared_ptr msg) { void MyFrame::HandleBasicNavMsg(std::shared_ptr msg) { m_fixtime = msg->time; - // Maintain average COG for Course Up Mode + // Maintain average COG for Course Up Mode if (!std::isnan(gCog)) { if (g_COGAvgSec > 0) { // Make a hole @@ -5101,11 +5135,10 @@ void MyFrame::HandleBasicNavMsg(std::shared_ptr msg) { // "cruising" if (gSog > 3.0) g_bCruising = true; - -// Maintain the GPS position validity flag -// Determined by source validity of RMC, GGA, GLL (N0183) -// or PGNs 129029, 129025 (N2K) -// Positions by sK and AIVDO are assumed valid + // Maintain the GPS position validity flag + // Determined by source validity of RMC, GGA, GLL (N0183) + // or PGNs 129029, 129025 (N2K) + // Positions by sK and AIVDO are assumed valid bool last_bGPSValid = bGPSValid; if ((msg->vflag & POS_UPDATE) == POS_UPDATE) { if ((msg->vflag & POS_VALID) == POS_VALID) @@ -5113,8 +5146,7 @@ void MyFrame::HandleBasicNavMsg(std::shared_ptr msg) { else bGPSValid = false; } - if (last_bGPSValid != bGPSValid) - UpdateGPSCompassStatusBoxes(true); + if (last_bGPSValid != bGPSValid) UpdateGPSCompassStatusBoxes(true); bVelocityValid = true; UpdateStatusBar(); @@ -5182,7 +5214,7 @@ void MyFrame::HandleBasicNavMsg(std::shared_ptr msg) { msg += CommandStr; wxLogMessage(msg); wxExecute(CommandStr, wxEXEC_ASYNC); -#endif //__WXMSW__ +#endif //__WXMSW__ } m_bTimeIsSet = true; } else { // no hw-clock set both date and time @@ -5204,14 +5236,13 @@ void MyFrame::HandleBasicNavMsg(std::shared_ptr msg) { msg.Printf(_T("Set Date/Time, Linux command is: %s"), CommandStr); wxLogMessage(msg); wxExecute(CommandStr, wxEXEC_ASYNC); -#endif // !__WXMSW__ +#endif // !__WXMSW__ m_bTimeIsSet = true; } } } -#endif // ocpnUPDATE_SYSTEM_TIME +#endif // ocpnUPDATE_SYSTEM_TIME #endif - } void MyFrame::UpdateStatusBar() { @@ -5231,7 +5262,7 @@ void MyFrame::UpdateStatusBar() { // Show gLat/gLon in StatusWindow0 if (NULL != GetStatusBar()) { - if (1/*pos_valid*/) { + if (1 /*pos_valid*/) { char tick_buf[2]; tick_buf[0] = nmea_tick_chars[m_tick_idx]; tick_buf[1] = 0; @@ -5258,18 +5289,16 @@ void MyFrame::UpdateStatusBar() { if (g_bShowTrue) cogs << wxString::Format(wxString("COG %03d%c "), (int)gCog, 0x00B0); if (g_bShowMag) - cogs << wxString::Format(wxString("COG %03d%c(M) "), (int)toMagnetic(gCog), - 0x00B0); + cogs << wxString::Format(wxString("COG %03d%c(M) "), + (int)toMagnetic(gCog), 0x00B0); } else cogs.Printf(("COG ---%c"), 0x00B0); sogcog.Append(cogs); SetStatusText(sogcog, STAT_FIELD_SOGCOG); } - } - // Manage the application memory footprint on a periodic schedule void MyFrame::OnMemFootTimer(wxTimerEvent &event) { MemFootTimer.Stop(); @@ -5467,7 +5496,6 @@ void MyFrame::OnFrameTimer1(wxTimerEvent &event) { } } - // Build and send a Position Fix event to PlugIns if (g_pi_manager) { GenericPosDatEx GPSData; @@ -5675,7 +5703,7 @@ void MyFrame::OnFrameTimer1(wxTimerEvent &event) { if (!bGPSValid) cc->SetOwnShipState(SHIP_INVALID); if ((bGPSValid != m_last_bGPSValid) || - (bVelocityValid != m_last_bVelocityValid)) { + (bVelocityValid != m_last_bVelocityValid)) { if (!g_bopengl) cc->UpdateShips(); bnew_view = true; // force a full Refresh() @@ -5884,7 +5912,7 @@ void MyFrame::OnFrameCOGTimer(wxTimerEvent &event) { // Restart the timer, max frequency is 10 hz. int period_ms = 100; - //if (g_COGAvgSec > 0) period_ms = g_COGAvgSec * 1000; + // if (g_COGAvgSec > 0) period_ms = g_COGAvgSec * 1000; FrameCOGTimer.Start(period_ms, wxTIMER_CONTINUOUS); } @@ -6254,13 +6282,13 @@ bool GetMemoryStatus(int *mem_total, int *mem_used) { } void MyFrame::DoPrint(void) { - //avoid toolbars being printed + // avoid toolbars being printed g_PrintingInProgress = true; #ifdef ocpnUSE_GL - if(g_bopengl){ + if (g_bopengl) { GetPrimaryCanvas()->GetglCanvas()->Render(); GetPrimaryCanvas()->GetglCanvas()->SwapBuffers(); - }else + } else #endif Refresh(); @@ -6827,8 +6855,7 @@ void MyFrame::applySettingsString(wxString settings) { if (rr & TOOLBAR_CHANGED) b_newToolbar = true; - - // We do this is one case only to remove an orphan recovery window + // We do this is one case only to remove an orphan recovery window #ifdef __ANDROID__ if (previous_expert && !g_bUIexpert) { androidForceFullRepaint(); @@ -6899,13 +6926,12 @@ void MyFrame::OnResume(wxPowerEvent &WXUNUSED(event)) { wxDateTime now = wxDateTime::Now(); wxLogMessage(_T("System resumed from suspend.")); - if ((now.GetTicks() - g_last_resume_ticks) > 5) { SystemEvents::GetInstance().evt_resume.Notify(); wxLogMessage("Restarting streams."); g_last_resume_ticks = now.GetTicks(); -//FIXME (dave) +// FIXME (dave) #if 0 if (g_pMUX) { g_pMUX->ClearStreams(); @@ -6942,7 +6968,7 @@ void MyFrame::RequestNewMasterToolbar(bool bforcenew) { bool b_reshow = true; if (g_MainToolbar) { - b_reshow = true; //g_MainToolbar->IsShown(); + b_reshow = true; // g_MainToolbar->IsShown(); float ff = fabs(g_MainToolbar->GetScaleFactor() - g_toolbar_scalefactor); if ((ff > 0.01f) || bforcenew) { g_MainToolbar->DestroyToolBar(); @@ -6959,8 +6985,8 @@ void MyFrame::RequestNewMasterToolbar(bool bforcenew) { #ifdef __WXOSX__ toolbarParent = GetPrimaryCanvas(); #endif - g_MainToolbar = new ocpnFloatingToolbarDialog(toolbarParent, wxPoint(-1, -1), orient, - g_toolbar_scalefactor); + g_MainToolbar = new ocpnFloatingToolbarDialog( + toolbarParent, wxPoint(-1, -1), orient, g_toolbar_scalefactor); g_MainToolbar->SetBackGroundColorString(_T("GREY3")); g_MainToolbar->SetToolbarHideMethod(TOOLBAR_HIDE_TO_FIRST_TOOL); g_MainToolbar->SetToolConfigString(g_toolbarConfig); @@ -6975,9 +7001,10 @@ void MyFrame::RequestNewMasterToolbar(bool bforcenew) { if (g_MainToolbar) { CreateMasterToolbar(); { - //g_MainToolbar->RestoreRelativePosition(g_maintoolbar_x, g_maintoolbar_y); + // g_MainToolbar->RestoreRelativePosition(g_maintoolbar_x, + // g_maintoolbar_y); g_MainToolbar->SetColorScheme(global_color_scheme); - //g_MainToolbar->Show(b_reshow && g_bshowToolbar); + // g_MainToolbar->Show(b_reshow && g_bshowToolbar); } } @@ -7091,6 +7118,7 @@ ocpnToolBarSimple *MyFrame::CreateMasterToolbar() { if (g_bTrackActive) { g_MainToolbar->SetToolShortHelp(ID_TRACK, _("Disable Tracking")); } + g_MainToolbar->Realize(); return tb; } @@ -7633,7 +7661,6 @@ wxColor GetDimColor(wxColor c) { return wxColor(nrgb.red, nrgb.green, nrgb.blue); } - // A helper function to check for proper parameters of anchor // watch // @@ -7663,7 +7690,7 @@ double AnchorDistFix(double const d, double const AnchorPointMinDist, static const WORD MAX_CONSOLE_LINES = 500; // maximum mumber of lines the output console should have -//#ifdef _DEBUG +// #ifdef _DEBUG void RedirectIOToConsole() @@ -7716,7 +7743,7 @@ void RedirectIOToConsole() // ios::sync_with_stdio(); } -//#endif +// #endif #endif #ifdef __WXMSW__ @@ -8211,7 +8238,7 @@ void ApplyLocale() { } auto alert_dlg_active = - dynamic_cast(g_pais_alert_dialog_active); + dynamic_cast(g_pais_alert_dialog_active); if (alert_dlg_active) { alert_dlg_active->Destroy(); g_pais_alert_dialog_active = nullptr; @@ -8414,7 +8441,7 @@ void LoadS57() { pConfig->LoadS57Config(); ps52plib->SetPLIBColorScheme(global_color_scheme, ChartCtxFactory()); - if (gFrame){ + if (gFrame) { ps52plib->SetDisplayWidth(g_monitor_info[g_current_monitor].width); ps52plib->SetPPMM(g_BasePlatform->GetDisplayDPmm()); double dip_factor = g_BasePlatform->GetDisplayDIPMult(gFrame); @@ -8423,8 +8450,9 @@ void LoadS57() { } // preset S52 PLIB scale factors - ps52plib->SetScaleFactorExp(g_Platform->GetChartScaleFactorExp(g_ChartScaleFactor)); - ps52plib-> SetScaleFactorZoomMod(g_chart_zoom_modifier_vector); + ps52plib->SetScaleFactorExp( + g_Platform->GetChartScaleFactorExp(g_ChartScaleFactor)); + ps52plib->SetScaleFactorZoomMod(g_chart_zoom_modifier_vector); #ifdef ocpnUSE_GL @@ -8433,8 +8461,8 @@ void LoadS57() { extern GLenum g_texture_rectangle_format; extern OCPN_GLCaps *GL_Caps; - if (g_bopengl){ - if(GL_Caps){ + if (g_bopengl) { + if (GL_Caps) { wxString renderer = wxString(GL_Caps->Renderer.c_str()); ps52plib->SetGLRendererString(renderer); } @@ -8443,7 +8471,6 @@ void LoadS57() { glChartCanvas::s_b_useStencil, glChartCanvas::s_b_useStencilAP, glChartCanvas::s_b_useScissorTest, glChartCanvas::s_b_useFBO, g_b_EnableVBO, g_texture_rectangle_format, 1, 1); - } #endif @@ -8613,11 +8640,11 @@ void ParseAllENC(wxWindow *parent) { // prog->SetSize( sz ); DimeControl(prog); - #ifdef __WXOSX__ +#ifdef __WXOSX__ prog->ShowWindowModal(); - #else +#else prog->Show(); - #endif +#endif } // parse targets diff --git a/gui/src/ocpn_pixel.cpp b/gui/src/ocpn_pixel.cpp index f372e25625..34c3c9aa9c 100644 --- a/gui/src/ocpn_pixel.cpp +++ b/gui/src/ocpn_pixel.cpp @@ -86,7 +86,7 @@ // missing from mingw32 header #ifndef CLR_INVALID -#define CLR_INVALID ((COLORREF)-1) +#define CLR_INVALID ((COLORREF) - 1) #endif // no CLR_INVALID #ifdef ocpnUSE_ocpnBitmap diff --git a/gui/src/ocpn_print.cpp b/gui/src/ocpn_print.cpp index 8648dec70b..696232693d 100644 --- a/gui/src/ocpn_print.cpp +++ b/gui/src/ocpn_print.cpp @@ -35,9 +35,8 @@ extern MyFrame* gFrame; class ChartCanvas; ChartCanvas* GetFocusCanvas(); - bool MyPrintout::OnPrintPage(int page) { - wxDC *dc = GetDC(); + wxDC* dc = GetDC(); if (dc) { if (page == 1) DrawPageOne(dc); @@ -62,7 +61,7 @@ void MyPrintout::GetPageInfo(int* minPage, int* maxPage, int* selPageFrom, bool MyPrintout::HasPage(int pageNum) { return (pageNum == 1); } -void MyPrintout::DrawPageOne(wxDC *dc) { +void MyPrintout::DrawPageOne(wxDC* dc) { // Get the Size of the Chart Canvas int sx, sy; gFrame->GetFocusCanvas()->GetClientSize(&sx, &sy); // of the canvas @@ -129,10 +128,10 @@ void MyPrintout::GenerateGLbmp() { int gsx = gFrame->GetFocusCanvas()->GetglCanvas()->GetSize().x; int gsy = gFrame->GetFocusCanvas()->GetglCanvas()->GetSize().y; - unsigned char *buffer = (unsigned char *)malloc(gsx * gsy * 4); + unsigned char* buffer = (unsigned char*)malloc(gsx * gsy * 4); glReadPixels(0, 0, gsx, gsy, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - unsigned char *e = (unsigned char *)malloc(gsx * gsy * 3); + unsigned char* e = (unsigned char*)malloc(gsx * gsy * 3); if (buffer && e) { for (int p = 0; p < gsx * gsy; p++) { diff --git a/gui/src/ocpndc.cpp b/gui/src/ocpndc.cpp index 6e39dd3317..d5d1213bc9 100644 --- a/gui/src/ocpndc.cpp +++ b/gui/src/ocpndc.cpp @@ -78,7 +78,11 @@ extern GLint texture_2D_shader_program; //---------------------------------------------------------------------------- ocpnDC::ocpnDC(glChartCanvas &canvas) - : m_glchartCanvas(&canvas), m_glcanvas(NULL), dc(NULL), m_pen(wxNullPen), m_brush(wxNullBrush) { + : m_glchartCanvas(&canvas), + m_glcanvas(NULL), + dc(NULL), + m_pen(wxNullPen), + m_brush(wxNullBrush) { #if wxUSE_GRAPHICS_CONTEXT pgc = NULL; #endif @@ -89,7 +93,11 @@ ocpnDC::ocpnDC(glChartCanvas &canvas) } ocpnDC::ocpnDC(wxGLCanvas &canvas) - : m_glchartCanvas(NULL), m_glcanvas(&canvas), dc(NULL), m_pen(wxNullPen), m_brush(wxNullBrush) { + : m_glchartCanvas(NULL), + m_glcanvas(&canvas), + dc(NULL), + m_pen(wxNullPen), + m_brush(wxNullBrush) { #if wxUSE_GRAPHICS_CONTEXT pgc = NULL; #endif @@ -97,7 +105,11 @@ ocpnDC::ocpnDC(wxGLCanvas &canvas) } ocpnDC::ocpnDC(wxDC &pdc) - : m_glchartCanvas(NULL), m_glcanvas(NULL), dc(&pdc), m_pen(wxNullPen), m_brush(wxNullBrush) { + : m_glchartCanvas(NULL), + m_glcanvas(NULL), + dc(&pdc), + m_pen(wxNullPen), + m_brush(wxNullBrush) { #if wxUSE_GRAPHICS_CONTEXT pgc = NULL; wxMemoryDC *pmdc = wxDynamicCast(dc, wxMemoryDC); @@ -113,7 +125,11 @@ ocpnDC::ocpnDC(wxDC &pdc) } ocpnDC::ocpnDC() - : m_glchartCanvas(NULL), m_glcanvas(NULL), dc(NULL), m_pen(wxNullPen), m_brush(wxNullBrush) { + : m_glchartCanvas(NULL), + m_glcanvas(NULL), + dc(NULL), + m_pen(wxNullPen), + m_brush(wxNullBrush) { #if wxUSE_GRAPHICS_CONTEXT pgc = NULL; #endif @@ -136,7 +152,7 @@ ocpnDC::~ocpnDC() { #endif } -void ocpnDC::Init(){ +void ocpnDC::Init() { m_buseTex = GetLocaleCanonicalName().IsSameAs(_T("en_US")); workBuf = NULL; workBufSize = 0; @@ -160,7 +176,6 @@ void ocpnDC::Init(){ m_pcircle_filled_shader_program = NULL; m_ptexture_2D_shader_program = NULL; #endif - } #ifdef ocpnUSE_GL void ocpnDC::SetGLCanvas(glChartCanvas *canvas) { @@ -179,12 +194,10 @@ void ocpnDC::Clear() { if (m_glchartCanvas) { SetBrush(wxBrush(m_glchartCanvas->GetBackgroundColour())); m_glchartCanvas->GetSize(&w, &h); - } - else if (m_glcanvas) { + } else if (m_glcanvas) { SetBrush(wxBrush(m_glcanvas->GetBackgroundColour())); m_glcanvas->GetSize(&w, &h); - } - else + } else return; DrawRectangle(0, 0, w, h); @@ -259,11 +272,10 @@ void ocpnDC::GetSize(wxCoord *width, wxCoord *height) const { dc->GetSize(width, height); else { #ifdef ocpnUSE_GL - if (m_glchartCanvas){ + if (m_glchartCanvas) { *width = m_glchartCanvas->GetGLCanvasWidth(); *height = m_glchartCanvas->GetGLCanvasHeight(); - } - else if (m_glcanvas){ + } else if (m_glcanvas) { m_glcanvas->GetSize(width, height); } #endif @@ -346,7 +358,7 @@ void DrawEndCap(float x1, float y1, float t1, float angle) { // Draws a line between (x1,y1) - (x2,y2) with a start thickness of t1 void ocpnDC::DrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, - bool b_hiqual) { + bool b_hiqual) { #ifdef ocpnUSE_GL float angle = atan2f(y2 - y1, x2 - x1); @@ -356,29 +368,29 @@ void ocpnDC::DrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, // Set up the shader GLShaderProgram *shader; - if (m_glchartCanvas){ + if (m_glchartCanvas) { shader = pcolor_tri_shader_program[m_canvasIndex]; shader->Bind(); // Assuming here that transform matrix for this shader is preset for canvas. - //shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); - } - else{ + // shader->SetUniformMatrix4fv("MVMatrix", (GLfloat + // *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + } else { shader = m_pcolor_tri_shader_program; shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (float *)&(m_vp.vp_matrix_transform)); + shader->SetUniformMatrix4fv("MVMatrix", + (float *)&(m_vp.vp_matrix_transform)); } - wxColor c = pen.GetColour(); - float colorv[4]; - colorv[0] = c.Red() / float(256); - colorv[1] = c.Green() / float(256); - colorv[2] = c.Blue() / float(256); - colorv[3] = c.Alpha() / float(256); - shader->SetUniform4fv("color", colorv); - - float vert[12]; - shader->SetAttributePointerf("position", vert); + wxColor c = pen.GetColour(); + float colorv[4]; + colorv[0] = c.Red() / float(256); + colorv[1] = c.Green() / float(256); + colorv[2] = c.Blue() / float(256); + colorv[3] = c.Alpha() / float(256); + shader->SetUniform4fv("color", colorv); + float vert[12]; + shader->SetAttributePointerf("position", vert); // n.b. The dwxDash interpretation for GL only allows for 2 elements in // the dash table. The first is assumed drawn, second is assumed space @@ -445,7 +457,6 @@ void ocpnDC::DrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, vert[10] = x1 + t2sina1; vert[11] = y1 - t2cosa1; - glDrawArrays(GL_TRIANGLES, 0, 6); /* wx draws a nice rounded end in dc mode, so replicate @@ -459,7 +470,6 @@ void ocpnDC::DrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, } shader->UnBind(); - #endif } @@ -507,7 +517,7 @@ void ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, if (b_draw_thick) DrawGLThickLine(x1, y1, x2, y2, m_pen, b_hiqual); else { -#if 0 // Use AA lines +#if 0 // Use AA lines GLShaderProgram *shader = pAALine_shader_program[m_canvasIndex]; shader->Bind(); @@ -590,16 +600,18 @@ void ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, #else GLShaderProgram *shader; - if (m_glchartCanvas){ + if (m_glchartCanvas) { shader = pcolor_tri_shader_program[m_canvasIndex]; shader->Bind(); - // Assuming here that transform matrix for this shader is preset for canvas. - //shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); - } - else{ + // Assuming here that transform matrix for this shader is preset for + // canvas. + // shader->SetUniformMatrix4fv("MVMatrix", (GLfloat + // *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + } else { shader = m_pcolor_tri_shader_program; shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (float *)&(m_vp.vp_matrix_transform)); + shader->SetUniformMatrix4fv("MVMatrix", + (float *)&(m_vp.vp_matrix_transform)); } float colorv[4]; @@ -615,7 +627,6 @@ void ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, float fBuf[4]; shader->SetAttributePointerf("position", fBuf); - wxDash *dashes; int n_dashes = m_pen.GetDashes(&dashes); if (n_dashes) { @@ -633,7 +644,7 @@ void ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, ldraw = wxMax(ldraw, 4.0); lspace = wxMax(lspace, 4.0); - //lpix = wxMin(lpix, 2000.0); + // lpix = wxMin(lpix, 2000.0); while (lrun < lpix) { // Dash @@ -669,7 +680,6 @@ void ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, shader->UnBind(); #endif - } #else @@ -684,10 +694,9 @@ void ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, #endif } - // Draws thick lines from triangles -void ocpnDC::DrawGLThickLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, - wxPen pen, bool b_hiqual) { +void ocpnDC::DrawGLThickLines(int n, wxPoint points[], wxCoord xoffset, + wxCoord yoffset, wxPen pen, bool b_hiqual) { #ifdef ocpnUSE_GL if (n < 2) return; @@ -767,7 +776,7 @@ void ocpnDC::DrawLines(int n, wxPoint points[], wxCoord xoffset, workBuf[(i * 2) + 1] = points[i].y + yoffset; } -#if 0 // Use AA lines +#if 0 // Use AA lines GLShaderProgram *shader = pAALine_shader_program[m_canvasIndex]; shader->Bind(); @@ -797,37 +806,37 @@ void ocpnDC::DrawLines(int n, wxPoint points[], wxCoord xoffset, shader->UnBind(); #else - GLShaderProgram *shader; - if (m_glchartCanvas){ - shader = pcolor_tri_shader_program[m_canvasIndex]; - shader->Bind(); - // Assuming here that transform matrix for this shader is preset for canvas. - //shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); - } - else{ - shader = m_pcolor_tri_shader_program; - shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (float *)&(m_vp.vp_matrix_transform)); - } - + GLShaderProgram *shader; + if (m_glchartCanvas) { + shader = pcolor_tri_shader_program[m_canvasIndex]; + shader->Bind(); + // Assuming here that transform matrix for this shader is preset for + // canvas. + // shader->SetUniformMatrix4fv("MVMatrix", (GLfloat + // *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + } else { + shader = m_pcolor_tri_shader_program; + shader->Bind(); + shader->SetUniformMatrix4fv("MVMatrix", + (float *)&(m_vp.vp_matrix_transform)); + } - float colorv[4]; - colorv[0] = m_pen.GetColour().Red() / float(256); - colorv[1] = m_pen.GetColour().Green() / float(256); - colorv[2] = m_pen.GetColour().Blue() / float(256); - colorv[3] = 1.0; + float colorv[4]; + colorv[0] = m_pen.GetColour().Red() / float(256); + colorv[1] = m_pen.GetColour().Green() / float(256); + colorv[2] = m_pen.GetColour().Blue() / float(256); + colorv[3] = 1.0; - shader->SetUniform4fv("color", colorv); + shader->SetUniform4fv("color", colorv); - shader->SetAttributePointerf("position", workBuf); + shader->SetAttributePointerf("position", workBuf); - glDrawArrays(GL_LINE_STRIP, 0, n); + glDrawArrays(GL_LINE_STRIP, 0, n); - shader->UnBind(); + shader->UnBind(); #endif - if (b_hiqual) { glDisable(GL_LINE_STIPPLE); glDisable(GL_LINE_SMOOTH); @@ -956,8 +965,7 @@ void ocpnDC::DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, if (dc) dc->DrawRoundedRectangle(x, y, w, h, r); #ifdef ocpnUSE_GL else { - if (!m_glchartCanvas) - return; + if (!m_glchartCanvas) return; r++; int steps = ceil(sqrt((float)r)); @@ -969,7 +977,7 @@ void ocpnDC::DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, ConfigurePen(); // Grow the work buffer as necessary - size_t bufReq = (steps+1) * 8 * 2; // large, to be sure + size_t bufReq = (steps + 1) * 8 * 2; // large, to be sure if (workBufSize < bufReq) { workBuf = (float *)realloc(workBuf, bufReq * sizeof(float)); @@ -1008,11 +1016,12 @@ void ocpnDC::DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, Q[3][1] = yoffset; mat4x4 X; - mat4x4_mul( - X, (float(*)[4])m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform, Q); + mat4x4_mul(X, + (float(*)[4])m_glchartCanvas->m_pParentCanvas->GetpVP() + ->vp_matrix_transform, + Q); shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)X); - shader->SetAttributePointerf("position", workBuf); // Perform the actual drawing. @@ -1055,20 +1064,21 @@ void ocpnDC::DrawCircle(wxCoord x, wxCoord y, wxCoord radius) { coords[7] = y - radius; GLShaderProgram *shader; - if (m_glchartCanvas){ + if (m_glchartCanvas) { shader = pcircle_filled_shader_program[m_canvasIndex]; shader->Bind(); // Assuming here that transform matrix for this shader is preset for canvas. - //shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); - } - else{ + // shader->SetUniformMatrix4fv("MVMatrix", (GLfloat + // *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + } else { shader = m_pcircle_filled_shader_program; shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (float *)&(m_vp.vp_matrix_transform)); + shader->SetUniformMatrix4fv("MVMatrix", + (float *)&(m_vp.vp_matrix_transform)); } -// GLShaderProgram *shader = pcircle_filled_shader_program[m_canvasIndex]; -// shader->Bind(); + // GLShaderProgram *shader = pcircle_filled_shader_program[m_canvasIndex]; + // shader->Bind(); shader->SetUniform1f("circle_radius", radius); @@ -1080,7 +1090,7 @@ void ocpnDC::DrawCircle(wxCoord x, wxCoord y, wxCoord radius) { ctrv[1] = height - y; shader->SetUniform2fv("circle_center", ctrv); - // Circle color + // Circle color float colorv[4]; if (m_brush.IsOk()) { colorv[0] = m_brush.GetColour().Red() / float(256); @@ -1159,7 +1169,6 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, if (dc) dc->DrawPolygon(n, points, xoffset, yoffset); #ifdef ocpnUSE_GL else { - #ifdef __WXQT__ SetGLAttrs(false); // Some QT platforms (Android) have trouble with // GL_BLEND / GL_LINE_SMOOTH @@ -1170,19 +1179,19 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, // Prepare the line rendering shader GLShaderProgram *line_shader; - float* mvmatrix; + float *mvmatrix; - if(m_glchartCanvas){ + if (m_glchartCanvas) { line_shader = pAALine_shader_program[m_canvasIndex]; - mvmatrix = (float *)&(m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); - } - else{ + mvmatrix = (float *)&( + m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + } else { line_shader = m_pAALine_shader_program; mvmatrix = (float *)&(m_vp.vp_matrix_transform); } { - //GLShaderProgram *shader = pAALine_shader_program[m_canvasIndex]; + // GLShaderProgram *shader = pAALine_shader_program[m_canvasIndex]; line_shader->Bind(); line_shader->SetUniform1f("uLineWidth", m_pen.GetWidth()); @@ -1205,7 +1214,7 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, line_shader->SetUniform4fv("color", colorv); - //shader->SetAttributePointerf("position", workBuf); + // shader->SetAttributePointerf("position", workBuf); // Rotate mat4x4 I, Q; @@ -1218,7 +1227,9 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, mat4x4 X; mat4x4_mul( - X, (float(*)[4])mvmatrix, //m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform, + X, + (float(*)[4]) + mvmatrix, // m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform, Q); line_shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)X); @@ -1249,8 +1260,9 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, glDrawArrays(GL_LINE_LOOP, 0, n); // Restore the default matrix - //TODO This will not work for multicanvas - //shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + // TODO This will not work for multicanvas + // shader->SetUniformMatrix4fv("MVMatrix", (GLfloat + // *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); line_shader->UnBind(); @@ -1269,13 +1281,13 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, // Draw the triangle fill GLShaderProgram *shader; - float* mvmatrix; + float *mvmatrix; - if(m_glchartCanvas){ + if (m_glchartCanvas) { shader = pcolor_tri_shader_program[m_canvasIndex]; - mvmatrix = (float *)&(m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); - } - else{ + mvmatrix = (float *)&( + m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + } else { shader = m_pcolor_tri_shader_program; mvmatrix = (float *)&(m_vp.vp_matrix_transform); } @@ -1293,7 +1305,6 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, mat4x4_mul(X, (float(*)[4])mvmatrix, Q); shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)X); - // Fill color float bcolorv[4]; bcolorv[0] = m_brush.GetColour().Red() / float(256); @@ -1320,8 +1331,10 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, } // Restore the default glCanvas matrix - if (m_glchartCanvas){ - shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + if (m_glchartCanvas) { + shader->SetUniformMatrix4fv( + "MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP() + ->vp_matrix_transform); } shader->UnBind(); @@ -1341,8 +1354,9 @@ void ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, glDrawArrays(GL_LINE_LOOP, 0, n); // Restore the default matrix - //TODO This will not work for multicanvas - //shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + // TODO This will not work for multicanvas + // shader->SetUniformMatrix4fv("MVMatrix", (GLfloat + // *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); line_shader->UnBind(); } @@ -1437,20 +1451,18 @@ void odc_endCallbackD_GLSL(void *data) { shader->UnBind(); - #endif } #endif -#endif //#ifdef ocpnUSE_GL +#endif // #ifdef ocpnUSE_GL void ocpnDC::DrawPolygonTessellated(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { if (dc) dc->DrawPolygon(n, points, xoffset, yoffset); #ifdef ocpnUSE_GL else { - if (!m_glchartCanvas) - return; + if (!m_glchartCanvas) return; #if !defined(ocpnUSE_GLES) || \ defined(USE_ANDROID_GLES2) // tessalator in glues is broken @@ -1482,7 +1494,8 @@ void ocpnDC::DrawPolygonTessellated(int n, wxPoint points[], wxCoord xoffset, gluTessBeginPolygon(m_tobj, this); gluTessBeginContour(m_tobj); - ViewPort *pvp = m_glchartCanvas->m_pParentCanvas->GetpVP(); //gFrame->GetPrimaryCanvas()->GetpVP(); + ViewPort *pvp = m_glchartCanvas->m_pParentCanvas + ->GetpVP(); // gFrame->GetPrimaryCanvas()->GetpVP(); for (int i = 0; i < n; i++) { double *p = new double[6]; @@ -1515,8 +1528,7 @@ void ocpnDC::DrawPolygonTessellated(int n, wxPoint points[], wxCoord xoffset, // odc_combine_work_data.clear(); } #else - - } + } #endif #endif @@ -1611,7 +1623,7 @@ void ocpnDC::DrawBitmap(const wxBitmap &bitmap, wxCoord x, wxCoord y, glColor4f(1, 1, 1, 1); GLDrawBlendData(x, y, w, h, GL_RGBA, e); - delete[](e); + delete[] (e); } else { glRasterPos2i(x, y); glPixelZoom(1, -1); /* draw data from top to bottom */ @@ -1631,9 +1643,10 @@ void ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y, float angle) { wxCoord w = 0; wxCoord h = 0; - //FIXME Dave Re-enable, and fix rotation logic. - if (0/*m_buseTex*/) { - m_texfont.Build(m_font, 1.0, m_dpi_factor); // make sure the font is ready + // FIXME Dave Re-enable, and fix rotation logic. + if (0 /*m_buseTex*/) { + m_texfont.Build(m_font, 1.0, + m_dpi_factor); // make sure the font is ready m_texfont.GetTextExtent(text, &w, &h); m_texfont.SetColor(m_textforegroundcolour); @@ -1651,7 +1664,7 @@ void ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y, float angle) { wxScreenDC sdc; sdc.SetFont(m_font); sdc.GetTextExtent(text, &w, &h, NULL, NULL, &m_font); - if(w && h){ + if (w && h) { /* create bitmap of appropriate size and select it */ wxBitmap bmp(w, h); wxMemoryDC temp_dc; @@ -1712,7 +1725,7 @@ void ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y, float angle) { int TextureWidth = NextPow2(w); int TextureHeight = NextPow2(h); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TextureWidth, TextureHeight, 0, - GL_RGBA, GL_UNSIGNED_BYTE, NULL); + GL_RGBA, GL_UNSIGNED_BYTE, NULL); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, data); @@ -1747,19 +1760,21 @@ void ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y, float angle) { // Set up the shader GLShaderProgram *shader; - if (m_glchartCanvas){ + if (m_glchartCanvas) { shader = ptexture_2D_shader_program[m_canvasIndex]; shader->Bind(); - // Assuming here that transform matrix for this shader is preset for canvas. - //shader->SetUniformMatrix4fv("MVMatrix", (GLfloat *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); - } - else{ + // Assuming here that transform matrix for this shader is preset for + // canvas. + // shader->SetUniformMatrix4fv("MVMatrix", (GLfloat + // *)m_glchartCanvas->m_pParentCanvas->GetpVP()->vp_matrix_transform); + } else { shader = m_ptexture_2D_shader_program; shader->Bind(); - shader->SetUniformMatrix4fv("MVMatrix", (float *)&(m_vp.vp_matrix_transform)); + shader->SetUniformMatrix4fv("MVMatrix", + (float *)&(m_vp.vp_matrix_transform)); } - // Set up the texture sampler to texture unit 0 + // Set up the texture sampler to texture unit 0 shader->SetUniform1i("uTex", 0); // Rotate @@ -1776,12 +1791,10 @@ void ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y, float angle) { float co1[8]; float tco1[8]; + // Perform the actual drawing. - - // Perform the actual drawing. - - // For some reason, glDrawElements is busted on Android - // So we do this a hard ugly way, drawing two triangles... + // For some reason, glDrawElements is busted on Android + // So we do this a hard ugly way, drawing two triangles... co1[0] = coords[0]; co1[1] = coords[1]; co1[2] = coords[2]; @@ -1807,7 +1820,6 @@ void ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y, float angle) { shader->UnBind(); - glDisable(GL_BLEND); glDisable(GL_TEXTURE_2D); @@ -1832,8 +1844,8 @@ void ocpnDC::GetTextExtent(const wxString &string, wxCoord *w, wxCoord *h, wxFont f = m_font; if (font) f = *font; - //FIXME Dave Re-enable, and fix rotation logic. - if (0/*m_buseTex*/) { + // FIXME Dave Re-enable, and fix rotation logic. + if (0 /*m_buseTex*/) { #ifdef ocpnUSE_GL m_texfont.Build(f, 1.0, m_dpi_factor); // make sure the font is ready m_texfont.GetTextExtent(string, w, h); @@ -1902,12 +1914,11 @@ void ocpnDC::GLDrawBlendData(wxCoord x, wxCoord y, wxCoord w, wxCoord h, #endif } -void ocpnDC::SetVP(ViewPort vp){ +void ocpnDC::SetVP(ViewPort vp) { m_vp = vp; // If not in DC mode, simply return - if (!m_glchartCanvas && !m_glcanvas) - return; + if (!m_glchartCanvas && !m_glcanvas) return; #ifdef ocpnUSE_GL // Otherwise, prepare local shaders m_vp.SetVPTransformMatrix(); @@ -1918,7 +1929,6 @@ void ocpnDC::SetVP(ViewPort vp){ mat4x4 I; mat4x4_identity(I); - if (m_pcolor_tri_shader_program) { m_pcolor_tri_shader_program->Bind(); m_pcolor_tri_shader_program->SetUniformMatrix4fv( @@ -1956,25 +1966,23 @@ void ocpnDC::SetVP(ViewPort vp){ #endif } - #ifdef ocpnUSE_GL -// Private shaders, used when drawing to a context which is not a glChartCanvas (i.e. radar_pi) +// Private shaders, used when drawing to a context which is not a glChartCanvas +// (i.e. radar_pi) #ifdef USE_ANDROID_GLES2 -const GLchar* odc_preamble = -"\n"; +const GLchar *odc_preamble = "\n"; #else -const GLchar* odc_preamble = -"#version 120\n" -"#define precision\n" -"#define lowp\n" -"#define mediump\n" -"#define highp\n"; +const GLchar *odc_preamble = + "#version 120\n" + "#define precision\n" + "#define lowp\n" + "#define mediump\n" + "#define highp\n"; #endif - // Simple colored triangle shader -static const GLchar* odc_color_tri_vertex_shader_source = +static const GLchar *odc_color_tri_vertex_shader_source = "attribute vec2 position;\n" "uniform mat4 MVMatrix;\n" "uniform mat4 TransformMatrix;\n" @@ -1985,29 +1993,28 @@ static const GLchar* odc_color_tri_vertex_shader_source = " gl_Position = MVMatrix * TransformMatrix * vec4(position, 0.0, 1.0);\n" "}\n"; -static const GLchar* odc_color_tri_fragment_shader_source = +static const GLchar *odc_color_tri_fragment_shader_source = "precision lowp float;\n" "varying vec4 fragColor;\n" "void main() {\n" " gl_FragColor = fragColor;\n" "}\n"; -static const GLchar* odc_AALine_vertex_shader_source = +static const GLchar *odc_AALine_vertex_shader_source = "uniform vec2 uViewPort; //Width and Height of the viewport\n" "varying vec2 vLineCenter;\n" "attribute vec2 position;\n" "uniform mat4 MVMatrix;\n" "uniform mat4 TransformMatrix;\n" - "void main()\n" - "{\n" - " vec4 pp = MVMatrix * vec4(position, 0.0, 1.0);\n" - " gl_Position = pp;\n" - " vec2 vp = uViewPort;\n" - " vLineCenter = 0.5*(pp.xy + vec2(1, 1))*vp;\n" - "}\n"; - + "void main()\n" + "{\n" + " vec4 pp = MVMatrix * vec4(position, 0.0, 1.0);\n" + " gl_Position = pp;\n" + " vec2 vp = uViewPort;\n" + " vLineCenter = 0.5*(pp.xy + vec2(1, 1))*vp;\n" + "}\n"; -static const GLchar* odc_AALine_fragment_shader_source = +static const GLchar *odc_AALine_fragment_shader_source = "precision mediump float;\n" "uniform float uLineWidth;\n" "uniform vec4 color;\n" @@ -2030,7 +2037,7 @@ static const GLchar* odc_AALine_fragment_shader_source = "}\n"; // Circle shader -static const GLchar* odc_circle_filled_vertex_shader_source = +static const GLchar *odc_circle_filled_vertex_shader_source = "precision highp float;\n" "attribute vec2 aPos;\n" "uniform mat4 MVMatrix;\n" @@ -2039,7 +2046,7 @@ static const GLchar* odc_circle_filled_vertex_shader_source = " gl_Position = MVMatrix * TransformMatrix * vec4(aPos, 0.0, 1.0);\n" "}\n"; -static const GLchar* odc_circle_filled_fragment_shader_source = +static const GLchar *odc_circle_filled_fragment_shader_source = "precision highp float;\n" "uniform float border_width;\n" "uniform float circle_radius;\n" @@ -2054,7 +2061,7 @@ static const GLchar* odc_circle_filled_fragment_shader_source = "}\n"; // Simple 2D texture shader -static const GLchar* odc_texture_2D_vertex_shader_source = +static const GLchar *odc_texture_2D_vertex_shader_source = "attribute vec2 aPos;\n" "attribute vec2 aUV;\n" "uniform mat4 MVMatrix;\n" @@ -2065,7 +2072,7 @@ static const GLchar* odc_texture_2D_vertex_shader_source = " varCoord = aUV;\n" "}\n"; -static const GLchar* odc_texture_2D_fragment_shader_source = +static const GLchar *odc_texture_2D_fragment_shader_source = "precision lowp float;\n" "uniform sampler2D uTex;\n" "varying vec2 varCoord;\n" @@ -2074,49 +2081,51 @@ static const GLchar* odc_texture_2D_fragment_shader_source = "}\n"; #ifdef ocpnUSE_GL -void ocpnDC::BuildShaders(){ - +void ocpnDC::BuildShaders() { // Simple colored triangle shader if (!m_pcolor_tri_shader_program) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(odc_color_tri_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(odc_color_tri_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(odc_color_tri_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(odc_color_tri_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); - if (shaderProgram->isOK()) - m_pcolor_tri_shader_program = shaderProgram; + if (shaderProgram->isOK()) m_pcolor_tri_shader_program = shaderProgram; } if (!m_pAALine_shader_program) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(odc_AALine_fragment_shader_source, GL_FRAGMENT_SHADER); - shaderProgram->addShaderFromSource(odc_AALine_vertex_shader_source, GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(odc_AALine_fragment_shader_source, + GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(odc_AALine_vertex_shader_source, + GL_VERTEX_SHADER); shaderProgram->linkProgram(); - if (shaderProgram->isOK()) - m_pAALine_shader_program = shaderProgram; + if (shaderProgram->isOK()) m_pAALine_shader_program = shaderProgram; } if (!m_pcircle_filled_shader_program) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(odc_circle_filled_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(odc_circle_filled_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(odc_circle_filled_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(odc_circle_filled_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); - if (shaderProgram->isOK()) - m_pcircle_filled_shader_program = shaderProgram; + if (shaderProgram->isOK()) m_pcircle_filled_shader_program = shaderProgram; } if (!m_ptexture_2D_shader_program) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(odc_texture_2D_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(odc_texture_2D_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(odc_texture_2D_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(odc_texture_2D_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); - if (shaderProgram->isOK()) - m_ptexture_2D_shader_program = shaderProgram; + if (shaderProgram->isOK()) m_ptexture_2D_shader_program = shaderProgram; } - } #endif -#endif \ No newline at end of file +#endif diff --git a/gui/src/options.cpp b/gui/src/options.cpp index 2796ea4c56..148f757cc9 100644 --- a/gui/src/options.cpp +++ b/gui/src/options.cpp @@ -68,6 +68,10 @@ #include #endif +#ifdef __WXGTK__ +#include "ocpn_fontdlg.h" +#endif + #include "config.h" #include "model/ais_decoder.h" @@ -114,7 +118,6 @@ extern GLuint g_raster_format; #endif - #ifdef __linux__ #include "udev_rule_mgr.h" #endif @@ -128,13 +131,13 @@ extern GLuint g_raster_format; #endif #ifdef __WXOSX__ - #if wxCHECK_VERSION(3,2,0) - #define SLIDER_STYLE wxSL_HORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS - #else - #define SLIDER_STYLE wxSL_HORIZONTAL | wxSL_AUTOTICKS - #endif +#if wxCHECK_VERSION(3, 2, 0) +#define SLIDER_STYLE wxSL_HORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS #else - #define SLIDER_STYLE wxSL_HORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS +#define SLIDER_STYLE wxSL_HORIZONTAL | wxSL_AUTOTICKS +#endif +#else +#define SLIDER_STYLE wxSL_HORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS #endif wxString GetOCPNKnownLanguage(const wxString lang_canonical, @@ -396,8 +399,7 @@ void prepareSlider(wxSlider* slider) { // sort callback for Connections list Sort by priority. int wxCALLBACK SortConnectionOnPriority(wxIntPtr item1, wxIntPtr item2, - wxIntPtr list) -{ + wxIntPtr list) { wxListCtrl* lc = reinterpret_cast(list); wxListItem it1, it2; @@ -581,9 +583,11 @@ void OCPNChartDirPanel::SetSelected(bool selected) { m_bSelected = selected; if (selected) { - m_boxColour = wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT); + m_boxColour = + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT); } else { - m_boxColour = wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW); + m_boxColour = + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW); } Refresh(true); @@ -640,7 +644,8 @@ void OCPNChartDirPanel::OnPaint(wxPaintEvent& event) { wxFont* dFont = GetOCPNScaledFont_PlugIn(_("Dialog")); dc.SetFont(*dFont); - dc.SetTextForeground(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOWTEXT)); + dc.SetTextForeground( + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOWTEXT)); int yd = height * 20 / 100; for (size_t i = 0; i < nameWrapped.GetCount(); i++) { @@ -654,7 +659,9 @@ void OCPNChartDirPanel::OnPaint(wxPaintEvent& event) { else { dc.SetBrush(wxBrush(m_boxColour)); - dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOWFRAME), 1)); + dc.SetPen(wxPen( + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOWFRAME), + 1)); int offset = height / 10; dc.DrawRoundedRectangle(offset, offset, width - (2 * offset), @@ -665,7 +672,8 @@ void OCPNChartDirPanel::OnPaint(wxPaintEvent& event) { wxFont* dFont = GetOCPNScaledFont_PlugIn(_("Dialog")); dc.SetFont(*dFont); - dc.SetTextForeground(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOWTEXT)); + dc.SetTextForeground( + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOWTEXT)); int yd = height * 20 / 100; for (size_t i = 0; i < nameWrapped.GetCount(); i++) { @@ -681,7 +689,6 @@ void OCPNChartDirPanel::OnPaint(wxPaintEvent& event) { ///////////////////////////////////////////////////////////////////////////////////// - static bool LoadAllPlugIns(bool load_enabled) { g_Platform->ShowBusySpinner(); bool b = PluginLoader::getInstance()->LoadAllPlugIns(load_enabled); @@ -1351,7 +1358,7 @@ void MMSI_Props_Panel::UpdateMMSIList(void) { void MMSI_Props_Panel::SetColorScheme(ColorScheme cs) { DimeControl(this); } // WX_DECLARE_OBJARRAY(wxBitmap, ArrayOfBitmaps); -//#include +// #include // WX_DEFINE_OBJARRAY(ArrayOfBitmaps); class OCPNFatCombo : public wxOwnerDrawnComboBox { @@ -1492,7 +1499,7 @@ END_EVENT_TABLE() options::options(wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style) - : pTrackRotateTime(0) { + : pTrackRotateTime(0) { Init(); pParent = parent; @@ -1503,7 +1510,7 @@ options::options(wxWindow* parent, wxWindowID id, const wxString& caption, SetFont(*dialogFont); CreateControls(); - RecalculateSize( size.x, size.y); + RecalculateSize(size.x, size.y); wxDEFINE_EVENT(EVT_COMPAT_OS_CHANGE, wxCommandEvent); GlobalVar compat_os(&g_compatOS); @@ -1512,8 +1519,9 @@ options::options(wxWindow* parent, wxWindowID id, const wxString& caption, PluginLoader::getInstance()->LoadAllPlugIns(false); m_pPlugInCtrl->ReloadPluginPanels(); }); - auto action = [&](wxCommandEvent &evt) { - g_persist_active_route = m_persist_active_route_chkbox->IsChecked(); }; + auto action = [&](wxCommandEvent& evt) { + g_persist_active_route = m_persist_active_route_chkbox->IsChecked(); + }; m_persist_active_route_chkbox->Bind(wxEVT_CHECKBOX, action); m_persist_active_route_chkbox->SetValue(g_persist_active_route); } @@ -1553,18 +1561,16 @@ void options::RecalculateSize(int hint_x, int hint_y) { // Protect against unreasonable small size // And also handle the empty config file init case. - if ((hint_x < 200) || (hint_y < 200)){ - + if ((hint_x < 200) || (hint_y < 200)) { // Constrain size on small displays int display_width, display_height; display_width = g_monitor_info[g_current_monitor].width; display_height = g_monitor_info[g_current_monitor].height; - if(display_height < 600){ - SetSize(wxSize(GetOCPNCanvasWindow()->GetSize() )); - } - else { - vectorPanel-> SetSizeHints(ps57Ctl); + if (display_height < 600) { + SetSize(wxSize(GetOCPNCanvasWindow()->GetSize())); + } else { + vectorPanel->SetSizeHints(ps57Ctl); Fit(); } } @@ -1655,7 +1661,6 @@ void options::Init(void) { m_pagePlugins = -1; m_pageConnections = -1; - auto loader = PluginLoader::getInstance(); b_haveWMM = loader && loader->IsPlugInAvailable(_T("WMM")); b_oldhaveWMM = b_haveWMM; @@ -1672,8 +1677,8 @@ void options::Init(void) { m_PluginCatalogMgrPanel = NULL; m_pNMEAForm = NULL; - //FIXME Do this in CTOR of connections dialog - //mSelectedConnection = NULL; + // FIXME Do this in CTOR of connections dialog + // mSelectedConnection = NULL; #ifdef __ANDROID__ m_scrollRate = 1; @@ -1699,7 +1704,7 @@ void options::Init(void) { dc.GetTextExtent(_T("H"), &width, &height, NULL, NULL, dialogFont); m_colourPickerDefaultSize = - wxSize(4 * height, height* 2 * OCPN_GetWinDIPScaleFactor()); + wxSize(4 * height, height * 2 * OCPN_GetWinDIPScaleFactor()); m_bcompact = false; @@ -1711,12 +1716,11 @@ void options::Init(void) { if (dsizemm < 80) // Probably and Android Phone, portrait mode m_bcompact = true; - auto sound_action = [] (ObservedEvt ev) { + auto sound_action = [](ObservedEvt ev) { auto sound = static_cast(ev.GetClientData()); delete sound; }; m_sound_done_listener.Init(m_on_sound_done, sound_action); - } #if defined(__GNUC__) && __GNUC__ < 8 @@ -1861,7 +1865,6 @@ void options::CreatePanel_NMEA(size_t parent, int border_size, comm_dialog = std::make_shared(m_pNMEAForm, this); } - void options::CreatePanel_Ownship(size_t parent, int border_size, int group_item_spacing) { itemPanelShip = AddPage(parent, _("Own ship")); @@ -1979,7 +1982,8 @@ void options::CreatePanel_Ownship(size_t parent, int border_size, new wxStaticText(itemPanelShip, wxID_STATIC, _("Distance Unit")); radarGrid->Add(unitText, 1, wxEXPAND | wxALL, group_item_spacing); - wxString pDistUnitsStrings[] = {_("Nautical miles"), _("Kilometers"), _("Minutes (time)")}; + wxString pDistUnitsStrings[] = {_("Nautical miles"), _("Kilometers"), + _("Minutes (time)")}; m_itemRadarRingsUnits = new wxChoice(itemPanelShip, ID_RADARDISTUNIT, wxDefaultPosition, m_pShipIconType->GetSize(), 3, pDistUnitsStrings); @@ -2010,9 +2014,8 @@ void options::CreatePanel_Ownship(size_t parent, int border_size, shipToActiveGrid->Add(shipToActiveText1, 1, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, border_size); - wxString LineStyleChoices[] = {_("Default"), _("Solid"), - _("Dot"), _("Long dash"), - _("Short dash")}; + wxString LineStyleChoices[] = {_("Default"), _("Solid"), _("Dot"), + _("Long dash"), _("Short dash")}; int LineStyleNChoices = sizeof(LineStyleChoices) / sizeof(wxString); m_shipToActiveStyle = new wxChoice(itemPanelShip, wxID_ANY, wxDefaultPosition, wxDefaultSize, @@ -2027,9 +2030,9 @@ void options::CreatePanel_Ownship(size_t parent, int border_size, wxString m_LineColorChoices[] = { _("Default color"), _("Black"), _("Dark Red"), _("Dark Green"), - _("Dark Yellow"), _("Dark Blue"), _("Dark Magenta"), _("Dark Cyan"), - _("Light Gray"), _("Dark Gray"), _("Red"), _("Green"), - _("Yellow"), _("Blue"), _("Magenta"), _("Cyan"), + _("Dark Yellow"), _("Dark Blue"), _("Dark Magenta"), _("Dark Cyan"), + _("Light Gray"), _("Dark Gray"), _("Red"), _("Green"), + _("Yellow"), _("Blue"), _("Magenta"), _("Cyan"), _("White")}; int LineColorNChoices = sizeof(m_LineColorChoices) / sizeof(wxString); m_shipToActiveColor = @@ -2138,7 +2141,7 @@ void options::CreatePanel_Ownship(size_t parent, int border_size, dispOwnShipCalcOptionsGrid->AddGrowableCol(1); -pSogCogFromLLCheckBox = + pSogCogFromLLCheckBox = new wxCheckBox(itemPanelShip, ID_SOGCOGFROMLLCHECKBOX, _("Calculate SOG and COG from position changes")); dispOwnShipCalcOptionsGrid->Add(pSogCogFromLLCheckBox, 1, wxALL, 5); @@ -2184,8 +2187,8 @@ void options::CreatePanel_Routes(size_t parent, int border_size, new wxStaticBoxSizer(activeRouteText, wxVERTICAL); m_persist_active_route_chkbox = new wxCheckBox( - itemPanelRoutes, wxID_ANY, - _("Persist active route, automatically activate on start up")); + itemPanelRoutes, wxID_ANY, + _("Persist active route, automatically activate on start up")); activeRouteSizer->Add(m_persist_active_route_chkbox, 0, wxALL, 5); Routes->Add(activeRouteSizer, 0, wxGROW | wxALL, border_size); @@ -2540,7 +2543,6 @@ void options::CreatePanel_ChartsLoad(size_t parent, int border_size, UpdateChartDirList(); chartPanel->Layout(); - } void options::UpdateChartDirList() { @@ -2865,7 +2867,8 @@ void options::OnConfigMouseSelected(wxMouseEvent& event) { wxPanel* panel = wxDynamicCast(win, wxPanel); if (panel) { if (panel == selectedPanel) { - panel->SetBackgroundColour(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT)); + panel->SetBackgroundColour(wxSystemSettings::GetColour( + wxSystemColour::wxSYS_COLOUR_HIGHLIGHT)); ConfigPanel* cPanel = wxDynamicCast(panel, ConfigPanel); if (cPanel) m_selectedConfigPanelGUID = cPanel->GetConfigGUID(); } else @@ -2931,7 +2934,7 @@ void options::CreatePanel_Advanced(size_t parent, int border_size, #endif itemBoxSizerUI->Add(0, border_size * 3); itemBoxSizerUI->Add(0, border_size * 3); -#endif // ocpnUSE_GL +#endif // ocpnUSE_GL // Course Up display update period wxStaticText* crat = new wxStaticText(m_ChartDisplayPage, wxID_ANY, @@ -3038,6 +3041,17 @@ void options::CreatePanel_Advanced(size_t parent, int border_size, pmmRow->Add(new wxStaticText(m_ChartDisplayPage, wxID_ANY, _("mm")), inputFlags); + // ChartBar Options + itemBoxSizerUI->Add( + new wxStaticText(m_ChartDisplayPage, wxID_ANY, _("Chart Bar")), + labelFlags); + wxBoxSizer* ChartBarSizer = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizerUI->Add(ChartBarSizer, 0, 0, 0); + + pChartBarEX = new wxCheckBox(m_ChartDisplayPage, -1, + _("Show extended chart bar information.")); + ChartBarSizer->Add(pChartBarEX, inputFlags); + pRBSizeAuto->Connect(wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(options::OnSizeAutoButton), NULL, this); @@ -3252,7 +3266,6 @@ With a higher value, the same zoom level shows a more detailed chart.")); OpenGLSizer->Add(bOpenGL, inputFlags); bOpenGL->Enable(!g_bdisable_opengl && g_Platform->IsGLCapable()); - // spacer itemBoxSizerUI->Add(0, border_size * 3); itemBoxSizerUI->Add(0, border_size * 3); @@ -3267,7 +3280,7 @@ With a higher value, the same zoom level shows a more detailed chart.")); itemBoxSizerUI->Add(ChartBarSizer, 0, 0, 0); pChartBarEX = new wxCheckBox(m_ChartDisplayPage, -1, - _("Show extended chart bar information.")); + _("Show extended chart bar information.")); ChartBarSizer->Add(pChartBarEX, inputFlags); /* @@ -3389,10 +3402,10 @@ void options::CreatePanel_VectorCharts(size_t parent, int border_size, pCheck_SCAMIN->SetValue(FALSE); optionsColumn->Add(pCheck_SCAMIN, inputFlags); - optionsColumn->Add(new wxStaticText(ps57Ctl, wxID_ANY, ""), - labelFlags); - pCheck_SuperSCAMIN = new wxCheckBox(ps57Ctl, ID_SUPERSCAMINCHECKBOX, - _("Additional detail reduction at Small Scale")); + optionsColumn->Add(new wxStaticText(ps57Ctl, wxID_ANY, ""), labelFlags); + pCheck_SuperSCAMIN = + new wxCheckBox(ps57Ctl, ID_SUPERSCAMINCHECKBOX, + _("Additional detail reduction at Small Scale")); pCheck_SuperSCAMIN->SetValue(FALSE); optionsColumn->Add(pCheck_SuperSCAMIN, inputFlags); @@ -3532,7 +3545,7 @@ void options::CreatePanel_VectorCharts(size_t parent, int border_size, miscSizer->Add(pCheck_SOUNDG, inputFlags); pCheck_META = new wxCheckBox(ps57Ctl, ID_METACHECKBOX, - _("Chart Information Objects")); + _("Chart Information Objects")); pCheck_META->SetValue(FALSE); miscSizer->Add(pCheck_META, inputFlags); @@ -3577,10 +3590,10 @@ void options::CreatePanel_VectorCharts(size_t parent, int border_size, pCheck_SCAMIN->SetValue(FALSE); optionsColumn->Add(pCheck_SCAMIN, inputFlags); - optionsColumn->Add(new wxStaticText(ps57Ctl, wxID_ANY, ""), - labelFlags); - pCheck_SuperSCAMIN = new wxCheckBox(ps57Ctl, ID_SUPERSCAMINCHECKBOX, - _("Additional detail reduction at Small Scale")); + optionsColumn->Add(new wxStaticText(ps57Ctl, wxID_ANY, ""), labelFlags); + pCheck_SuperSCAMIN = + new wxCheckBox(ps57Ctl, ID_SUPERSCAMINCHECKBOX, + _("Additional detail reduction at Small Scale")); pCheck_SuperSCAMIN->SetValue(FALSE); optionsColumn->Add(pCheck_SuperSCAMIN, inputFlags); @@ -3779,8 +3792,8 @@ void options::CreatePanel_ChartGroups(size_t parent, int border_size, // and we have the actual widgets in a separate class (because of its // complexity) - wxNotebook *chartsPageNotebook = (wxNotebook *)m_pListbook->GetPage(parent); - wxScrolledWindow *sw = new ChartGroupsUI(chartsPageNotebook); + wxNotebook* chartsPageNotebook = (wxNotebook*)m_pListbook->GetPage(parent); + wxScrolledWindow* sw = new ChartGroupsUI(chartsPageNotebook); sw->SetScrollRate(m_scrollRate, m_scrollRate); chartsPageNotebook->AddPage(sw, _("Chart Groups")); groupsPanel = dynamic_cast(sw); @@ -3896,7 +3909,6 @@ void ChartGroupsUI::CompletePanel(void) { wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ChartGroupsUI::OnDeleteGroup), NULL, this); - wxBoxSizer* newDeleteGrp = new wxBoxSizer(wxVERTICAL); sizerGroups->Add(newDeleteGrp, 0, wxALL, m_border_size); @@ -4057,7 +4069,8 @@ void options::CreatePanel_Display(size_t parent, int border_size, wxBoxSizer* defaultBoatSpeedSizer = new wxBoxSizer(wxHORIZONTAL); boxDispStatusBar->Add(defaultBoatSpeedSizer, wxALL, group_item_spacing); - m_Text_def_boat_speed = new wxStaticText( pDisplayPanel, wxID_ANY, + m_Text_def_boat_speed = new wxStaticText( + pDisplayPanel, wxID_ANY, _("Default Boat Speed ") + "(" + getUsrSpeedUnit() + ") "); defaultBoatSpeedSizer->Add(m_Text_def_boat_speed, groupLabelFlagsHoriz); @@ -4243,9 +4256,9 @@ void options::CreatePanel_Display(size_t parent, int border_size, // (for calculation, in case GPS speed is null) wxBoxSizer* defaultBoatSpeedSizer = new wxBoxSizer(wxHORIZONTAL); boxDispStatusBar->Add(defaultBoatSpeedSizer, wxALL, group_item_spacing); - defaultBoatSpeedSizer->Add( - new wxStaticText(pDisplayPanel, wxID_ANY, _("Default Boat Speed ")), - groupLabelFlagsHoriz); + m_Text_def_boat_speed = new wxStaticText( pDisplayPanel, wxID_ANY, + _("Default Boat Speed ") + "(" + getUsrSpeedUnit() + ") "); + defaultBoatSpeedSizer->Add(m_Text_def_boat_speed, groupLabelFlagsHoriz); pSDefaultBoatSpeed = new wxTextCtrl(pDisplayPanel, ID_DEFAULT_BOAT_SPEED, _T(""), wxDefaultPosition, wxSize(50, -1), wxTE_RIGHT); @@ -4500,10 +4513,11 @@ void options::CreatePanel_Units(size_t parent, int border_size, unitsSizer->Add(new wxStaticText(panelUnits, wxID_ANY, _("WindSpeed")), labelFlags); wxString pWindSpeedFormats[] = {_("Knots"), _("m/s"), _("Mph"), _("km/h")}; - int m_WindSpeedFormatsNChoices = sizeof(pWindSpeedFormats) / sizeof(wxString); - pWindSpeedFormat = - new wxChoice(panelUnits, ID_WINDSPEEDUNITCHOICE, wxDefaultPosition, - wxDefaultSize, m_WindSpeedFormatsNChoices, pWindSpeedFormats); + int m_WindSpeedFormatsNChoices = + sizeof(pWindSpeedFormats) / sizeof(wxString); + pWindSpeedFormat = new wxChoice( + panelUnits, ID_WINDSPEEDUNITCHOICE, wxDefaultPosition, wxDefaultSize, + m_WindSpeedFormatsNChoices, pWindSpeedFormats); unitsSizer->Add(pWindSpeedFormat, inputFlags); // depth units @@ -4608,69 +4622,59 @@ void options::CreatePanel_Units(size_t parent, int border_size, #endif } -class OCPNSoundPanel: public wxPanel -{ +class OCPNSoundPanel : public wxPanel { public: - OCPNSoundPanel( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, - wxString title, - wxString checkLegend, - wxString selectLegend, - wxString *pSoundFile - ); - - ~OCPNSoundPanel() { delete m_sound; } - - void OnButtonSelectSound(wxCommandEvent& event); - void OnButtonSPTestSound(wxCommandEvent& event); - wxString SelectSoundFile(); - void SetSoundFileLabel(wxString file); - wxCheckBox *GetCheckBox(){ return m_pCheck_Sound; } - wxString GetSoundFile(){ return m_sound_file;} - - wxCheckBox *m_pCheck_Sound; - wxSize m_small_button_size; - wxString m_sound_file; - wxString *m_pSoundFile; - wxStaticText *m_AudioFileNameText; - - wxButton* SelSound; - wxButton* TestSound; - OcpnSound *m_sound; - - /** Notified with a OCPN_Sound* pointer when sound has completed. */ - EventVar m_on_sp_sound_done; - - ObsListener m_sound_sp_done_listener; - bool m_soundPlaying; - - DECLARE_EVENT_TABLE() + OCPNSoundPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, + const wxSize& size, wxString title, wxString checkLegend, + wxString selectLegend, wxString* pSoundFile); + + ~OCPNSoundPanel() { delete m_sound; } + + void OnButtonSelectSound(wxCommandEvent& event); + void OnButtonSPTestSound(wxCommandEvent& event); + wxString SelectSoundFile(); + void SetSoundFileLabel(wxString file); + wxCheckBox* GetCheckBox() { return m_pCheck_Sound; } + wxString GetSoundFile() { return m_sound_file; } + + wxCheckBox* m_pCheck_Sound; + wxSize m_small_button_size; + wxString m_sound_file; + wxString* m_pSoundFile; + wxStaticText* m_AudioFileNameText; + + wxButton* SelSound; + wxButton* TestSound; + OcpnSound* m_sound; + + /** Notified with a OCPN_Sound* pointer when sound has completed. */ + EventVar m_on_sp_sound_done; + + ObsListener m_sound_sp_done_listener; + bool m_soundPlaying; + + DECLARE_EVENT_TABLE() }; #define ID_SELECTSOUND 9341 #define ID_TESTSOUND 9342 - BEGIN_EVENT_TABLE(OCPNSoundPanel, wxPanel) EVT_BUTTON(ID_SELECTSOUND, OCPNSoundPanel::OnButtonSelectSound) EVT_BUTTON(ID_TESTSOUND, OCPNSoundPanel::OnButtonSPTestSound) - END_EVENT_TABLE() -OCPNSoundPanel::OCPNSoundPanel( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, - wxString title, - wxString checkLegend, - wxString selectLegend, - wxString *pSoundFile) -:wxPanel(parent, id, pos, size, wxBORDER_NONE), - m_soundPlaying(false) -{ +OCPNSoundPanel::OCPNSoundPanel(wxWindow* parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + wxString title, wxString checkLegend, + wxString selectLegend, wxString* pSoundFile) + : wxPanel(parent, id, pos, size, wxBORDER_NONE), m_soundPlaying(false) { wxFont* pif = FontMgr::Get().GetFont(_T("Dialog")); - SetFont( *pif ); + SetFont(*pif); m_pSoundFile = pSoundFile; - if(pSoundFile) - m_sound_file = *pSoundFile; + if (pSoundFile) m_sound_file = *pSoundFile; m_sound = SoundFactory(); @@ -4679,21 +4683,17 @@ OCPNSoundPanel::OCPNSoundPanel( wxWindow *parent, wxWindowID id, const wxPoint & int font_size_y, font_descent, font_lead; GetTextExtent(_T("0"), NULL, &font_size_y, &font_descent, &font_lead); - m_small_button_size = - wxSize(-1, (int)(1.6 * (font_size_y + font_descent))); - + m_small_button_size = wxSize(-1, (int)(1.6 * (font_size_y + font_descent))); wxBoxSizer* wrapperSizer = new wxBoxSizer(wxVERTICAL); SetSizer(wrapperSizer); - wxStaticBox* StaticBox1 = - new wxStaticBox(this, wxID_ANY, title); + wxStaticBox* StaticBox1 = new wxStaticBox(this, wxID_ANY, title); wxStaticBoxSizer* StaticBoxSizer1 = - new wxStaticBoxSizer(StaticBox1, wxVERTICAL); + new wxStaticBoxSizer(StaticBox1, wxVERTICAL); wrapperSizer->Add(StaticBoxSizer1, 0, wxALL | wxEXPAND, border_size); - m_pCheck_Sound = new wxCheckBox(this, ID_ANCHORALERTAUDIO, - checkLegend); + m_pCheck_Sound = new wxCheckBox(this, ID_ANCHORALERTAUDIO, checkLegend); StaticBoxSizer1->Add(m_pCheck_Sound, 1, wxALL, group_item_spacing); // Sound file @@ -4702,10 +4702,11 @@ OCPNSoundPanel::OCPNSoundPanel( wxWindow *parent, wxWindowID id, const wxPoint & #ifdef __ANDROID__ // Count the likely number of lines in the wrapped file name // to set the default wxStaticText size. - ChartDirPanelHardBreakWrapper wrapper(this, m_sound_file, g_pOptions->GetSize().x * 8 / 10); + ChartDirPanelHardBreakWrapper wrapper(this, m_sound_file, + g_pOptions->GetSize().x * 8 / 10); wxArrayString LabelWrappedArray = wrapper.GetLineArray(); - for (unsigned int i=0 ; i < LabelWrappedArray.GetCount() ; i++){ - LabelWrapped += "\n"; + for (unsigned int i = 0; i < LabelWrappedArray.GetCount(); i++) { + LabelWrapped += "\n"; } LabelWrapped += "\n"; #endif @@ -4721,33 +4722,25 @@ OCPNSoundPanel::OCPNSoundPanel( wxWindow *parent, wxWindowID id, const wxPoint & soundSizer1->SetHGap(border_size * 2); StaticBoxSizer1->Add(soundSizer1, 1, wxALL | wxLEFT, border_size); - SelSound = new wxButton( - this, ID_SELECTSOUND, selectLegend, - wxDefaultPosition, m_small_button_size, 0); - soundSizer1->Add(SelSound, 0, wxALL | wxALIGN_RIGHT, - group_item_spacing); + SelSound = new wxButton(this, ID_SELECTSOUND, selectLegend, wxDefaultPosition, + m_small_button_size, 0); + soundSizer1->Add(SelSound, 0, wxALL | wxALIGN_RIGHT, group_item_spacing); soundSizer1->AddSpacer(group_item_spacing * 4); - TestSound = new wxButton( - this, ID_TESTSOUND, _("Test"), - wxDefaultPosition, m_small_button_size, 0); - soundSizer1->Add(TestSound, 0, wxALL | wxALIGN_RIGHT, - group_item_spacing); - auto sound_action = [this] (ObservedEvt ev) { - m_soundPlaying = false; - }; + TestSound = new wxButton(this, ID_TESTSOUND, _("Test"), wxDefaultPosition, + m_small_button_size, 0); + soundSizer1->Add(TestSound, 0, wxALL | wxALIGN_RIGHT, group_item_spacing); + auto sound_action = [this](ObservedEvt ev) { m_soundPlaying = false; }; m_sound_sp_done_listener.Init(m_on_sp_sound_done, sound_action); - } -void OCPNSoundPanel::SetSoundFileLabel(wxString file) -{ - wxString soundLabel = wxString( " " + _("Audio file name:") + "\n " + - file); +void OCPNSoundPanel::SetSoundFileLabel(wxString file) { + wxString soundLabel = wxString(" " + _("Audio file name:") + "\n " + file); - ChartDirPanelHardBreakWrapper wrapper(this, soundLabel, g_pOptions->GetSize().x * 8 / 10); + ChartDirPanelHardBreakWrapper wrapper(this, soundLabel, + g_pOptions->GetSize().x * 8 / 10); wxArrayString LabelWrappedArray = wrapper.GetLineArray(); wxString LabelWrapped; - for (unsigned int i=0 ; i < LabelWrappedArray.GetCount() ; i++){ + for (unsigned int i = 0; i < LabelWrappedArray.GetCount(); i++) { if (i == 0) LabelWrapped += LabelWrappedArray[i].BeforeFirst('/'); else @@ -4759,8 +4752,6 @@ void OCPNSoundPanel::SetSoundFileLabel(wxString file) Layout(); } - - wxString OCPNSoundPanel::SelectSoundFile() { wxString sound_dir = g_Platform->GetSharedDataDir(); sound_dir.Append(_T("sounds")); @@ -4796,11 +4787,10 @@ void OCPNSoundPanel::OnButtonSelectSound(wxCommandEvent& event) { if (!sel_file.IsEmpty()) { m_sound_file = g_Platform->NormalizePath(sel_file); - if(m_pSoundFile) - *m_pSoundFile = m_sound_file; // Update global variable + if (m_pSoundFile) *m_pSoundFile = m_sound_file; // Update global variable SetSoundFileLabel(m_sound_file); - //g_anchorwatch_sound->Stop(); + // g_anchorwatch_sound->Stop(); } } @@ -4815,181 +4805,162 @@ void OCPNSoundPanel::OnButtonSPTestSound(wxCommandEvent& event) { } } - - - -void options::OnUXAudioEnableButtonClickAIS(wxCommandEvent &event) { +void options::OnUXAudioEnableButtonClickAIS(wxCommandEvent& event) { if (event.IsChecked()) - m_pCheck_AlertAudio->SetValue( true ); + m_pCheck_AlertAudio->SetValue(true); else { - if (!m_soundPanelSART->GetCheckBox()->GetValue() - && !m_soundPanelDSC->GetCheckBox()->GetValue()) - m_pCheck_AlertAudio->SetValue( false ); + if (!m_soundPanelSART->GetCheckBox()->GetValue() && + !m_soundPanelDSC->GetCheckBox()->GetValue()) + m_pCheck_AlertAudio->SetValue(false); } } -void options::OnUXAudioEnableButtonClickSART(wxCommandEvent &event) { +void options::OnUXAudioEnableButtonClickSART(wxCommandEvent& event) { if (event.IsChecked()) - m_pCheck_AlertAudio->SetValue( true ); + m_pCheck_AlertAudio->SetValue(true); else { - if (!m_soundPanelAIS->GetCheckBox()->GetValue() - && !m_soundPanelDSC->GetCheckBox()->GetValue()) - m_pCheck_AlertAudio->SetValue( false ); + if (!m_soundPanelAIS->GetCheckBox()->GetValue() && + !m_soundPanelDSC->GetCheckBox()->GetValue()) + m_pCheck_AlertAudio->SetValue(false); } } -void options::OnUXAudioEnableButtonClickDSC(wxCommandEvent &event) { +void options::OnUXAudioEnableButtonClickDSC(wxCommandEvent& event) { if (event.IsChecked()) - m_pCheck_AlertAudio->SetValue( true ); + m_pCheck_AlertAudio->SetValue(true); else { - if (!m_soundPanelAIS->GetCheckBox()->GetValue() - && !m_soundPanelSART->GetCheckBox()->GetValue()) - m_pCheck_AlertAudio->SetValue( false ); + if (!m_soundPanelAIS->GetCheckBox()->GetValue() && + !m_soundPanelSART->GetCheckBox()->GetValue()) + m_pCheck_AlertAudio->SetValue(false); } } void options::CreatePanel_Sounds(size_t parent, int border_size, int group_item_spacing) { + wxScrolledWindow* panelSounds = AddPage(parent, _("Sounds")); - wxScrolledWindow* panelSounds = AddPage(parent, _("Sounds")); + wxBoxSizer* wrapperSizer = new wxBoxSizer(wxVERTICAL); + panelSounds->SetSizer(wrapperSizer); + + // Anchor Alarm + m_soundPanelAnchor = new OCPNSoundPanel( + panelSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, + _("Anchor Alarm"), _("Play Sound on Anchor Alarm."), + _("Select Anchor Alarm Sound"), &g_anchorwatch_sound_file); + wrapperSizer->Add(m_soundPanelAnchor, 1, wxALL | wxEXPAND, border_size); + + // AIS Alert + m_soundPanelAIS = new OCPNSoundPanel( + panelSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, _("AIS Alert"), + _("Play Sound on AIS Alert."), _("Select AIS Alert Sound"), + &g_AIS_sound_file); + wrapperSizer->Add(m_soundPanelAIS, 1, wxALL | wxEXPAND, border_size); + + m_soundPanelAIS->GetCheckBox()->Connect( + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(options::OnUXAudioEnableButtonClickAIS), NULL, + this); - wxBoxSizer* wrapperSizer = new wxBoxSizer(wxVERTICAL); - panelSounds->SetSizer(wrapperSizer); - - // Anchor Alarm - m_soundPanelAnchor = new OCPNSoundPanel( panelSounds, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - _("Anchor Alarm"), - _("Play Sound on Anchor Alarm."), - _("Select Anchor Alarm Sound"), - &g_anchorwatch_sound_file - ); - wrapperSizer->Add(m_soundPanelAnchor, 1, wxALL | wxEXPAND, border_size); - - - // AIS Alert - m_soundPanelAIS = new OCPNSoundPanel( panelSounds, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - _("AIS Alert"), - _("Play Sound on AIS Alert."), - _("Select AIS Alert Sound"), - &g_AIS_sound_file - ); - wrapperSizer->Add(m_soundPanelAIS, 1, wxALL | wxEXPAND, border_size); - - m_soundPanelAIS->GetCheckBox()->Connect( - wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(options::OnUXAudioEnableButtonClickAIS), NULL, - this); - - // SART Alert - m_soundPanelSART = new OCPNSoundPanel( panelSounds, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - _("SART Alert"), - _("Play Sound on AIS SART Alert."), - _("Select AIS SART Alert Sound"), - &g_SART_sound_file - ); - wrapperSizer->Add(m_soundPanelSART, 1, wxALL | wxEXPAND, border_size); - - m_soundPanelSART->GetCheckBox()->Connect( - wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(options::OnUXAudioEnableButtonClickSART), NULL, - this); - - // DSC Call - m_soundPanelDSC = new OCPNSoundPanel( panelSounds, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - _("DSC Alert"), - _("Play Sound on DSC notification."), - _("Select DSC notification Sound"), - &g_DSC_sound_file - ); - wrapperSizer->Add(m_soundPanelDSC, 1, wxALL | wxEXPAND, border_size); - - m_soundPanelDSC->GetCheckBox()->Connect( - wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(options::OnUXAudioEnableButtonClickDSC), NULL, - this); - - // Sound Device Configuration - wxStaticBox* StatBoxSoundConfig = - new wxStaticBox(panelSounds, wxID_ANY, _("Sound Device Configuration")); - wxStaticBoxSizer* StatBoxSoundConfigSizer = - new wxStaticBoxSizer(StatBoxSoundConfig, wxVERTICAL); - wrapperSizer->Add(StatBoxSoundConfigSizer, 0, wxALL | wxEXPAND, border_size); - - auto sound = std::unique_ptr(SoundFactory()); - int deviceCount = sound->DeviceCount(); - wxLogMessage("options: got device count: %d", deviceCount); - if (deviceCount >= 1) { - wxArrayString labels; - for (int i = 0; i < deviceCount; i += 1) { - wxString label(sound->GetDeviceInfo(i)); - if (label == "") { - std::ostringstream stm; - stm << i; - label = _("Unknown device :") + stm.str(); - } - if (!sound->IsOutputDevice(i)) { - std::ostringstream stm; - stm << i; - label = _("Input device :") + stm.str(); - } - labels.Add(label); + // SART Alert + m_soundPanelSART = new OCPNSoundPanel( + panelSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, _("SART Alert"), + _("Play Sound on AIS SART Alert."), _("Select AIS SART Alert Sound"), + &g_SART_sound_file); + wrapperSizer->Add(m_soundPanelSART, 1, wxALL | wxEXPAND, border_size); + + m_soundPanelSART->GetCheckBox()->Connect( + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(options::OnUXAudioEnableButtonClickSART), NULL, + this); + + // DSC Call + m_soundPanelDSC = new OCPNSoundPanel( + panelSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, _("DSC Alert"), + _("Play Sound on DSC notification."), _("Select DSC notification Sound"), + &g_DSC_sound_file); + wrapperSizer->Add(m_soundPanelDSC, 1, wxALL | wxEXPAND, border_size); + + m_soundPanelDSC->GetCheckBox()->Connect( + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(options::OnUXAudioEnableButtonClickDSC), NULL, + this); + + // Sound Device Configuration + wxStaticBox* StatBoxSoundConfig = + new wxStaticBox(panelSounds, wxID_ANY, _("Sound Device Configuration")); + wxStaticBoxSizer* StatBoxSoundConfigSizer = + new wxStaticBoxSizer(StatBoxSoundConfig, wxVERTICAL); + wrapperSizer->Add(StatBoxSoundConfigSizer, 0, wxALL | wxEXPAND, border_size); + + auto sound = std::unique_ptr(SoundFactory()); + int deviceCount = sound->DeviceCount(); + wxLogMessage("options: got device count: %d", deviceCount); + if (deviceCount >= 1) { + wxArrayString labels; + for (int i = 0; i < deviceCount; i += 1) { + wxString label(sound->GetDeviceInfo(i)); + if (label == "") { + std::ostringstream stm; + stm << i; + label = _("Unknown device :") + stm.str(); } + if (!sound->IsOutputDevice(i)) { + std::ostringstream stm; + stm << i; + label = _("Input device :") + stm.str(); + } + labels.Add(label); + } // if sound device index is uninitialized, set to "default", if found. // Otherwise, set to 0 - int iDefault = labels.Index("default"); - - if (g_iSoundDeviceIndex == -1) { - if (iDefault >= 0) - g_iSoundDeviceIndex = iDefault; - else - g_iSoundDeviceIndex = 0; - } + int iDefault = labels.Index("default"); + if (g_iSoundDeviceIndex == -1) { + if (iDefault >= 0) + g_iSoundDeviceIndex = iDefault; + else + g_iSoundDeviceIndex = 0; + } - pSoundDeviceIndex = new wxChoice(); - if (pSoundDeviceIndex) { - pSoundDeviceIndex->Create(panelSounds, wxID_ANY, wxDefaultPosition, + pSoundDeviceIndex = new wxChoice(); + if (pSoundDeviceIndex) { + pSoundDeviceIndex->Create(panelSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, labels); - pSoundDeviceIndex->SetSelection(g_iSoundDeviceIndex); - pSoundDeviceIndex->Show(); - wxFlexGridSizer* pSoundDeviceIndexGrid = new wxFlexGridSizer(2); - StatBoxSoundConfigSizer->Add(pSoundDeviceIndexGrid, 0, wxALL | wxEXPAND, - group_item_spacing); + pSoundDeviceIndex->SetSelection(g_iSoundDeviceIndex); + pSoundDeviceIndex->Show(); + wxFlexGridSizer* pSoundDeviceIndexGrid = new wxFlexGridSizer(2); + StatBoxSoundConfigSizer->Add(pSoundDeviceIndexGrid, 0, wxALL | wxEXPAND, + group_item_spacing); - stSoundDeviceIndex = + stSoundDeviceIndex = new wxStaticText(panelSounds, wxID_STATIC, _("Sound Device")); - pSoundDeviceIndexGrid->Add(stSoundDeviceIndex, 0, wxALL, 5); - pSoundDeviceIndexGrid->Add(pSoundDeviceIndex, 0, wxALL, border_size); - } + pSoundDeviceIndexGrid->Add(stSoundDeviceIndex, 0, wxALL, 5); + pSoundDeviceIndexGrid->Add(pSoundDeviceIndex, 0, wxALL, border_size); } + } #ifndef __ANDROID__ - if ((bool)dynamic_cast(SoundFactory())) { - wxBoxSizer* pSoundSizer = new wxBoxSizer(wxVERTICAL); - StatBoxSoundConfigSizer->Add(pSoundSizer, 0, wxALL | wxEXPAND, group_item_spacing); - pCmdSoundString = + if ((bool)dynamic_cast(SoundFactory())) { + wxBoxSizer* pSoundSizer = new wxBoxSizer(wxVERTICAL); + StatBoxSoundConfigSizer->Add(pSoundSizer, 0, wxALL | wxEXPAND, + group_item_spacing); + pCmdSoundString = new wxTextCtrl(panelSounds, wxID_ANY, _T( "" ), wxDefaultPosition, wxSize(450, -1), wxTE_LEFT); - pSoundSizer->Add( + pSoundSizer->Add( new wxStaticText(panelSounds, wxID_ANY, _("Audio Play command:")), 0, wxALIGN_LEFT | wxALL); - pSoundSizer->Add(pCmdSoundString, 1, wxEXPAND | wxALIGN_LEFT, border_size); - } + pSoundSizer->Add(pCmdSoundString, 1, wxEXPAND | wxALIGN_LEFT, border_size); + } #endif - if (!deviceCount) - StatBoxSoundConfig->Hide(); + if (!deviceCount) StatBoxSoundConfig->Hide(); #ifdef __ANDROID__ - stSoundDeviceIndex->Hide(); - pSoundDeviceIndex->Hide(); + stSoundDeviceIndex->Hide(); + pSoundDeviceIndex->Hide(); #endif - } void options::CreatePanel_MMSI(size_t parent, int border_size, @@ -5046,7 +5017,7 @@ void options::CreatePanel_AIS(size_t parent, int border_size, pCPAGrid->Add(m_pCheck_CPA_Warn, 0, wxALL, group_item_spacing); m_pText_CPA_Warn = - new wxTextCtrl(panelAIS, -1,"TEXT ", wxDefaultPosition, wxSize(-1, -1)); + new wxTextCtrl(panelAIS, -1, "TEXT ", wxDefaultPosition, wxSize(-1, -1)); pCPAGrid->Add(m_pText_CPA_Warn, 0, wxALL | wxALIGN_RIGHT, group_item_spacing); m_pCheck_CPA_Warn->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, @@ -5106,11 +5077,11 @@ void options::CreatePanel_AIS(size_t parent, int border_size, group_item_spacing); m_pCheck_Sync_OCOG_ACOG = new wxCheckBox( - panelAIS, -1, _("Sync AIS arrow length with own ship's COG predictor")); + panelAIS, -1, _("Sync AIS arrow length with own ship's COG predictor")); pDisplayGrid->Add(m_pCheck_Sync_OCOG_ACOG, 1, wxALL, group_item_spacing); - m_pCheck_Sync_OCOG_ACOG->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(options::OnSyncCogPredClick), - NULL, this); + m_pCheck_Sync_OCOG_ACOG->Connect( + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(options::OnSyncCogPredClick), NULL, this); wxStaticText* pStatic_Dummy4a = new wxStaticText(panelAIS, -1, _T("")); pDisplayGrid->Add(pStatic_Dummy4a, 1, wxALL, group_item_spacing); @@ -5247,17 +5218,16 @@ void options::CreatePanel_AIS(size_t parent, int border_size, this); wxButton* m_pPlay_Sound = - new wxButton(panelAIS, -1, _("Test AIS Alert Sound"), - wxDefaultPosition, m_small_button_size, 0); - pAlertGrid->Add(m_pPlay_Sound, 0, wxALL | wxALIGN_RIGHT, group_item_spacing); + new wxButton(panelAIS, -1, _("Test AIS Alert Sound"), wxDefaultPosition, + m_small_button_size, 0); + pAlertGrid->Add(m_pPlay_Sound, 0, wxALL | wxALIGN_RIGHT, group_item_spacing); - m_pPlay_Sound->Connect( - wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(options::OnButtonTestSound), NULL, - this); + m_pPlay_Sound->Connect(wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(options::OnButtonTestSound), + NULL, this); - //wxStaticText* pStatic_Dummy5b = new wxStaticText(panelAIS, -1, _T("")); - //pAlertGrid->Add(pStatic_Dummy5b, 1, wxALL, group_item_spacing); + // wxStaticText* pStatic_Dummy5b = new wxStaticText(panelAIS, -1, _T("")); + // pAlertGrid->Add(pStatic_Dummy5b, 1, wxALL, group_item_spacing); m_pCheck_Alert_Moored = new wxCheckBox( panelAIS, -1, _("Suppress Alerts for anchored/moored targets")); @@ -5462,8 +5432,8 @@ void options::CreatePanel_UI(size_t parent, int border_size, pZoomButtons->Hide(); #endif - pInlandEcdis = new wxCheckBox(itemPanelFont, ID_INLANDECDISBOX, - _("Use Inland ECDIS")); + pInlandEcdis = + new wxCheckBox(itemPanelFont, ID_INLANDECDISBOX, _("Use Inland ECDIS")); miscOptions->Add(pInlandEcdis, 0, wxALL, border_size); wxButton* itemEcdisHelp = @@ -5554,9 +5524,9 @@ void options::CreatePanel_UI(size_t parent, int border_size, m_pSlider_ENCText_Factor->GetHandle()->setStyleSheet(getQtStyleSheet()); #endif - sliderSizer->Add( - new wxStaticText(itemPanelFont, wxID_ANY, _("Mouse wheel zoom sensitivity")), - inputFlags); + sliderSizer->Add(new wxStaticText(itemPanelFont, wxID_ANY, + _("Mouse wheel zoom sensitivity")), + inputFlags); m_pMouse_Zoom_Slider = new MouseZoomSlider(itemPanelFont, m_sliderSize); sliderSizer->Add(m_pMouse_Zoom_Slider, 0, wxALL, border_size); @@ -5566,15 +5536,14 @@ void options::CreatePanel_UI(size_t parent, int border_size, void options::OnAlertEnableButtonClick(wxCommandEvent& event) { m_pCheck_AlertAudio->Enable(event.IsChecked()); - if (!event.IsChecked()) - m_pCheck_AlertAudio->SetValue( false ); + if (!event.IsChecked()) m_pCheck_AlertAudio->SetValue(false); } void options::OnAlertAudioEnableButtonClick(wxCommandEvent& event) { if (event.IsChecked()) { - m_soundPanelAIS->GetCheckBox()->SetValue( true ); - m_soundPanelSART->GetCheckBox()->SetValue( true ); - m_soundPanelDSC->GetCheckBox()->SetValue( true ); + m_soundPanelAIS->GetCheckBox()->SetValue(true); + m_soundPanelSART->GetCheckBox()->SetValue(true); + m_soundPanelDSC->GetCheckBox()->SetValue(true); } } @@ -5839,8 +5808,7 @@ void options::CreateControls(void) { } wxString ConnTab = _("Connections"); - if (g_Platform->GetDisplayDIPMult(gFrame) < 1) - ConnTab = _("Connect"); + if (g_Platform->GetDisplayDIPMult(gFrame) < 1) ConnTab = _("Connect"); m_pageConnections = CreatePanel(ConnTab); #ifndef __ANDROID__ @@ -5862,8 +5830,7 @@ void options::CreateControls(void) { CreatePanel_Routes(m_pageShips, border_size, group_item_spacing); wxString UITab = _("User Interface"); - if (g_Platform->GetDisplayDIPMult(gFrame) < 1) - UITab = _("User"); + if (g_Platform->GetDisplayDIPMult(gFrame) < 1) UITab = _("User"); m_pageUI = CreatePanel(UITab); CreatePanel_UI(m_pageUI, border_size, group_item_spacing); @@ -5894,9 +5861,8 @@ void options::CreateControls(void) { #ifndef __WXGTK__ // The s57 chart panel is the one which controls the minimum width required // to avoid horizontal scroll bars - //vectorPanel->SetSizeHints(ps57Ctl); + // vectorPanel->SetSizeHints(ps57Ctl); #endif - } void options::SetInitialPage(int page_sel, int sub_page) { @@ -6161,8 +6127,7 @@ void options::SetInitialSettings(void) { if (pPreserveScale) pPreserveScale->SetValue(g_bPreserveScaleOnX); pPlayShipsBells->SetValue(g_bPlayShipsBells); - if (pCmdSoundString) - pCmdSoundString->SetValue(g_CmdSoundString); + if (pCmdSoundString) pCmdSoundString->SetValue(g_CmdSoundString); if (pSoundDeviceIndex) pSoundDeviceIndex->SetSelection(g_iSoundDeviceIndex); // pFullScreenToolbar->SetValue( g_bFullscreenToolbar ); @@ -6226,7 +6191,7 @@ void options::SetInitialSettings(void) { m_pText_COG_Predictor->SetValue(s); m_pCheck_Sync_OCOG_ACOG->SetValue(g_bSyncCogPredictors); - if(g_bSyncCogPredictors) m_pText_COG_Predictor->Disable(); + if (g_bSyncCogPredictors) m_pText_COG_Predictor->Disable(); m_pCheck_Show_Tracks->SetValue(g_bAISShowTracks); @@ -6266,13 +6231,11 @@ void options::SetInitialSettings(void) { if (g_bAIS_CPA_Alert) { m_pCheck_AlertAudio->Enable(); m_pCheck_AlertAudio->SetValue(g_bAIS_CPA_Alert_Audio); - } - else { + } else { m_pCheck_AlertAudio->Disable(); m_pCheck_AlertAudio->SetValue(false); } - m_pCheck_Alert_Moored->SetValue(g_bAIS_CPA_Alert_Suppress_Moored); m_pCheck_Ack_Timout->SetValue(g_bAIS_ACK_Timeout); @@ -6301,22 +6264,21 @@ void options::SetInitialSettings(void) { wxString screenmm; if (!g_config_display_size_manual) { pRBSizeAuto->SetValue(TRUE); - for (const auto &mm : g_monitor_info) { + for (const auto& mm : g_monitor_info) { screenmm.Append(wxString::Format("%zu,", mm.width_mm)); } - screenmm.RemoveLast(); //Strip last comma + screenmm.RemoveLast(); // Strip last comma pScreenMM->Disable(); } else { - for (const auto &mm : g_config_display_size_mm) { + for (const auto& mm : g_config_display_size_mm) { screenmm.Append(wxString::Format("%zu,", mm)); } - screenmm.RemoveLast(); //Strip last comma + screenmm.RemoveLast(); // Strip last comma pRBSizeManual->SetValue(TRUE); } pScreenMM->SetValue(screenmm); - pDepthUnitSelect->SetSelection(g_nDepthUnitDisplay); UpdateOptionsUnits(); // sets depth values using the user's unit preference @@ -6327,7 +6289,6 @@ void options::SetInitialSettings(void) { s.Printf(_T("%d"), g_nAutoHideToolbar); pToolbarHideSecs->SetValue(s); - // Serial ports delete m_pSerialArray; @@ -6553,10 +6514,10 @@ void options::UpdateOptionsUnits(void) { void options::OnSizeAutoButton(wxCommandEvent& event) { wxString screenmm; - for (const auto &mm : g_monitor_info) { + for (const auto& mm : g_monitor_info) { screenmm.Append(wxString::Format("%zu,", mm.width_mm)); } - screenmm.RemoveLast(); //Strip last comma + screenmm.RemoveLast(); // Strip last comma pScreenMM->SetValue(screenmm); pScreenMM->Disable(); g_config_display_size_manual = FALSE; @@ -6565,15 +6526,15 @@ void options::OnSizeAutoButton(wxCommandEvent& event) { void options::OnSizeManualButton(wxCommandEvent& event) { wxString screenmm; if (g_config_display_size_mm.size() > 0 && g_config_display_size_mm[0] > 0) { - for (const auto &mm : g_config_display_size_mm) { + for (const auto& mm : g_config_display_size_mm) { screenmm.Append(wxString::Format("%zu,", mm)); } } else { - for (const auto &mm : g_monitor_info) { + for (const auto& mm : g_monitor_info) { screenmm.Append(wxString::Format("%zu,", mm.width_mm)); } } - screenmm.RemoveLast(); //Strip last comma + screenmm.RemoveLast(); // Strip last comma pScreenMM->SetValue(screenmm); pScreenMM->Enable(); g_config_display_size_manual = TRUE; @@ -6590,12 +6551,11 @@ void options::OnCPAWarnClick(wxCommandEvent& event) { } } -void options::OnSyncCogPredClick(wxCommandEvent &event) { +void options::OnSyncCogPredClick(wxCommandEvent& event) { if (m_pCheck_Sync_OCOG_ACOG->GetValue()) { m_pText_COG_Predictor->SetValue(m_pText_OSCOG_Predictor->GetValue()); m_pText_COG_Predictor->Disable(); - } - else { + } else { wxString s; s.Printf(_T("%4.0f"), g_ShowCOG_Mins); m_pText_COG_Predictor->SetValue(s); @@ -6831,10 +6791,9 @@ void options::UpdateWorkArrayFromDisplayPanel(void) { } } - void options::OnApplyClick(wxCommandEvent& event) { //::wxBeginBusyCursor(); - //FIXME This function is in ConnectionsDialog StopBTScan(); + // FIXME This function is in ConnectionsDialog StopBTScan(); // Start with the stuff that requires intelligent validation. @@ -6898,7 +6857,7 @@ void options::OnApplyClick(wxCommandEvent& event) { g_bOverruleScaMin = pScaMinOverruleChckB->GetValue(); // Any Font changes? - if (m_bfontChanged){ + if (m_bfontChanged) { #ifdef ocpnUSE_GL if (gFrame->GetPrimaryCanvas()->GetglCanvas()) { gFrame->GetPrimaryCanvas()->GetglCanvas()->ResetGridFont(); @@ -6958,7 +6917,7 @@ void options::OnApplyClick(wxCommandEvent& event) { wxString screenmm = pScreenMM->GetValue(); wxStringTokenizer tkz(screenmm, _T( "," )); g_config_display_size_mm.clear(); - while(tkz.HasMoreTokens()){ + while (tkz.HasMoreTokens()) { wxString token = tkz.GetNextToken(); long mm = -1; if (token.ToLong(&mm) && mm > 0) { @@ -7122,10 +7081,10 @@ void options::OnApplyClick(wxCommandEvent& event) { g_colourOwnshipRangeRingsColour.Blue()); // Sounds - g_bAIS_GCPA_Alert_Audio = m_soundPanelAIS->GetCheckBox()->GetValue(); - g_bAIS_SART_Alert_Audio = m_soundPanelSART->GetCheckBox()->GetValue(); - g_bAIS_DSC_Alert_Audio = m_soundPanelDSC->GetCheckBox()->GetValue(); - g_bAnchor_Alert_Audio = m_soundPanelAnchor->GetCheckBox()->GetValue(); + g_bAIS_GCPA_Alert_Audio = m_soundPanelAIS->GetCheckBox()->GetValue(); + g_bAIS_SART_Alert_Audio = m_soundPanelSART->GetCheckBox()->GetValue(); + g_bAIS_DSC_Alert_Audio = m_soundPanelDSC->GetCheckBox()->GetValue(); + g_bAnchor_Alert_Audio = m_soundPanelAnchor->GetCheckBox()->GetValue(); // AIS Parameters // CPA Box @@ -7163,21 +7122,19 @@ void options::OnApplyClick(wxCommandEvent& event) { // Check for exceptions in MMSI properties for (unsigned int i = 0; i < g_MMSI_Props_Array.GetCount(); i++) { if (pAISTarget->MMSI == g_MMSI_Props_Array[i]->MMSI) { - MmsiProperties *props = g_MMSI_Props_Array[i]; + MmsiProperties* props = g_MMSI_Props_Array[i]; if (TRACKTYPE_NEVER == props->TrackType) { pAISTarget->b_show_track = false; break; - } - else if (TRACKTYPE_ALWAYS == props->TrackType) { + } else if (TRACKTYPE_ALWAYS == props->TrackType) { pAISTarget->b_show_track = true; break; - } - else + } else break; } } // Check for any persistently tracked target, force b_show_track ON - std::map::iterator it; + std::map::iterator it; it = g_pAIS->m_persistent_tracks.find(pAISTarget->MMSI); if (it != g_pAIS->m_persistent_tracks.end()) pAISTarget->b_show_track = true; @@ -7230,8 +7187,7 @@ void options::OnApplyClick(wxCommandEvent& event) { g_ChartScaleFactorExp = g_Platform->GetChartScaleFactorExp(g_ChartScaleFactor); - g_MarkScaleFactorExp = - g_Platform->GetMarkScaleFactorExp(g_ChartScaleFactor); + g_MarkScaleFactorExp = g_Platform->GetMarkScaleFactorExp(g_ChartScaleFactor); g_ShipScaleFactor = m_pSlider_Ship_Factor->GetValue(); g_ShipScaleFactorExp = g_Platform->GetChartScaleFactorExp(g_ShipScaleFactor); g_ENCSoundingScaleFactor = m_pSlider_Text_Factor->GetValue(); @@ -7242,13 +7198,12 @@ void options::OnApplyClick(wxCommandEvent& event) { MouseZoom::ui_to_config(g_mouse_zoom_sensitivity_ui); // Only reload the icons if user has actually visted the UI page - if(m_bVisitLang) - if (pWayPointMan) - WayPointmanGui(*pWayPointMan).ReloadRoutepointIcons(); + if (m_bVisitLang) + if (pWayPointMan) WayPointmanGui(*pWayPointMan).ReloadRoutepointIcons(); - //FIXME Move these two - //g_NMEAAPBPrecision = m_choicePrecision->GetCurrentSelection(); - //g_TalkerIdText = m_TalkerIdText->GetValue().MakeUpper(); + // FIXME Move these two + // g_NMEAAPBPrecision = m_choicePrecision->GetCurrentSelection(); + // g_TalkerIdText = m_TalkerIdText->GetValue().MakeUpper(); #ifdef ocpnUSE_GL if (g_bopengl != pOpenGL->GetValue()) m_returnChanges |= GL_CHANGED; @@ -7373,8 +7328,7 @@ void options::OnApplyClick(wxCommandEvent& event) { if ((stateHash != ps52plib->GetStateHash()) || bUserStdChange) m_returnChanges |= S52_CHANGED; - if (bchange_scale) - m_returnChanges |= S52_CHANGED; + if (bchange_scale) m_returnChanges |= S52_CHANGED; } // User Interface Panel @@ -7423,7 +7377,7 @@ void options::OnApplyClick(wxCommandEvent& event) { m_returnChanges |= TOOLBAR_CHANGED; // And keep config in sync - //if (m_pPlugInCtrl) m_pPlugInCtrl->UpdatePluginsOrder(); FIXME(leamas) + // if (m_pPlugInCtrl) m_pPlugInCtrl->UpdatePluginsOrder(); FIXME(leamas) g_pi_manager->UpdateConfig(); // PlugIns may have added panels @@ -7764,7 +7718,6 @@ void options::OnButtonmigrateClick(wxCommandEvent& event) { } void options::OnButtonEcdisHelp(wxCommandEvent& event) { - wxString testFile = "/doc/iECDIS/index.html"; if (!::wxFileExists(testFile)) { @@ -7774,20 +7727,17 @@ void options::OnButtonEcdisHelp(wxCommandEvent& event) { _("Would you like to visit the iECDIS Manual website for more " "information?"); - if (wxID_YES == - OCPNMessageBox(NULL, msg, _("Inland ECDIS Manual"), wxYES_NO | wxCENTER, 60)) { + if (wxID_YES == OCPNMessageBox(NULL, msg, _("Inland ECDIS Manual"), + wxYES_NO | wxCENTER, 60)) { wxLaunchDefaultBrowser("https://opencpn-manuals.github.io/inland-ecdis"); } } else { #ifdef __WXMSW__ - wxLaunchDefaultBrowser("file:///" + *GetpSharedDataLocation() + - testFile); + wxLaunchDefaultBrowser("file:///" + *GetpSharedDataLocation() + testFile); #else - wxLaunchDefaultBrowser("file://" + *GetpSharedDataLocation() + - testFile); + wxLaunchDefaultBrowser("file://" + *GetpSharedDataLocation() + testFile); #endif } - } void options::OnButtoncompressClick(wxCommandEvent& event) { @@ -7985,44 +7935,66 @@ void options::OnChooseFont(wxCommandEvent& event) { init_font_data.SetColour(init_color); #ifdef __WXGTK__ - wxFontDialog dg(this, init_font_data); + if (g_Platform->getDisplaySize().y < 800) { + ocpnGenericFontDialog dg(this, init_font_data); + wxFont* qFont = dialogFont; + dg.SetFont(*qFont); + + int retval = dg.ShowModal(); + if (wxID_CANCEL != retval) { + font_data = dg.GetFontData(); + wxFont font = font_data.GetChosenFont(); + wxFont* psfont = new wxFont(font); + wxColor color = font_data.GetColour(); + FontMgr::Get().SetFont(sel_text_element, psfont, color); + gFrame->UpdateAllFonts(); + m_bfontChanged = true; + OnFontChoice(event); + } + } else +#endif + { +#ifdef __WXGTK__ + wxFontDialog dg(this, init_font_data); #else - wxFontDialog dg(pParent, init_font_data); + wxFontDialog dg(pParent, init_font_data); #endif - wxFont* qFont = dialogFont; - dg.SetFont(*qFont); + wxFont* qFont = dialogFont; + dg.SetFont(*qFont); #ifdef __WXQT__ - // Make sure that font dialog will fit on the screen without scrolling - // We do this by setting the dialog font size "small enough" to show "n" lines - wxSize proposed_size = GetSize(); - float n_lines = 30; - float font_size = dialogFont->GetPointSize(); - - if ((proposed_size.y / font_size) < n_lines) { - float new_font_size = proposed_size.y / n_lines; - wxFont* smallFont = new wxFont(*dialogFont); - smallFont->SetPointSize(new_font_size); - dg.SetFont(*smallFont); - } + // Make sure that font dialog will fit on the screen without scrolling + // We do this by setting the dialog font size "small enough" to show "n" + // lines + wxSize proposed_size = GetSize(); + float n_lines = 30; + float font_size = dialogFont->GetPointSize(); + + if ((proposed_size.y / font_size) < n_lines) { + float new_font_size = proposed_size.y / n_lines; + wxFont* smallFont = new wxFont(*dialogFont); + smallFont->SetPointSize(new_font_size); + dg.SetFont(*smallFont); + } #endif - if (g_bresponsive) { - dg.SetSize(GetSize()); - dg.Centre(); - } + if (g_bresponsive) { + dg.SetSize(GetSize()); + dg.Centre(); + } - int retval = dg.ShowModal(); - if (wxID_CANCEL != retval) { - font_data = dg.GetFontData(); - wxFont font = font_data.GetChosenFont(); - wxFont* psfont = new wxFont(font); - wxColor color = font_data.GetColour(); - FontMgr::Get().SetFont(sel_text_element, psfont, color); - gFrame->UpdateAllFonts(); - m_bfontChanged = true; - OnFontChoice(event); + int retval = dg.ShowModal(); + if (wxID_CANCEL != retval) { + font_data = dg.GetFontData(); + wxFont font = font_data.GetChosenFont(); + wxFont* psfont = new wxFont(font); + wxColor color = font_data.GetColour(); + FontMgr::Get().SetFont(sel_text_element, psfont, color); + gFrame->UpdateAllFonts(); + m_bfontChanged = true; + OnFontChoice(event); + } } #ifdef __ANDROID__ @@ -8213,8 +8185,7 @@ void options::DoOnPageChange(size_t page) { // Look explicitely to see if .mo is available wxString test_dir = lang_dir + lang_suffix; - if (!wxDir::Exists(test_dir)) - continue; + if (!wxDir::Exists(test_dir)) continue; m_itemLangListBox->Append(loc_lang_name); } @@ -8243,8 +8214,10 @@ void options::DoOnPageChange(size_t page) { if (ltest.IsLoaded(_T("opencpn"))) { auto x = wxLocale::GetLanguageInfo(lang_list[it]); wxString s0; - if (x) s0 = x->CanonicalName; - else continue; + if (x) + s0 = x->CanonicalName; + else + continue; wxString sl = wxLocale::GetLanguageName(lang_list[it]); if (wxNOT_FOUND == lang_array.Index(s0)) { lang_array.Add(s0); @@ -8308,9 +8281,8 @@ void options::DoOnPageChange(size_t page) { // Build the PlugIn Manager Panel ::wxBeginBusyCursor(); - m_pPlugInCtrl = - new PluginListPanel(itemPanelPlugins, ID_PANELPIM, wxDefaultPosition, - wxDefaultSize); + m_pPlugInCtrl = new PluginListPanel(itemPanelPlugins, ID_PANELPIM, + wxDefaultPosition, wxDefaultSize); m_pPlugInCtrl->SetScrollRate(m_scrollRate, m_scrollRate); itemBoxSizerPanelPlugins->Add(m_pPlugInCtrl, 01, wxEXPAND | wxGROW | wxALL, 4); @@ -8376,8 +8348,7 @@ void options::OnButtonTestSound(wxCommandEvent& event) { auto sound = SoundFactory(); auto cmd_sound = dynamic_cast(sound); if (cmd_sound) cmd_sound->SetCmd(g_CmdSoundString.mb_str()); - sound->SetFinishedCallback( - [&](void* snd) { m_on_sound_done.Notify(snd); }); + sound->SetFinishedCallback([&](void* snd) { m_on_sound_done.Notify(snd); }); sound->Load(m_soundPanelAIS->GetSoundFile(), g_iSoundDeviceIndex); sound->Play(); } @@ -8432,7 +8403,8 @@ wxString GetOCPNKnownLanguage(wxString lang_canonical, wxString& lang_dir) { dir_suffix = _T("pt_PT"); return_string = wxString("Português", wxConvUTF8); - } else if ((lang_canonical == _T("pt_BR")) || (lang_canonical == _T("pt_BR"))) { + } else if ((lang_canonical == _T("pt_BR")) || + (lang_canonical == _T("pt_BR"))) { dir_suffix = _T("pt_BR"); return_string = wxString("Português Brasileiro", wxConvUTF8); @@ -8464,37 +8436,42 @@ wxString GetOCPNKnownLanguage(wxString lang_canonical, wxString& lang_dir) { dir_suffix = _T("hu_HU"); return_string = wxString("Magyar", wxConvUTF8); - } else if ((lang_canonical == _T("zh_TW")) || (lang_canonical == _T("zh_TW"))) { + } else if ((lang_canonical == _T("zh_TW")) || + (lang_canonical == _T("zh_TW"))) { dir_suffix = _T("zh_TW"); return_string = wxString("正體字", wxConvUTF8); - } else if ((lang_canonical == _T("zh_CN")) || (lang_canonical == _T("zh_CN"))) { - dir_suffix = _T("zh_CN"); - return_string = wxString("Simplified Chinese", wxConvUTF8); + } else if ((lang_canonical == _T("zh_CN")) || + (lang_canonical == _T("zh_CN"))) { + dir_suffix = _T("zh_CN"); + return_string = wxString("Simplified Chinese", wxConvUTF8); } else if ((lang_canonical == _T("ca_ES")) || (lang_canonical == _T("ca"))) { dir_suffix = _T("ca_ES"); return_string = wxString("Catalan", wxConvUTF8); - } else if ((lang_canonical == _T("gl_ES")) || (lang_canonical == _T("gl_ES"))) { + } else if ((lang_canonical == _T("gl_ES")) || + (lang_canonical == _T("gl_ES"))) { dir_suffix = _T("gl_ES"); return_string = wxString("Galician", wxConvUTF8); - } else if ((lang_canonical == _T("ja_JP")) || (lang_canonical == _T("ja_JP"))) { + } else if ((lang_canonical == _T("ja_JP")) || + (lang_canonical == _T("ja_JP"))) { dir_suffix = _T("ja_JP"); return_string = wxString("Japanese", wxConvUTF8); - } else if ((lang_canonical == _T("vi_VN")) || (lang_canonical == _T("vi_VN"))) { + } else if ((lang_canonical == _T("vi_VN")) || + (lang_canonical == _T("vi_VN"))) { dir_suffix = _T("vi_VN"); return_string = wxString("Vietnamese", wxConvUTF8); } else { dir_suffix = lang_canonical; const wxLanguageInfo* info = wxLocale::FindLanguageInfo(lang_canonical); - if(info) - return_string = info->Description; + if (info) + return_string = info->Description; else - return_string = lang_canonical; + return_string = lang_canonical; } lang_dir = dir_suffix; @@ -8502,7 +8479,6 @@ wxString GetOCPNKnownLanguage(wxString lang_canonical, wxString& lang_dir) { return return_string; } - wxString GetOCPNKnownLanguage(const wxString lang_canonical) { wxString lang_dir; return GetOCPNKnownLanguage(lang_canonical, lang_dir); @@ -8540,8 +8516,7 @@ EVT_NOTEBOOK_PAGE_CHANGED( ChartGroupsUI::OnGroupPageChange) // This should work under Windows :-( END_EVENT_TABLE() -ChartGroupsUI::ChartGroupsUI(wxWindow* parent) - : wxScrolledWindow(parent) { +ChartGroupsUI::ChartGroupsUI(wxWindow* parent) : wxScrolledWindow(parent) { m_GroupSelectedPage = -1; m_pActiveChartsTree = 0; pParent = parent; @@ -8585,7 +8560,8 @@ void ChartGroupsUI::PopulateTrees(void) { if (!dirname.IsEmpty()) dir_array.Add(dirname); } - PopulateTreeCtrl(allAvailableCtl->GetTreeCtrl(), dir_array, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT), + PopulateTreeCtrl(allAvailableCtl->GetTreeCtrl(), dir_array, + wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT), dialogFont); m_pActiveChartsTree = allAvailableCtl->GetTreeCtrl(); @@ -8702,7 +8678,7 @@ void ChartGroupsUI::OnRemoveChartItem(wxCommandEvent& event) { int group_item_index = FindGroupBranch(pGroup, ptree, id, &branch_adder); if (group_item_index >= 0) { - ChartGroupElement &pelement = + ChartGroupElement& pelement = pGroup->m_element_array[group_item_index]; bool b_duplicate = FALSE; for (unsigned int k = 0; k < pelement.m_missing_name_array.size(); @@ -8863,7 +8839,7 @@ int ChartGroupsUI::FindGroupBranch(ChartGroup* pGroup, wxTreeCtrl* ptree, unsigned int target_item_index = -1; for (unsigned int i = 0; i < pGroup->m_element_array.size(); i++) { - const wxString &target = pGroup->m_element_array[i].m_element_name; + const wxString& target = pGroup->m_element_array[i].m_element_name; if (branch_name == target) { target_item_index = i; break; @@ -8889,7 +8865,7 @@ void ChartGroupsUI::OnNodeExpanded(wxTreeEvent& event) { if (target_item_index < 0) return; const ChartGroupElement& target_element = pGroup->m_element_array[target_item_index]; - const wxString &branch_name = target_element.m_element_name; + const wxString& branch_name = target_element.m_element_name; // Walk the children of the expanded node, marking any items which appear in // the "missing" list @@ -8904,8 +8880,8 @@ void ChartGroupsUI::OnNodeExpanded(wxTreeEvent& event) { wxString target_string = full_root; target_string += ptree->GetItemText(child); - for (unsigned int k = 0; - k < target_element.m_missing_name_array.GetCount(); k++) { + for (unsigned int k = 0; k < target_element.m_missing_name_array.GetCount(); + k++) { if (target_element.m_missing_name_array[k] == target_string) { ptree->SetItemTextColour(child, wxColour(128, 128, 128)); break; @@ -8925,7 +8901,7 @@ void ChartGroupsUI::BuildNotebookPages(ChartGroupArray* pGroupArray) { wxString itemname; int nItems = pGroup->m_element_array.size(); for (int i = 0; i < nItems; i++) { - const wxString &itemname = pGroup->m_element_array[i].m_element_name; + const wxString& itemname = pGroup->m_element_array[i].m_element_name; if (!itemname.IsEmpty()) { wxDirItemData* dir_item = new wxDirItemData(itemname, itemname, TRUE); wxTreeItemId id = @@ -9015,7 +8991,6 @@ void options::OnRemoveTideDataLocation(wxCommandEvent& event) { } } - // OpenGLOptionsDlg enum { ID_BUTTON_REBUILD, ID_BUTTON_CLEAR }; @@ -9140,14 +9115,13 @@ int OpenGLOptionsDlg::GetTextureMemorySize(void) const { } void OpenGLOptionsDlg::Populate(void) { - m_cbTextureCompression->SetValue(g_GLOptions.m_bTextureCompression); /* disable caching if unsupported */ -// if (b_glEntryPointsSet && !s_glCompressedTexImage2D) { -// g_GLOptions.m_bTextureCompressionCaching = FALSE; -// m_cbTextureCompression->Disable(); -// m_cbTextureCompression->SetValue(FALSE); -// } + // if (b_glEntryPointsSet && !s_glCompressedTexImage2D) { + // g_GLOptions.m_bTextureCompressionCaching = FALSE; + // m_cbTextureCompression->Disable(); + // m_cbTextureCompression->SetValue(FALSE); + // } m_cbTextureCompressionCaching->Show(g_bGLexpert); m_memorySize->Show(g_bGLexpert); @@ -9283,9 +9257,11 @@ void CanvasConfigSelect::SetSelected(bool selected) { m_bSelected = selected; if (selected) { - m_boxColour = wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT); + m_boxColour = + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT); } else { - m_boxColour = wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW); + m_boxColour = + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_WINDOW); } Refresh(true); @@ -9304,11 +9280,15 @@ void CanvasConfigSelect::OnPaint(wxPaintEvent& event) { if (m_bSelected) { dc.SetBrush(wxBrush(m_boxColour)); - dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT), 3)); + dc.SetPen(wxPen( + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT), + 3)); dc.DrawRoundedRectangle(0, 0, width - 1, height - 1, height / 10); } else { dc.SetBrush(wxBrush(m_boxColour)); - dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT), 3)); + dc.SetPen(wxPen( + wxSystemSettings::GetColour(wxSystemColour::wxSYS_COLOUR_HIGHLIGHT), + 3)); dc.DrawRoundedRectangle(0, 0, width - 1, height - 1, height / 10); } diff --git a/gui/src/peer_client_dlg.cpp b/gui/src/peer_client_dlg.cpp index c044bddbe4..fc824a9e86 100644 --- a/gui/src/peer_client_dlg.cpp +++ b/gui/src/peer_client_dlg.cpp @@ -146,8 +146,6 @@ void PinConfirmDlg::SetPincodeText(const wxString& message) { GetSizer()->Fit(this); } -void PinConfirmDlg::OnOKClick(wxCommandEvent&) { - EndModal(wxID_OK); -} +void PinConfirmDlg::OnOKClick(wxCommandEvent&) { EndModal(wxID_OK); } void PinConfirmDlg::OnCancelClick(wxCommandEvent&) { EndModal(wxID_CANCEL); } diff --git a/gui/src/piano.cpp b/gui/src/piano.cpp index 2d55da711b..f92aaade8b 100644 --- a/gui/src/piano.cpp +++ b/gui/src/piano.cpp @@ -97,7 +97,7 @@ Piano::Piano(ChartCanvas *parent) { m_width = 0; //> SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // on WXMSW, this prevents - //flashing on color scheme change + // flashing on color scheme change m_pVizIconBmp = NULL; m_pInVizIconBmp = NULL; @@ -154,8 +154,7 @@ void Piano::Paint(int y, ocpnDC &dc, wxDC *shapeDC) { bool selected = IsAnyActiveChartInPianoKeyElement(m_composite_array[i]); - if (chart_type == CHART_TYPE_CM93 || - chart_type == CHART_TYPE_CM93COMP) { + if (chart_type == CHART_TYPE_CM93 || chart_type == CHART_TYPE_CM93COMP) { if (selected) dc.SetBrush(m_scBrush); else @@ -165,7 +164,7 @@ void Piano::Paint(int y, ocpnDC &dc, wxDC *shapeDC) { dc.SetBrush(m_tileBrush); else dc.SetBrush(m_utileBrush); - } else if (chart_family == CHART_FAMILY_VECTOR) { + } else if (chart_family == CHART_FAMILY_VECTOR) { if (selected) dc.SetBrush(m_svBrush); else @@ -194,7 +193,7 @@ void Piano::Paint(int y, ocpnDC &dc, wxDC *shapeDC) { } if (IsAllEclipsedChartInPianoKeyElement(m_composite_array[i])) { - //if (InArray(m_eclipsed_index_array, key_db_index)) { + // if (InArray(m_eclipsed_index_array, key_db_index)) { dc.SetBrush(m_backBrush); int w = 3; dc.DrawRoundedRectangle(box.x + w, box.y + w, box.width - (2 * w), @@ -365,9 +364,7 @@ void Piano::BuildGLTexture() { #endif } -void Piano::DrawGL(int off) { - return DrawGLSL(off); -} +void Piano::DrawGL(int off) { return DrawGLSL(off); } void Piano::DrawGLSL(int off) { #ifdef ocpnUSE_GL unsigned int w = m_parentCanvas->GetClientSize().x * @@ -552,7 +549,7 @@ void Piano::DrawGLSL(int off) { glDisable(GL_TEXTURE_2D); delete[] texcoords; delete[] coords; -#endif //gl +#endif // gl } void Piano::SetColorScheme(ColorScheme cs) { @@ -592,26 +589,26 @@ void Piano::ShowBusy(bool busy) { // Update(); } -bool Piano::IsAnyActiveChartInPianoKeyElement(PianoKeyElement &pke){ - for (auto &index : m_active_index_array){ +bool Piano::IsAnyActiveChartInPianoKeyElement(PianoKeyElement &pke) { + for (auto &index : m_active_index_array) { auto found = find(pke.dbindex_list.begin(), pke.dbindex_list.end(), index); - if (found != pke.dbindex_list.end()) - return true; + if (found != pke.dbindex_list.end()) return true; } return false; } -bool Piano::IsAllEclipsedChartInPianoKeyElement(PianoKeyElement &pke){ +bool Piano::IsAllEclipsedChartInPianoKeyElement(PianoKeyElement &pke) { bool bfound_all = true; - for (auto &index : pke.dbindex_list){ - auto found = find(m_eclipsed_index_array.begin(), m_eclipsed_index_array.end(), index); - if (found == m_eclipsed_index_array.end()) - bfound_all = false; + for (auto &index : pke.dbindex_list) { + auto found = find(m_eclipsed_index_array.begin(), + m_eclipsed_index_array.end(), index); + if (found == m_eclipsed_index_array.end()) bfound_all = false; } return bfound_all; } -void Piano::SetKeyArray(std::vector ¢er_array, std::vector &full_array) { +void Piano::SetKeyArray(std::vector ¢er_array, + std::vector &full_array) { // Measure the available space for keys, and so decide on mode // To account for scaling, etc., measure in parent base character size. if (center_array.size()) { @@ -631,13 +628,13 @@ void Piano::SetKeyArray(std::vector ¢er_array, std::vector &full_a m_key_array.clear(); } - // Create the composite array m_composite_array.clear(); if (m_piano_mode == PIANO_MODE_COMPOSITE) { for (size_t i = 0; i < m_key_array.size(); i++) { - const ChartTableEntry &cte = ChartData->GetChartTableEntry(m_key_array[i]); + const ChartTableEntry &cte = + ChartData->GetChartTableEntry(m_key_array[i]); int scale = cte.GetScale(); auto order = std::pow(10, std::floor(std::log10(scale))); scale = std::ceil(scale / order) * order; @@ -646,13 +643,15 @@ void Piano::SetKeyArray(std::vector ¢er_array, std::vector &full_a int chart_family = cte.GetChartFamily(); // Perform scale compositing only for vector-family charts - // and Raster Family charts.. + // and Raster Family charts excluding MBTiles.. // All other families/types retain legacy piano keys, implemented as // PianoKeyElement with only one chart in the array. if ((cte.GetChartFamily() == CHART_FAMILY_VECTOR) || - (cte.GetChartFamily() == CHART_FAMILY_RASTER)) { + ((cte.GetChartFamily() == CHART_FAMILY_RASTER) && + (cte.GetChartType() != CHART_TYPE_MBTILES))) { auto predicate = [scale, chart_family](const PianoKeyElement &pke) { - return ((scale == pke.chart_scale) && (chart_family == pke.chart_family)); + return ((scale == pke.chart_scale) && + (chart_family == pke.chart_family)); }; auto found = find_if(m_composite_array.begin(), m_composite_array.end(), predicate); @@ -676,10 +675,10 @@ void Piano::SetKeyArray(std::vector ¢er_array, std::vector &full_a m_composite_array.push_back(new_pke); } } - } - else { + } else { for (size_t i = 0; i < m_key_array.size(); i++) { - const ChartTableEntry &cte = ChartData->GetChartTableEntry(m_key_array[i]); + const ChartTableEntry &cte = + ChartData->GetChartTableEntry(m_key_array[i]); int scale = cte.GetScale(); int chart_type = cte.GetChartType(); PianoKeyElement new_pke; @@ -692,9 +691,10 @@ void Piano::SetKeyArray(std::vector ¢er_array, std::vector &full_a } // Sort the composite array - std::sort(m_composite_array.begin(),m_composite_array.end(), - [](PianoKeyElement &a, PianoKeyElement &b){ return a.chart_scale < b.chart_scale; }); - + std::sort(m_composite_array.begin(), m_composite_array.end(), + [](PianoKeyElement &a, PianoKeyElement &b) { + return a.chart_scale < b.chart_scale; + }); } void Piano::SetNoshowIndexArray(std::vector array) { @@ -786,8 +786,7 @@ void Piano::FormatKeys(void) { ocpnStyle::Style *style = g_StyleManager->GetCurrentStyle(); int width = m_parentCanvas->GetClientSize().x; #ifdef __WXOSX__ - if (g_bopengl) - width *= m_parentCanvas->GetContentScaleFactor(); + if (g_bopengl) width *= m_parentCanvas->GetContentScaleFactor(); #else width *= m_parentCanvas->GetContentScaleFactor(); #endif @@ -796,12 +795,18 @@ void Piano::FormatKeys(void) { wxSize mui_tool_size = g_StyleManager->GetCurrentStyle()->GetToolSize(); // MuiBar has boosted the MUIButton default size by 125% mui_tool_size = wxSize(mui_tool_size.x * 1.25, mui_tool_size.y * 1.25); - // Muibar horizontal is about 7 "icons" wide. - int mui_bar_width_est = mui_tool_size.x * 7 * g_toolbar_scalefactor; + // Muibar horizontal is about 8 "icons" wide. + int mui_bar_width_est = mui_tool_size.x * 8 * g_toolbar_scalefactor; - width *= g_btouch ? 0.98f : 0.6f; - width = wxMin(width, m_parentCanvas->GetClientSize().x - mui_bar_width_est); - width = wxMax(width, mui_bar_width_est); + if (m_parentCanvas->GetClientSize().x < m_parentCanvas->GetClientSize().y) { + // portrait mode, on a phone or tablet, etc. + width *= 0.6; + } else { + width *= 0.6; + // width = wxMin(width, m_parentCanvas->GetClientSize().x - + // mui_bar_width_est); + } + // width = wxMax(width, mui_bar_width_est); // Max width available m_width_avail = width; @@ -813,7 +818,7 @@ void Piano::FormatKeys(void) { if (nKeys) { if (!kw) kw = width / nKeys; - //kw = wxMin(kw, (width * 3 / 4) / nKeys); + // kw = wxMin(kw, (width * 3 / 4) / nKeys); kw = wxMax(kw, 6); // Build the Key Regions @@ -841,7 +846,7 @@ bool Piano::MouseEvent(wxMouseEvent &event) { int x, y; event.GetPosition(&x, &y); #ifdef __WXOSX__ - if (g_bopengl){ + if (g_bopengl) { x *= OCPN_GetDisplayContentScaleFactor(); y *= OCPN_GetDisplayContentScaleFactor(); } @@ -850,8 +855,7 @@ bool Piano::MouseEvent(wxMouseEvent &event) { #endif int ytop = m_parentCanvas->GetCanvasHeight() - GetHeight(); #ifdef __WXOSX__ - if (!g_bopengl) - ytop = m_parentCanvas->GetClientSize().y - GetHeight(); + if (!g_bopengl) ytop = m_parentCanvas->GetClientSize().y - GetHeight(); #endif if (event.Leaving() || (y < ytop) || (x > GetWidth())) { @@ -892,10 +896,10 @@ bool Piano::MouseEvent(wxMouseEvent &event) { } else if (event.RightDown()) { if (sel_index != m_hover_last) { if (sel_index >= 0) - m_parentCanvas->HandlePianoRollover(sel_index, - m_composite_array[sel_index].dbindex_list, - m_composite_array[sel_index].dbindex_list.size(), - m_composite_array[sel_index].chart_scale ); + m_parentCanvas->HandlePianoRollover( + sel_index, m_composite_array[sel_index].dbindex_list, + m_composite_array[sel_index].dbindex_list.size(), + m_composite_array[sel_index].chart_scale); m_hover_last = sel_index; // m_action = INFOWIN_TIMEOUT; @@ -911,26 +915,26 @@ bool Piano::MouseEvent(wxMouseEvent &event) { ResetRollover(); } else if (event.LeftDown()) { if (-1 != sel_index) { - m_parentCanvas->HandlePianoClick(sel_index, - m_composite_array[sel_index].dbindex_list); + m_parentCanvas->HandlePianoClick( + sel_index, m_composite_array[sel_index].dbindex_list); m_parentCanvas->Raise(); } else return false; } else if (event.RightDown()) { if (-1 != sel_index) { - m_parentCanvas->HandlePianoRClick(x, y, sel_index, - m_composite_array[sel_index].dbindex_list); + m_parentCanvas->HandlePianoRClick( + x, y, sel_index, m_composite_array[sel_index].dbindex_list); m_parentCanvas->Raise(); } else return false; } else if (!event.ButtonUp()) { if (sel_index != m_hover_last) { if (sel_index >= 0) - m_parentCanvas->HandlePianoRollover(sel_index, - m_composite_array[sel_index].dbindex_list, - m_composite_array[sel_index].dbindex_list.size(), - m_composite_array[sel_index].chart_scale ); + m_parentCanvas->HandlePianoRollover( + sel_index, m_composite_array[sel_index].dbindex_list, + m_composite_array[sel_index].dbindex_list.size(), + m_composite_array[sel_index].chart_scale); m_hover_last = sel_index; } @@ -959,10 +963,9 @@ void Piano::ResetRollover(void) { } int Piano::GetHeight() { - int height = 22 ; + int height = 22; #ifdef __WXOSX__ - if (g_bopengl) - height *= m_parentCanvas->GetContentScaleFactor(); + if (g_bopengl) height *= m_parentCanvas->GetContentScaleFactor(); #endif if (g_btouch) { double size_mult = exp(g_GUIScaleFactor * 0.0953101798043); // ln(1.1) @@ -994,8 +997,9 @@ void Piano::onTimerEvent(wxTimerEvent &event) { m_parentCanvas->ClearPianoRollover(); ResetRollover(); } else { - m_parentCanvas->HandlePianoClick(m_click_sel_index, - m_composite_array[m_click_sel_index].dbindex_list); + m_parentCanvas->HandlePianoClick( + m_click_sel_index, + m_composite_array[m_click_sel_index].dbindex_list); m_gotPianoDown = false; } break; diff --git a/gui/src/pluginmanager.cpp b/gui/src/pluginmanager.cpp index 3f2cca72be..726fc3dd18 100644 --- a/gui/src/pluginmanager.cpp +++ b/gui/src/pluginmanager.cpp @@ -38,8 +38,6 @@ #include #include - - #ifdef __MINGW32__ #undef IPV6STRICT // mingw FTBS fix: missing struct ip_mreq #include @@ -304,7 +302,7 @@ class BlacklistUI { m_defer = false; } - BlacklistUI() : m_defer(true){}; + BlacklistUI() : m_defer(true) {}; private: void show_msg(wxString msg) { @@ -504,8 +502,8 @@ static void gui_uninstall(const PlugInData* pic, const char* plugin) { static bool LoadAllPlugIns(bool load_enabled, bool keep_orphans = false) { g_Platform->ShowBusySpinner(); - bool b = PluginLoader::getInstance()->LoadAllPlugIns(load_enabled, - keep_orphans); + bool b = + PluginLoader::getInstance()->LoadAllPlugIns(load_enabled, keep_orphans); g_Platform->HideBusySpinner(); return b; } @@ -947,7 +945,8 @@ PlugInManager::PlugInManager(MyFrame* parent) { HandlePluginLoaderEvents(); InitCommListeners(); auto msg_sent_action = [](ObservedEvt ev) { - SendNMEASentenceToAllPlugIns(ev.GetString()); }; + SendNMEASentenceToAllPlugIns(ev.GetString()); + }; m_on_msg_sent_listener.Init(g_pRouteMan->on_message_sent, msg_sent_action); } PlugInManager::~PlugInManager() { @@ -3071,7 +3070,9 @@ wxString getUsrDistanceUnit_Plugin(int unit) { wxString getUsrSpeedUnit_Plugin(int unit) { return getUsrSpeedUnit(unit); } -wxString getUsrWindSpeedUnit_Plugin(int unit) { return getUsrWindSpeedUnit(unit); } +wxString getUsrWindSpeedUnit_Plugin(int unit) { + return getUsrWindSpeedUnit(unit); +} wxString getUsrTempUnit_Plugin(int unit) { return getUsrTempUnit(unit); } @@ -3271,7 +3272,8 @@ bool UpdateSingleWaypoint(PlugIn_Waypoint* pwaypoint) { if (prp) prp->ReLoadIcon(); auto canvas = gFrame->GetPrimaryCanvas(); - SelectCtx ctx(canvas->m_bShowNavobjects, canvas->GetCanvasTrueScale(), canvas->GetScaleValue()); + SelectCtx ctx(canvas->m_bShowNavobjects, canvas->GetCanvasTrueScale(), + canvas->GetScaleValue()); SelectItem* pFind = pSelect->FindSelection(ctx, lat_save, lon_save, SELTYPE_ROUTEPOINT); if (pFind) { @@ -3905,7 +3907,6 @@ void CatalogMgrPanel::OnUpdateButton(wxCommandEvent& event) { auto cataloghdlr = CatalogHandler::getInstance(); cataloghdlr->ClearCatalogData(); - // Reload all plugins, which will also update the status fields LoadAllPlugIns(false); @@ -3946,8 +3947,10 @@ void CatalogMgrPanel::OnTarballButton(wxCommandEvent& event) { PluginMetadata metadata; bool ok = handler->ExtractMetadata(path.ToStdString(), metadata); if (!ok) { - OCPNMessageBox(this, _("Error extracting metadata from tarball."), - _("OpenCPN Plugin Import Error")); + OCPNMessageBox( + this, + _("Error extracting metadata from tarball (missing metadata.xml?)"), + _("OpenCPN Plugin Import Error")); return; } if (!PluginHandler::isCompatible(metadata)) { @@ -4067,8 +4070,8 @@ std::vector GetInstalled() { } auto compare = [](const PlugInData* lhs, const PlugInData* rhs) { std::string slhs, srhs; - for (auto &cl : lhs->Key()) slhs += toupper(cl); - for (auto &cr : rhs->Key()) srhs += toupper(cr); + for (auto& cl : lhs->Key()) slhs += toupper(cl); + for (auto& cr : rhs->Key()) srhs += toupper(cr); return slhs.compare(srhs) < 0; }; std::sort(result.begin(), result.end(), compare); @@ -4116,7 +4119,7 @@ void PluginListPanel::ReloadPluginPanels() { if (safe_mode::get_mode()) { /** Add panels for installed, unloaded plugins. */ auto installed = PluginHandler::getInstance()->GetInstalldataPlugins(); - for (const auto& name : installed) AddPlugin(name) ; + for (const auto& name : installed) AddPlugin(name); } else { /* The catalog entries. */ auto available = getCompatiblePlugins(); @@ -4130,10 +4133,11 @@ void PluginListPanel::ReloadPluginPanels() { // Sort on case-insensitive name struct CompSort { - bool operator()(const PluginMetadata& lhs, const PluginMetadata rhs) const { + bool operator()(const PluginMetadata& lhs, + const PluginMetadata rhs) const { std::string slhs, srhs; - for (auto &cl : lhs.name) slhs += toupper(cl); - for (auto &cr : rhs.name) srhs += toupper(cr); + for (auto& cl : lhs.name) slhs += toupper(cl); + for (auto& cr : rhs.name) srhs += toupper(cr); return slhs.compare(srhs) < 0; } } comp_sort; @@ -4327,7 +4331,6 @@ PluginPanel::PluginPanel(wxPanel* parent, const std::string& name) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE), m_is_safe_panel(true) { - m_PluginListPanel = dynamic_cast(parent); wxASSERT(m_PluginListPanel != 0); wxBoxSizer* top_sizer = new wxBoxSizer(wxVERTICAL); @@ -4355,14 +4358,13 @@ PluginPanel::PluginPanel(wxPanel* parent, const std::string& name) top_horizontal->Add(m_info_btn); m_pButtonUninstall = new wxButton(this, wxID_ANY, _("Uninstall"), wxDefaultPosition, wxDefaultSize, 0); - top_horizontal->Add(m_pButtonUninstall, 0, - wxALIGN_CENTER_VERTICAL | wxALL, 2); + top_horizontal->Add(m_pButtonUninstall, 0, wxALIGN_CENTER_VERTICAL | wxALL, + 2); auto uninstall = [&](wxCommandEvent ev) { auto n = m_pName->GetLabel().ToStdString(); - int result = OCPNMessageBox(gFrame, - std::string(_("Uninstall plugin ")) + n + "?", - _("Un-Installation"), - wxICON_QUESTION | wxOK | wxCANCEL); + int result = + OCPNMessageBox(gFrame, std::string(_("Uninstall plugin ")) + n + "?", + _("Un-Installation"), wxICON_QUESTION | wxOK | wxCANCEL); if (result != wxID_OK) return; PluginHandler::getInstance()->ClearInstallData(n); m_PluginListPanel->ReloadPluginPanels(); @@ -4509,7 +4511,7 @@ PluginPanel::PluginPanel(wxPanel* parent, wxWindowID id, const wxPoint& pos, if (m_plugin.m_status == PluginStatus::ManagedInstallAvailable || m_plugin.m_status == PluginStatus::System || (m_plugin.m_status == PluginStatus::Unmanaged && - !m_plugin.m_managed_metadata.is_orphan) ) { + !m_plugin.m_managed_metadata.is_orphan)) { m_pVersion->Hide(); } m_pVersion->Bind(wxEVT_LEFT_DOWN, &PluginPanel::OnPluginSelected, this); @@ -4598,8 +4600,10 @@ PluginPanel::PluginPanel(wxPanel* parent, wxWindowID id, const wxPoint& pos, m_itemStatusIconBitmap = new wxStaticBitmap(this, wxID_ANY, statusBitmap); m_itemStatusIconBitmap->SetToolTip(message_by_status(stat)); - m_itemStatusIconBitmap->Bind(wxEVT_LEFT_DOWN, &PluginPanel::OnPluginSelected, this); - m_itemStatusIconBitmap->Bind(wxEVT_LEFT_UP, &PluginPanel::OnPluginSelectedUp, this); + m_itemStatusIconBitmap->Bind(wxEVT_LEFT_DOWN, &PluginPanel::OnPluginSelected, + this); + m_itemStatusIconBitmap->Bind(wxEVT_LEFT_UP, &PluginPanel::OnPluginSelectedUp, + this); itemBoxSizer01->Add(m_itemStatusIconBitmap, 0, wxEXPAND | wxALL, 20); @@ -4619,7 +4623,7 @@ PluginPanel::PluginPanel(wxPanel* parent, wxWindowID id, const wxPoint& pos, PluginPanel::PluginPanel(wxPanel* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, PluginMetadata md) - : PluginPanel(parent, id, pos, size, PlugInData(md)){}; + : PluginPanel(parent, id, pos, size, PlugInData(md)) {}; PluginPanel::~PluginPanel() { Unbind(wxEVT_LEFT_DOWN, &PluginPanel::OnPluginSelected, this); @@ -4719,8 +4723,7 @@ void PluginPanel::SetSelected(bool selected) { unInstallPossible = false; // Orphan plugins can usually be uninstalled, at best effort. - if (m_plugin.m_managed_metadata.is_orphan) - unInstallPossible = true; + if (m_plugin.m_managed_metadata.is_orphan) unInstallPossible = true; m_pButtonUninstall->Show(unInstallPossible); @@ -4785,7 +4788,7 @@ void PluginPanel::SetSelected(bool selected) { SetActionLabel(label); const auto plugin_name = m_plugin.m_common_name.ToStdString(); if (ocpn::exists(PluginHandler::ImportedMetadataPath(plugin_name))) { - m_pButtonAction->Hide(); + m_pButtonAction->Hide(); } Layout(); @@ -4905,13 +4908,12 @@ void PluginPanel::OnPluginAction(wxCommandEvent& event) { return; } -static void SetWindowFontStyle(wxWindow* window, wxFontStyle style) { +static void SetWindowFontStyle(wxWindow* window, wxFontStyle style) { auto font = window->GetFont(); font.SetStyle(style); window->SetFont(font); } - void PluginPanel::SetEnabled(bool enabled) { if (m_is_safe_panel) return; PluginLoader::getInstance()->SetEnabled(m_plugin.m_common_name, enabled); @@ -5511,7 +5513,7 @@ bool ChartPlugInWrapper::RenderRegionViewOnGL(const wxGLContext& glc, glChartCanvas::DisableClipRegion(); } //! empty - } // for + } // for delete r; } } else @@ -5580,7 +5582,7 @@ bool ChartPlugInWrapper::RenderRegionViewOnGLNoText( glChartCanvas::DisableClipRegion(); } //! empty - } // for + } // for delete r; } @@ -7748,7 +7750,8 @@ bool UpdateSingleWaypointEx(PlugIn_Waypoint_Ex* pwaypoint) { if (prp) prp->ReLoadIcon(); auto canvas = gFrame->GetPrimaryCanvas(); - SelectCtx ctx(canvas->m_bShowNavobjects, canvas->GetCanvasTrueScale(), canvas->GetScaleValue()); + SelectCtx ctx(canvas->m_bShowNavobjects, canvas->GetCanvasTrueScale(), + canvas->GetScaleValue()); SelectItem* pFind = pSelect->FindSelection(ctx, lat_save, lon_save, SELTYPE_ROUTEPOINT); if (pFind) { diff --git a/gui/src/printtable.cpp b/gui/src/printtable.cpp index b848f28c88..7c8c73efc9 100644 --- a/gui/src/printtable.cpp +++ b/gui/src/printtable.cpp @@ -35,7 +35,7 @@ #include #endif // precompiled headers #ifdef __WXMSW__ -//#include "c:\\Program Files\\visual leak detector\\include\\vld.h" +// #include "c:\\Program Files\\visual leak detector\\include\\vld.h" #endif #include diff --git a/gui/src/priority_gui.cpp b/gui/src/priority_gui.cpp index 9f0ac716a4..c85dbd3687 100644 --- a/gui/src/priority_gui.cpp +++ b/gui/src/priority_gui.cpp @@ -47,24 +47,21 @@ #include "ocpn_frame.h" #include "ocpn_plugin.h" -extern MyFrame *gFrame; - +extern MyFrame* gFrame; class PriorityEntry : public wxTreeItemData { public: - PriorityEntry(int category, int index){ m_category = category, m_index=index; } + PriorityEntry(int category, int index) { + m_category = category, m_index = index; + } ~PriorityEntry() {}; int m_category, m_index; }; - - - PriorityDlg::PriorityDlg(wxWindow* parent) : wxDialog(parent, wxID_ANY, _("Adjust Comm Priorities"), wxDefaultPosition, - wxSize(480, 420), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) -{ + wxSize(480, 420), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { m_selIndex = 0; m_selmap_index = 0; @@ -78,15 +75,15 @@ PriorityDlg::PriorityDlg(wxWindow* parent) wxStaticBoxSizer* stcSizer = new wxStaticBoxSizer(pclbBox, wxVERTICAL); secondSizer->Add(stcSizer, 1, wxALL | wxEXPAND, 5); - m_prioTree = new wxTreeCtrl(this,wxID_ANY, wxDefaultPosition, - wxDefaultSize); + m_prioTree = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize); stcSizer->Add(m_prioTree, 1, wxALL | wxEXPAND, 5); - wxFont *pF = OCPNGetFont(_T("Dialog"), 0); + wxFont* pF = OCPNGetFont(_T("Dialog"), 0); m_pF = pF; m_prioTree->SetFont(*pF); #ifdef __ANDROID__ - m_prioTree->GetHandle()->setStyleSheet(getWideScrollBarsStyleSheet()/*getScrollBarsStyleSheet()*/); - QScroller::ungrabGesture(m_prioTree->GetHandle()); + m_prioTree->GetHandle()->setStyleSheet( + getWideScrollBarsStyleSheet() /*getScrollBarsStyleSheet()*/); + QScroller::ungrabGesture(m_prioTree->GetHandle()); #endif wxBoxSizer* btnEntrySizer = new wxBoxSizer(wxVERTICAL); @@ -117,23 +114,23 @@ PriorityDlg::PriorityDlg(wxWindow* parent) // Connect Events btnMoveUp->Connect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(PriorityDlg::OnMoveUpClick), NULL, - this); - btnMoveDown->Connect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(PriorityDlg::OnMoveDownClick), NULL, + wxCommandEventHandler(PriorityDlg::OnMoveUpClick), NULL, this); + btnMoveDown->Connect(wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(PriorityDlg::OnMoveDownClick), + NULL, this); btnRefresh->Connect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(PriorityDlg::OnRefreshClick), NULL, - this); + wxCommandEventHandler(PriorityDlg::OnRefreshClick), NULL, + this); btnClear->Connect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(PriorityDlg::OnClearClick), NULL, - this); + wxCommandEventHandler(PriorityDlg::OnClearClick), NULL, + this); m_prioTree->Connect(wxEVT_TREE_SEL_CHANGED, - wxCommandEventHandler(PriorityDlg::OnItemSelected), - NULL, this); + wxCommandEventHandler(PriorityDlg::OnItemSelected), NULL, + this); // Get the current status MyApp& app = wxGetApp(); @@ -147,9 +144,9 @@ PriorityDlg::PriorityDlg(wxWindow* parent) int char_width, char_height; dc.GetTextExtent("W", &char_width, &char_height, NULL, NULL, m_pF); - int stcw = wxMax(m_maxStringLength * 15 / 10, 15 * char_width); - wxSize min_size = wxSize(stcw, - wxMin(gFrame->GetSize().y * 2 /4 , n_lines * GetCharHeight())); + int stcw = wxMax(m_maxStringLength * 15 / 10, 15 * char_width); + wxSize min_size = wxSize( + stcw, wxMin(gFrame->GetSize().y * 2 / 4, n_lines * GetCharHeight())); stcSizer->SetMinSize(min_size); @@ -170,11 +167,10 @@ PriorityDlg::~PriorityDlg() { #endif } -void PriorityDlg::AddLeaves(const std::vector &map_list, +void PriorityDlg::AddLeaves(const std::vector& map_list, size_t map_index, std::string map_name, - wxTreeItemId leaf_parent){ - if(map_list.size() < (size_t)map_index) - return; + wxTreeItemId leaf_parent) { + if (map_list.size() < (size_t)map_index) return; // Get the current Priority container for this branch MyApp& app = wxGetApp(); @@ -191,50 +187,54 @@ void PriorityDlg::AddLeaves(const std::vector &map_list, dc.GetTextExtent(item_string, &char_width, &char_height, NULL, NULL, m_pF); // Record the maximum display string length, for use in dialog sizing. - if (char_width > m_maxStringLength){ + if (char_width > m_maxStringLength) { m_maxStringLength = char_width; m_max_string = item_string; } - PriorityEntry *pe = new PriorityEntry(map_index, index); - wxTreeItemId id_tk = m_prioTree->AppendItem(leaf_parent, item_string, -1, -1, pe); + PriorityEntry* pe = new PriorityEntry(map_index, index); + wxTreeItemId id_tk = + m_prioTree->AppendItem(leaf_parent, item_string, -1, -1, pe); // Set bold text on item currently active (usually 0) - if ( (size_t)(pc.active_priority) == index) - m_prioTree->SetItemBold(id_tk); + if ((size_t)(pc.active_priority) == index) m_prioTree->SetItemBold(id_tk); index++; } } - void PriorityDlg::Populate() { - m_prioTree->Unselect(); m_prioTree->DeleteAllItems(); - m_maxStringLength = 15; // default width calculation + m_maxStringLength = 15; // default width calculation -// wxTreeItemId* rootData = new wxDirItemData(_T("Dummy"), _T("Dummy"), TRUE); + // wxTreeItemId* rootData = new wxDirItemData(_T("Dummy"), _T("Dummy"), + // TRUE); wxTreeItemId m_rootId = m_prioTree->AddRoot(_("Priorities"), -1, -1, NULL); m_prioTree->SetItemHasChildren(m_rootId); - wxTreeItemId id_position = m_prioTree->AppendItem(m_rootId, _("Position"), -1, -1, NULL); + wxTreeItemId id_position = + m_prioTree->AppendItem(m_rootId, _("Position"), -1, -1, NULL); m_prioTree->SetItemHasChildren(id_position); AddLeaves(m_map, 0, "position", id_position); - wxTreeItemId id_velocity = m_prioTree->AppendItem(m_rootId, _("Speed/Course"), -1, -1, NULL); + wxTreeItemId id_velocity = + m_prioTree->AppendItem(m_rootId, _("Speed/Course"), -1, -1, NULL); m_prioTree->SetItemHasChildren(id_velocity); AddLeaves(m_map, 1, "velocity", id_velocity); - wxTreeItemId id_heading = m_prioTree->AppendItem(m_rootId, _("Heading"), -1, -1, NULL); + wxTreeItemId id_heading = + m_prioTree->AppendItem(m_rootId, _("Heading"), -1, -1, NULL); m_prioTree->SetItemHasChildren(id_heading); AddLeaves(m_map, 2, "heading", id_heading); - wxTreeItemId id_magvar = m_prioTree->AppendItem(m_rootId, _("Mag Variation"), -1, -1, NULL); + wxTreeItemId id_magvar = + m_prioTree->AppendItem(m_rootId, _("Mag Variation"), -1, -1, NULL); m_prioTree->SetItemHasChildren(id_magvar); AddLeaves(m_map, 3, "variation", id_magvar); - wxTreeItemId id_sats = m_prioTree->AppendItem(m_rootId, _("Satellites"), -1, -1, NULL); + wxTreeItemId id_sats = + m_prioTree->AppendItem(m_rootId, _("Satellites"), -1, -1, NULL); m_prioTree->SetItemHasChildren(id_sats); AddLeaves(m_map, 4, "satellites", id_sats); @@ -246,38 +246,34 @@ void PriorityDlg::Populate() { int i = m_selmap_index; wxTreeItemId cid = m_prioTree->GetFirstChild(rootID, cookie); - while ((i > 0) && cid.IsOk()){ - cid = m_prioTree->GetNextChild( rootID, cookie); + while ((i > 0) && cid.IsOk()) { + cid = m_prioTree->GetNextChild(rootID, cookie); i--; } wxTreeItemId ccid = m_prioTree->GetFirstChild(cid, cookie); int j = m_selIndex; - while ((j > 0) && ccid.IsOk()){ - ccid = m_prioTree->GetNextChild( cid, cookie); + while ((j > 0) && ccid.IsOk()) { + ccid = m_prioTree->GetNextChild(cid, cookie); j--; } - if(ccid.IsOk()) - m_prioTree->SelectItem(ccid); - + if (ccid.IsOk()) m_prioTree->SelectItem(ccid); } - -void PriorityDlg::OnItemSelected(wxCommandEvent& event){ +void PriorityDlg::OnItemSelected(wxCommandEvent& event) { btnMoveUp->Disable(); btnMoveDown->Disable(); wxTreeItemId id = m_prioTree->GetSelection(); - PriorityEntry *pe = (PriorityEntry *)m_prioTree->GetItemData(id); - if (!pe) - return; + PriorityEntry* pe = (PriorityEntry*)m_prioTree->GetItemData(id); + if (!pe) return; m_selIndex = pe->m_index; m_selmap_index = pe->m_category; - if (pe->m_index > 0){ + if (pe->m_index > 0) { btnMoveUp->Enable(); } @@ -292,8 +288,7 @@ void PriorityDlg::OnItemSelected(wxCommandEvent& event){ ch = m_prioTree->GetNextChild(id_parent, cookie); } - if (pe->m_index < n_sibs-1) - btnMoveDown->Enable(); + if (pe->m_index < n_sibs - 1) btnMoveDown->Enable(); } void PriorityDlg::OnMoveUpClick(wxCommandEvent& event) { @@ -304,20 +299,17 @@ void PriorityDlg::OnMoveDownClick(wxCommandEvent& event) { ProcessMove(m_prioTree->GetSelection(), 1); } -void PriorityDlg::ProcessMove(wxTreeItemId id, int dir){ - +void PriorityDlg::ProcessMove(wxTreeItemId id, int dir) { // Get the extra data - PriorityEntry *pe = (PriorityEntry *)m_prioTree->GetItemData(id); - if (!pe) - return; - if(pe->m_category >4) - return; + PriorityEntry* pe = (PriorityEntry*)m_prioTree->GetItemData(id); + if (!pe) return; + if (pe->m_category > 4) return; // Get the selected category string from the map wxString priority_string = wxString(m_map[pe->m_category].c_str()); // Build an array - wxString prio_array[16]; // enough, plus + wxString prio_array[16]; // enough, plus wxStringTokenizer tk(priority_string, "|"); int index = 0; @@ -328,8 +320,8 @@ void PriorityDlg::ProcessMove(wxTreeItemId id, int dir){ int max_index = index; // perform the action - if (dir == -1){ // Move UP - if (pe->m_index > 0){ + if (dir == -1) { // Move UP + if (pe->m_index > 0) { // swap entries in array wxString s_above = prio_array[pe->m_index - 1]; wxString s_move = prio_array[pe->m_index]; @@ -337,9 +329,8 @@ void PriorityDlg::ProcessMove(wxTreeItemId id, int dir){ prio_array[pe->m_index] = s_above; m_selIndex--; } - } - else{ // Move DOWN - if (pe->m_index < max_index){ + } else { // Move DOWN + if (pe->m_index < max_index) { // swap entries in array wxString s_below = prio_array[pe->m_index + 1]; wxString s_move = prio_array[pe->m_index]; @@ -351,8 +342,8 @@ void PriorityDlg::ProcessMove(wxTreeItemId id, int dir){ // create the new string wxString prio_mod; - for (int i=0 ; i < 16 ; i++){ - if (prio_array[i].Length()){ + for (int i = 0; i < 16; i++) { + if (prio_array[i].Length()) { prio_mod += prio_array[i]; prio_mod += wxString("|"); } @@ -363,7 +354,7 @@ void PriorityDlg::ProcessMove(wxTreeItemId id, int dir){ m_map[pe->m_category] = s_upd; // Auto-adjust Sat and COG/SOG priorities if POS has been moved up/down - if (pe->m_category == 0){ + if (pe->m_category == 0) { AdjustSatPriority(); AdjustCOGSOGPriority(); } @@ -400,11 +391,9 @@ void PriorityDlg::OnClearClick(wxCommandEvent& event) { // And reload the tree GUI m_map = app.m_comm_bridge.GetPriorityMaps(); Populate(); - } void PriorityDlg::AdjustSatPriority() { - // Get an array of available sat sources std::string sat_prio = m_map[4]; wxArrayString sat_sources; @@ -426,21 +415,20 @@ void PriorityDlg::AdjustSatPriority() { // search the sat sources array for a match // if found, add to proposed new priority array - for (size_t i = 0 ; i < sat_sources.GetCount(); i++){ - if (pos_channel.IsSameAs(sat_sources[i].BeforeFirst(';'))){ + for (size_t i = 0; i < sat_sources.GetCount(); i++) { + if (pos_channel.IsSameAs(sat_sources[i].BeforeFirst(';'))) { new_sat_prio.Add(sat_sources[i]); // Mark this source as "used" sat_sources[i] = "USED"; break; - } - else { // no match, what to do? //FIXME (dave) + } else { // no match, what to do? //FIXME (dave) int yyp = 4; } } } - // Create a new sat priority string from new_sat_prio array + // Create a new sat priority string from new_sat_prio array wxString proposed_sat_prio; - for (size_t i = 0 ; i < new_sat_prio.GetCount(); i++){ + for (size_t i = 0; i < new_sat_prio.GetCount(); i++) { proposed_sat_prio += new_sat_prio[i]; proposed_sat_prio += wxString("|"); } @@ -450,7 +438,6 @@ void PriorityDlg::AdjustSatPriority() { } void PriorityDlg::AdjustCOGSOGPriority() { - // Get an array of available COG/SOG sources std::string cogsog_prio = m_map[1]; wxArrayString cogsog_sources; @@ -472,21 +459,20 @@ void PriorityDlg::AdjustCOGSOGPriority() { // search the cogsog sources array for a match // if found, add to proposed new priority array - for (size_t i = 0 ; i < cogsog_sources.GetCount(); i++){ - if (pos_channel.IsSameAs(cogsog_sources[i].BeforeFirst(';'))){ + for (size_t i = 0; i < cogsog_sources.GetCount(); i++) { + if (pos_channel.IsSameAs(cogsog_sources[i].BeforeFirst(';'))) { new_cogsog_prio.Add(cogsog_sources[i]); // Mark this source as "used" cogsog_sources[i] = "USED"; break; - } - else { // no match, what to do? //FIXME (dave) + } else { // no match, what to do? //FIXME (dave) int yyp = 4; } } } - // Create a new cog/sog priority string from new_cogsog_prio array + // Create a new cog/sog priority string from new_cogsog_prio array wxString proposed_cogsog_prio; - for (size_t i = 0 ; i < new_cogsog_prio.GetCount(); i++){ + for (size_t i = 0; i < new_cogsog_prio.GetCount(); i++) { proposed_cogsog_prio += new_cogsog_prio[i]; proposed_cogsog_prio += wxString("|"); } diff --git a/gui/src/rest_server_gui.cpp b/gui/src/rest_server_gui.cpp index 3a4f627bbb..dec8d4b9a3 100644 --- a/gui/src/rest_server_gui.cpp +++ b/gui/src/rest_server_gui.cpp @@ -42,15 +42,13 @@ #include "androidUTIL.h" #endif - -extern RouteManagerDialog *pRouteManagerDialog; +extern RouteManagerDialog* pRouteManagerDialog; extern MyFrame* gFrame; static wxDialog* DisplayDlg(const std::string& msg, const std::string& txt1) { - auto dlg = new PINCreateDialog(dynamic_cast(gFrame), wxID_ANY, - _("OpenCPN Server Message"), - "", wxDefaultPosition, wxDefaultSize, - SYMBOL_STG_STYLE ); + auto dlg = new PINCreateDialog( + dynamic_cast(gFrame), wxID_ANY, _("OpenCPN Server Message"), + "", wxDefaultPosition, wxDefaultSize, SYMBOL_STG_STYLE); dlg->SetMessage(msg); dlg->SetText1Message(txt1); dlg->Show(); @@ -58,7 +56,7 @@ static wxDialog* DisplayDlg(const std::string& msg, const std::string& txt1) { } static void UpdateRouteMgr() { - if( pRouteManagerDialog && pRouteManagerDialog->IsShown() ) { + if (pRouteManagerDialog && pRouteManagerDialog->IsShown()) { pRouteManagerDialog->UpdateTrkListCtrl(); pRouteManagerDialog->UpdateWptListCtrl(); pRouteManagerDialog->UpdateRouteListCtrl(); @@ -75,22 +73,23 @@ static AcceptObjectDlgResult RunAcceptObjectDlg(const wxString& msg, RestServerDlgCtx PINCreateDialog::GetDlgCtx() { RestServerDlgCtx ctx; - ctx.run_pincode_dlg = - [](const std::string& msg, const std::string& text1) { - return DisplayDlg(msg, text1); }; + ctx.run_pincode_dlg = [](const std::string& msg, const std::string& text1) { + return DisplayDlg(msg, text1); + }; ctx.update_route_mgr = []() { UpdateRouteMgr(); }; - ctx.run_accept_object_dlg = - [](const wxString& msg, const wxString& check1msg) { - return RunAcceptObjectDlg(msg, check1msg); }; - ctx.top_level_refresh = []() { dynamic_cast(gFrame)->Refresh(); }; + ctx.run_accept_object_dlg = [](const wxString& msg, + const wxString& check1msg) { + return RunAcceptObjectDlg(msg, check1msg); + }; + ctx.top_level_refresh = []() { dynamic_cast(gFrame)->Refresh(); }; return ctx; } IMPLEMENT_DYNAMIC_CLASS(AcceptObjectDialog, wxDialog) BEGIN_EVENT_TABLE(AcceptObjectDialog, wxDialog) - EVT_BUTTON(ID_STG_CANCEL, AcceptObjectDialog::OnCancelClick) - EVT_BUTTON(ID_STG_OK, AcceptObjectDialog::OnOKClick) +EVT_BUTTON(ID_STG_CANCEL, AcceptObjectDialog::OnCancelClick) +EVT_BUTTON(ID_STG_OK, AcceptObjectDialog::OnOKClick) END_EVENT_TABLE() AcceptObjectDialog::AcceptObjectDialog() { @@ -103,16 +102,17 @@ AcceptObjectDialog::AcceptObjectDialog(wxWindow* parent, const wxString& caption, const wxString& msg1, const wxString msg2) - : AcceptObjectDialog(parent, 0, caption, "", wxDefaultPosition, - wxDefaultSize, SYMBOL_STG_STYLE, - msg1, msg2) {} + : AcceptObjectDialog(parent, 0, caption, "", wxDefaultPosition, + wxDefaultSize, SYMBOL_STG_STYLE, msg1, msg2) {} AcceptObjectDialog::AcceptObjectDialog(wxWindow* parent, wxWindowID id, - const wxString& caption, const wxString& hint, - const wxPoint& pos, const wxSize& size, long style, - const wxString& msg1, const wxString& msg2) { + const wxString& caption, + const wxString& hint, const wxPoint& pos, + const wxSize& size, long style, + const wxString& msg1, + const wxString& msg2) { wxFont* pif = FontMgr::Get().GetFont(_T("Dialog")); - SetFont( *pif ); + SetFont(*pif); m_checkbox1_msg = msg2; Create(parent, id, caption, hint, pos, size, style, msg1, msg2); #ifdef __ANDROID__ @@ -126,13 +126,13 @@ AcceptObjectDialog::~AcceptObjectDialog() { #ifdef __ANDROID__ androidEnableRotation(); #endif - } bool AcceptObjectDialog::Create(wxWindow* parent, wxWindowID id, - const wxString& caption, const wxString& hint, - const wxPoint& pos, const wxSize& size, long style, - const wxString& msg1, const wxString& msg2) { + const wxString& caption, const wxString& hint, + const wxPoint& pos, const wxSize& size, + long style, const wxString& msg1, + const wxString& msg2) { SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS); wxDialog::Create(parent, id, caption, pos, size, style); @@ -144,25 +144,24 @@ bool AcceptObjectDialog::Create(wxWindow* parent, wxWindowID id, return TRUE; } -void AcceptObjectDialog::CreateControls(const wxString& hint, const wxString& msg1, const wxString& msg2) { +void AcceptObjectDialog::CreateControls(const wxString& hint, + const wxString& msg1, + const wxString& msg2) { AcceptObjectDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - SetSizer(itemBoxSizer2); - + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); + SetSizer(itemBoxSizer2); // Add a reminder text box itemBoxSizer2->AddSpacer(20); - premtext = new wxStaticText( this, -1, msg1); + premtext = new wxStaticText(this, -1, msg1); itemBoxSizer2->Add(premtext, 0, wxEXPAND | wxALL, 10); m_pCheck1 = new wxCheckBox(this, ID_STG_CHECK1, m_checkbox1_msg); itemBoxSizer2->Add(m_pCheck1, 0, wxEXPAND | wxALL, 10); - if(!m_checkbox1_msg.Length()) - m_pCheck1->Hide(); - + if (!m_checkbox1_msg.Length()) m_pCheck1->Hide(); // OK/Cancel/etc. wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxHORIZONTAL); @@ -172,20 +171,20 @@ void AcceptObjectDialog::CreateControls(const wxString& hint, const wxString& ms wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer16->Add(m_CancelButton, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - m_OKButton = new wxButton(itemDialog1, ID_STG_OK, "OK", - wxDefaultPosition, wxDefaultSize, 0); + m_OKButton = new wxButton(itemDialog1, ID_STG_OK, "OK", wxDefaultPosition, + wxDefaultSize, 0); itemBoxSizer16->Add(m_OKButton, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); m_OKButton->SetDefault(); } -void AcceptObjectDialog::SetMessage(const wxString &msg) { +void AcceptObjectDialog::SetMessage(const wxString& msg) { if (premtext) { premtext->SetLabel(msg); premtext->Refresh(true); } } -void AcceptObjectDialog::SetCheck1Message(const wxString &msg) { +void AcceptObjectDialog::SetCheck1Message(const wxString& msg) { m_checkbox1_msg = msg; m_pCheck1->SetLabel(msg); m_pCheck1->Show(); @@ -204,12 +203,11 @@ void AcceptObjectDialog::OnCancelClick(wxCommandEvent& event) { #endif } - IMPLEMENT_DYNAMIC_CLASS(PINCreateDialog, wxDialog) BEGIN_EVENT_TABLE(PINCreateDialog, wxDialog) - EVT_BUTTON(ID_STG_CANCEL, PINCreateDialog::OnCancelClick) - EVT_BUTTON(ID_STG_OK, PINCreateDialog::OnOKClick) +EVT_BUTTON(ID_STG_CANCEL, PINCreateDialog::OnCancelClick) +EVT_BUTTON(ID_STG_OK, PINCreateDialog::OnOKClick) END_EVENT_TABLE() PINCreateDialog::PINCreateDialog() { @@ -221,47 +219,46 @@ PINCreateDialog::PINCreateDialog() { #endif } - PINCreateDialog::PINCreateDialog(wxWindow* parent, wxWindowID id, - const wxString& caption, const wxString& hint, - const wxPoint& pos, const wxSize& size, long style) { + const wxString& caption, const wxString& hint, + const wxPoint& pos, const wxSize& size, + long style) { wxFont* pif = FontMgr::Get().GetFont(_T("Dialog")); - SetFont( *pif ); + SetFont(*pif); Create(parent, id, caption, hint, pos, size, style); #ifdef __ANDROID__ - androidDisableRotation(); + androidDisableRotation(); #endif - } PINCreateDialog::~PINCreateDialog() { delete m_OKButton; delete m_CancelButton; #ifdef __ANDROID__ - androidEnableRotation(); + androidEnableRotation(); #endif - } wxDialog* PINCreateDialog::Initiate(const std::string& msg, const std::string& text1) { - auto dlg = new PINCreateDialog(dynamic_cast(gFrame), - wxID_ANY, _("OpenCPN Server Message"), "", - wxDefaultPosition, wxDefaultSize, SYMBOL_STG_STYLE ); + auto dlg = new PINCreateDialog( + dynamic_cast(gFrame), wxID_ANY, _("OpenCPN Server Message"), + "", wxDefaultPosition, wxDefaultSize, SYMBOL_STG_STYLE); dlg->SetMessage(msg); dlg->SetText1Message(text1); dlg->Show(); return dlg; } -void PINCreateDialog::DeInit(){ +void PINCreateDialog::DeInit() { Close(); Destroy(); } bool PINCreateDialog::Create(wxWindow* parent, wxWindowID id, - const wxString& caption, const wxString& hint, - const wxPoint& pos, const wxSize& size, long style) { + const wxString& caption, const wxString& hint, + const wxPoint& pos, const wxSize& size, + long style) { SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS); wxDialog::Create(parent, id, caption, pos, size, style); @@ -276,18 +273,18 @@ bool PINCreateDialog::Create(wxWindow* parent, wxWindowID id, void PINCreateDialog::CreateControls(const wxString& hint) { PINCreateDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - SetSizer(itemBoxSizer2); - + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); + SetSizer(itemBoxSizer2); // Add a reminder text box itemBoxSizer2->AddSpacer(20); - premtext = new wxStaticText( this, -1, "A loooooooooooooooooooooooooooooooooooooooooooooong line\n"); + premtext = new wxStaticText( + this, -1, "A loooooooooooooooooooooooooooooooooooooooooooooong line\n"); itemBoxSizer2->Add(premtext, 0, wxEXPAND | wxALL, 10); - m_pText1 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, - wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_CENTRE); + m_pText1 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxDefaultSize, wxTE_READONLY | wxTE_CENTRE); itemBoxSizer2->Add(m_pText1, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 5); m_pText1->SetMinSize(wxSize(7 * GetCharWidth(), -1)); @@ -299,29 +296,25 @@ void PINCreateDialog::CreateControls(const wxString& hint) { wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer16->Add(m_CancelButton, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - m_OKButton = new wxButton(itemDialog1, ID_STG_OK, "OK", - wxDefaultPosition, wxDefaultSize, 0); + m_OKButton = new wxButton(itemDialog1, ID_STG_OK, "OK", wxDefaultPosition, + wxDefaultSize, 0); itemBoxSizer16->Add(m_OKButton, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); m_OKButton->SetDefault(); } -void PINCreateDialog::SetMessage(const wxString &msg) { +void PINCreateDialog::SetMessage(const wxString& msg) { if (premtext) { premtext->SetLabel(msg); premtext->Refresh(true); } } -void PINCreateDialog::SetText1Message(const wxString &msg) { +void PINCreateDialog::SetText1Message(const wxString& msg) { m_pText1->ChangeValue(msg); m_pText1->Show(); GetSizer()->Fit(this); } -void PINCreateDialog::OnOKClick(wxCommandEvent& event) { - Close(); -} +void PINCreateDialog::OnOKClick(wxCommandEvent& event) { Close(); } -void PINCreateDialog::OnCancelClick(wxCommandEvent& event) { - Close(); -} +void PINCreateDialog::OnCancelClick(wxCommandEvent& event) { Close(); } diff --git a/gui/src/route_gui.cpp b/gui/src/route_gui.cpp index 2cc52e4193..4b1cc4ae92 100644 --- a/gui/src/route_gui.cpp +++ b/gui/src/route_gui.cpp @@ -22,7 +22,7 @@ #include "line_clip.h" #include "model/route.h" -extern Routeman* g_pRouteMan; +extern Routeman *g_pRouteMan; extern wxColour g_colourTrackLineColour; extern Multiplexer *g_pMUX; @@ -102,14 +102,18 @@ void RouteGui::Draw(ocpnDC &dc, ChartCanvas *canvas, const LLBBox &box) { RoutePoint *prp1 = node->GetData(); node = node->GetNext(); - if (m_route.m_bVisible || prp1->IsShared()) RoutePointGui(*prp1).Draw(dc, canvas, NULL); //prp1->Draw(dc, canvas, NULL); + if (m_route.m_bVisible || prp1->IsShared()) + RoutePointGui(*prp1).Draw(dc, canvas, + NULL); // prp1->Draw(dc, canvas, NULL); while (node) { RoutePoint *prp2 = node->GetData(); bool draw_arrow = !(prp2->m_bIsActive && g_bAllowShipToActive); - if (m_route.m_bVisible || prp2->IsShared()) RoutePointGui(*prp2).Draw(dc, canvas, &rpt2); //prp2->Draw(dc, canvas, &rpt2); + if (m_route.m_bVisible || prp2->IsShared()) + RoutePointGui(*prp2).Draw(dc, canvas, + &rpt2); // prp2->Draw(dc, canvas, &rpt2); if (m_route.m_bVisible) { // Handle offscreen points @@ -169,7 +173,7 @@ void RouteGui::Draw(ocpnDC &dc, ChartCanvas *canvas, const LLBBox &box) { } void RouteGui::RenderSegment(ocpnDC &dc, int xa, int ya, int xb, int yb, - ViewPort &vp, bool bdraw_arrow, int hilite_width) { + ViewPort &vp, bool bdraw_arrow, int hilite_width) { // Get the dc boundary int sx, sy; dc.GetSize(&sx, &sy); @@ -255,7 +259,7 @@ void RouteGui::RenderSegment(ocpnDC &dc, int xa, int ya, int xb, int yb, } void RouteGui::RenderSegmentArrowsGL(ocpnDC &dc, int xa, int ya, int xb, int yb, - ViewPort &vp) { + ViewPort &vp) { #ifdef ocpnUSE_GL // Draw a direction arrow float icon_scale_factor = 100 * vp.view_scale_ppm; @@ -314,18 +318,17 @@ void RouteGui::RenderSegmentArrowsGL(ocpnDC &dc, int xa, int ya, int xb, int yb, pts[2].y = -s_arrow_icon[7]; dc.DrawPolygon(3, pts, xb, yb, icon_scale_factor, theta); - #endif } void RouteGui::DrawPointWhich(ocpnDC &dc, ChartCanvas *canvas, int iPoint, - wxPoint *rpn) { + wxPoint *rpn) { if (iPoint <= m_route.GetnPoints()) RoutePointGui(*m_route.GetPoint(iPoint)).Draw(dc, canvas, rpn); } void RouteGui::DrawSegment(ocpnDC &dc, ChartCanvas *canvas, wxPoint *rp1, - wxPoint *rp2, ViewPort &vp, bool bdraw_arrow) { + wxPoint *rp2, ViewPort &vp, bool bdraw_arrow) { if (m_route.m_bRtIsSelected) dc.SetPen(*g_pRouteMan->GetSelectedRoutePen()); else if (m_route.m_bRtIsActive) @@ -353,7 +356,8 @@ void RouteGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc) { // fixed lat/lon extent. // Maybe better to use the mark's drawn box, once it is known. if (vp.GetBBox().ContainsMarge(prp->m_lat, prp->m_lon, .5)) { - if (m_route.m_bVisible || prp->IsShared()) RoutePointGui(*prp).DrawGL(vp, canvas, dc); + if (m_route.m_bVisible || prp->IsShared()) + RoutePointGui(*prp).DrawGL(vp, canvas, dc); } } #endif @@ -401,7 +405,7 @@ void RouteGui::DrawGLRouteLines(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc) { wxPenStyle style = wxPENSTYLE_SOLID; if (m_route.m_style != wxPENSTYLE_INVALID) style = m_route.m_style; wxPen p = *wxThePenList->FindOrCreatePen(col, width, style); - if(glChartCanvas::dash_map.find(style) != glChartCanvas::dash_map.end()) { + if (glChartCanvas::dash_map.find(style) != glChartCanvas::dash_map.end()) { p.SetDashes(2, &glChartCanvas::dash_map[style][0]); } dc.SetPen(p); @@ -501,7 +505,6 @@ void RouteGui::DrawGLLines(ViewPort &vp, ocpnDC *dc, ChartCanvas *canvas) { } } - if (!r1valid) { canvas->GetDoubleCanvasPointPix(prp1->m_lat, prp1->m_lon, &r1); if (std::isnan(r1.m_x)) continue; @@ -548,7 +551,6 @@ void RouteGui::DrawGLLines(ViewPort &vp, ocpnDC *dc, ChartCanvas *canvas) { } } - #endif } @@ -586,8 +588,8 @@ void RouteGui::CalculateDCRect(wxDC &dc_route, ChartCanvas *canvas, *prect = update_rect; } -int RouteGui::SendToGPS(const wxString& com_name, bool bsend_waypoints, - SendToGpsDlg* dialog) { +int RouteGui::SendToGPS(const wxString &com_name, bool bsend_waypoints, + SendToGpsDlg *dialog) { int result = 0; N0183DlgCtx dlg_ctx = GetDialogCtx(dialog); diff --git a/gui/src/route_point_gui.cpp b/gui/src/route_point_gui.cpp index 901f6dc7d4..e1330f7365 100644 --- a/gui/src/route_point_gui.cpp +++ b/gui/src/route_point_gui.cpp @@ -12,8 +12,8 @@ #elif defined(__WXOSX__) #include #include -typedef void (* _GLUfuncptr)(); -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 +typedef void (*_GLUfuncptr)(); +#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 #elif defined(__WXQT__) || defined(__WXGTK__) #include @@ -21,7 +21,6 @@ typedef void (* _GLUfuncptr)(); #endif // ocpnUSE_GL #endif - #include #include #include @@ -48,18 +47,17 @@ typedef void (* _GLUfuncptr)(); #include "viewport.h" #include "waypointman_gui.h" - -extern Multiplexer* g_pMUX; +extern Multiplexer *g_pMUX; extern ocpnGLOptions g_GLOptions; extern float g_MarkScaleFactorExp; -extern MyFrame* gFrame; -extern OCPNPlatform* g_Platform; -extern ocpnStyle::StyleManager* g_StyleManager; +extern MyFrame *gFrame; +extern OCPNPlatform *g_Platform; +extern ocpnStyle::StyleManager *g_StyleManager; -extern Routeman* g_pRouteMan; +extern Routeman *g_pRouteMan; -void RoutePointGui::Draw(ocpnDC& dc, ChartCanvas* canvas, wxPoint* rpn, - bool boverride_viz) { +void RoutePointGui::Draw(ocpnDC &dc, ChartCanvas *canvas, wxPoint *rpn, + bool boverride_viz) { wxPoint r; wxRect hilitebox; @@ -68,24 +66,21 @@ void RoutePointGui::Draw(ocpnDC& dc, ChartCanvas* canvas, wxPoint* rpn, // return the home point in this dc to allow "connect the dots" if (NULL != rpn) *rpn = r; - if (!RoutePointGui(m_point).IsVisibleSelectable(canvas, boverride_viz)) return; + if (!RoutePointGui(m_point).IsVisibleSelectable(canvas, boverride_viz)) + return; // If waypoint is well off screen, skip the drawing - if( (abs(r.x) > canvas->GetCanvasWidth() * 4 ) || + if ((abs(r.x) > canvas->GetCanvasWidth() * 4) || (abs(r.y) > canvas->GetCanvasHeight() * 4)) return; // If waypoint pixel location is invalid, skip the drawing - if ((abs(r.x) == INVALID_COORD ) || - (abs(r.y) == INVALID_COORD) ) - return; - - + if ((abs(r.x) == INVALID_COORD) || (abs(r.y) == INVALID_COORD)) return; // Optimization, especially apparent on tracks in normal cases - if (m_point.m_IconName == _T("empty") && !m_point.m_bShowName - && !m_point.m_bPtIsSelected){ - return; + if (m_point.m_IconName == _T("empty") && !m_point.m_bShowName && + !m_point.m_bPtIsSelected) { + return; } wxPen *pen; @@ -129,16 +124,17 @@ void RoutePointGui::Draw(ocpnDC& dc, ChartCanvas* canvas, wxPoint* rpn, font_size /= OCPN_GetWinDIPScaleFactor(); m_point.m_pMarkFont = FontMgr::Get().FindOrCreateFont( - font_size, dFont->GetFamily(), dFont->GetStyle(), dFont->GetWeight(), - false, dFont->GetFaceName()); + font_size, dFont->GetFamily(), dFont->GetStyle(), dFont->GetWeight(), + false, dFont->GetFaceName()); m_point.m_FontColor = FontMgr::Get().GetFontColor(_("Marks")); m_point.CalculateNameExtents(); } if (m_point.m_pMarkFont) { - wxRect r2(r.x + m_point.m_NameLocationOffsetX, r.y + m_point.m_NameLocationOffsetY, - m_point.m_NameExtents.x, m_point.m_NameExtents.y); + wxRect r2(r.x + m_point.m_NameLocationOffsetX, + r.y + m_point.m_NameLocationOffsetY, m_point.m_NameExtents.x, + m_point.m_NameExtents.y); r1.Union(r2); } } @@ -191,7 +187,8 @@ void RoutePointGui::Draw(ocpnDC& dc, ChartCanvas* canvas, wxPoint* rpn, } // Draw waypoint radar rings if activated - if (m_point.m_iWaypointRangeRingsNumber && m_point.m_bShowWaypointRangeRings) { + if (m_point.m_iWaypointRangeRingsNumber && + m_point.m_bShowWaypointRangeRings) { double factor = 1.00; if (m_point.m_iWaypointRangeRingsStepUnits == 1) // nautical miles factor = 1 / 1.852; @@ -211,8 +208,8 @@ void RoutePointGui::Draw(ocpnDC& dc, ChartCanvas* canvas, wxPoint* rpn, wxBrush saveBrush = dc.GetBrush(); wxPen savePen = dc.GetPen(); dc.SetPen(ppPen1); - dc.SetBrush( - wxBrush(m_point.m_wxcWaypointRangeRingsColour, wxBRUSHSTYLE_TRANSPARENT)); + dc.SetBrush(wxBrush(m_point.m_wxcWaypointRangeRingsColour, + wxBRUSHSTYLE_TRANSPARENT)); for (int i = 1; i <= m_point.m_iWaypointRangeRingsNumber; i++) dc.StrokeCircle(r.x, r.y, i * pix_radius); @@ -239,17 +236,22 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, if (!RoutePointGui(m_point).IsVisibleSelectable(canvas, bVizOverride)) return; // Optimization, especially apparent on tracks in normal cases - if (m_point.m_IconName == _T("empty") && !m_point.m_bShowName && !m_point.m_bPtIsSelected) return; + if (m_point.m_IconName == _T("empty") && !m_point.m_bShowName && + !m_point.m_bPtIsSelected) + return; - if (m_point.m_wpBBox.GetValid() && vp.view_scale_ppm == m_point.m_wpBBox_view_scale_ppm && + if (m_point.m_wpBBox.GetValid() && + vp.view_scale_ppm == m_point.m_wpBBox_view_scale_ppm && vp.rotation == m_point.m_wpBBox_rotation) { /* see if this waypoint can intersect with bounding box */ LLBBox vpBBox = vp.GetBBox(); if (vpBBox.IntersectOut(m_point.m_wpBBox)) { // Are Range Rings enabled? - if (m_point.m_bShowWaypointRangeRings && (m_point.m_iWaypointRangeRingsNumber > 0)) { + if (m_point.m_bShowWaypointRangeRings && + (m_point.m_iWaypointRangeRingsNumber > 0)) { double factor = 1.00; - if (m_point.m_iWaypointRangeRingsStepUnits == 1) // convert kilometers to NMi + if (m_point.m_iWaypointRangeRingsStepUnits == + 1) // convert kilometers to NMi factor = 1 / 1.852; double radius = factor * m_point.m_iWaypointRangeRingsNumber * @@ -301,8 +303,8 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, font_size /= OCPN_GetWinDIPScaleFactor(); m_point.m_pMarkFont = FontMgr::Get().FindOrCreateFont( - font_size, dFont->GetFamily(), dFont->GetStyle(), dFont->GetWeight(), - false, dFont->GetFaceName()); + font_size, dFont->GetFamily(), dFont->GetStyle(), dFont->GetWeight(), + false, dFont->GetFaceName()); m_point.m_FontColor = FontMgr::Get().GetFontColor(_("Marks")); if (m_point.m_iTextTexture) { @@ -314,8 +316,9 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, } if (m_point.m_pMarkFont) { - wxRect r2(r.x + m_point.m_NameLocationOffsetX, r.y + m_point.m_NameLocationOffsetY, - m_point.m_NameExtents.x, m_point.m_NameExtents.y); + wxRect r2(r.x + m_point.m_NameLocationOffsetX, + r.y + m_point.m_NameLocationOffsetY, m_point.m_NameExtents.x, + m_point.m_NameExtents.y); r3.Union(r2); } } @@ -341,7 +344,8 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, } /* update bounding box */ - if (!m_point.m_wpBBox.GetValid() || vp.view_scale_ppm != m_point.m_wpBBox_view_scale_ppm || + if (!m_point.m_wpBBox.GetValid() || + vp.view_scale_ppm != m_point.m_wpBBox_view_scale_ppm || vp.rotation != m_point.m_wpBBox_rotation) { double lat1, lon1, lat2, lon2; canvas->GetCanvasPixPoint(r.x + hilitebox.x, @@ -361,7 +365,7 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, // if(region.Contains(r3) == wxOutRegion) // return; - //ocpnDC dc; + // ocpnDC dc; // Highlite any selected point if (m_point.m_bPtIsSelected) { @@ -384,7 +388,7 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, if ((!bDrawHL) && (NULL != m_point.m_pbmIcon)) { int glw, glh; unsigned int IconTexture = - WayPointmanGui(*pWayPointMan).GetIconTexture(pbm, glw, glh); + WayPointmanGui(*pWayPointMan).GetIconTexture(pbm, glw, glh); glBindTexture(GL_TEXTURE_2D, IconTexture); @@ -524,7 +528,8 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, m_point.m_iTextTextureWidth = NextPow2(w); m_point.m_iTextTextureHeight = NextPow2(h); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_point.m_iTextTextureWidth, - m_point.m_iTextTextureHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + m_point.m_iTextTextureHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, + NULL); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, data); @@ -544,7 +549,8 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); - int x = r.x + m_point.m_NameLocationOffsetX, y = r.y + m_point.m_NameLocationOffsetY; + int x = r.x + m_point.m_NameLocationOffsetX, + y = r.y + m_point.m_NameLocationOffsetY; float u = (float)w / m_point.m_iTextTextureWidth, v = (float)h / m_point.m_iTextTextureHeight; float coords[8]; @@ -576,7 +582,8 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, } // Draw waypoint radar rings if activated - if (m_point.m_iWaypointRangeRingsNumber && m_point.m_bShowWaypointRangeRings) { + if (m_point.m_iWaypointRangeRingsNumber && + m_point.m_bShowWaypointRangeRings) { double factor = 1.00; if (m_point.m_iWaypointRangeRingsStepUnits == 1) // nautical miles factor = 1 / 1.852; @@ -596,8 +603,8 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, wxColor ring_dim_color = GetDimColor(m_point.m_wxcWaypointRangeRingsColour); // 0.5 mm nominal, but not less than 1 pixel - double platform_pen_width = wxRound( - wxMax(1.0, g_Platform->GetDisplayDPmm() / 2)); + double platform_pen_width = + wxRound(wxMax(1.0, g_Platform->GetDisplayDPmm() / 2)); wxPen ppPen1(ring_dim_color, platform_pen_width); wxBrush saveBrush = dc.GetBrush(); wxPen savePen = dc.GetPen(); @@ -621,13 +628,15 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, wxPen ppPen1(dh_color, 3 * platform_pen_width); dc.SetPen(ppPen1); dc.DrawLine(r.x + hilitebox.width / 4, r.y + hilitebox.height / 4, - r.x + m_point.m_drag_line_length_man, r.y + m_point.m_drag_line_length_man); + r.x + m_point.m_drag_line_length_man, + r.y + m_point.m_drag_line_length_man); dh_color = wxColor(0, 0, 0); wxPen ppPen2(dh_color, platform_pen_width); dc.SetPen(ppPen2); dc.DrawLine(r.x + hilitebox.width / 4, r.y + hilitebox.height / 4, - r.x + m_point.m_drag_line_length_man, r.y + m_point.m_drag_line_length_man); + r.x + m_point.m_drag_line_length_man, + r.y + m_point.m_drag_line_length_man); // The drag handle glBindTexture(GL_TEXTURE_2D, m_point.m_dragIconTexture); @@ -635,8 +644,9 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); - int x = r.x + m_point.m_drag_icon_offset, y = r.y + m_point.m_drag_icon_offset, - w = m_point.m_dragIcon.GetWidth(), h = m_point.m_dragIcon.GetHeight(); + int x = r.x + m_point.m_drag_icon_offset, + y = r.y + m_point.m_drag_icon_offset, w = m_point.m_dragIcon.GetWidth(), + h = m_point.m_dragIcon.GetHeight(); float scale = 1.0; @@ -675,7 +685,7 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, } if (m_point.m_bBlink) - g_blink_rect =m_point. CurrentRect_in_DC; // also save for global blinker + g_blink_rect = m_point.CurrentRect_in_DC; // also save for global blinker // This will be useful for fast icon redraws m_point.CurrentRect_in_DC.x = r.x + hilitebox.x; @@ -688,7 +698,8 @@ void RoutePointGui::DrawGL(ViewPort &vp, ChartCanvas *canvas, ocpnDC &dc, } #endif -void RoutePointGui::CalculateDCRect(wxDC &dc, ChartCanvas *canvas, wxRect *prect) { +void RoutePointGui::CalculateDCRect(wxDC &dc, ChartCanvas *canvas, + wxRect *prect) { if (canvas) { dc.ResetBoundingBox(); dc.DestroyClippingRegion(); @@ -707,8 +718,8 @@ void RoutePointGui::CalculateDCRect(wxDC &dc, ChartCanvas *canvas, wxRect *prect } } -bool RoutePointGui::IsVisibleSelectable(ChartCanvas* cc, bool boverrideViz) { - return m_point.IsVisibleSelectable(cc->GetScaleValue(), boverrideViz); +bool RoutePointGui::IsVisibleSelectable(ChartCanvas *cc, bool boverrideViz) { + return m_point.IsVisibleSelectable(cc->GetScaleValue(), boverrideViz); } wxPoint2DDouble RoutePointGui::GetDragHandlePoint(ChartCanvas *canvas) { @@ -723,8 +734,8 @@ void RoutePointGui::SetPointFromDraghandlePoint(ChartCanvas *canvas, double lat, wxPoint r; canvas->GetCanvasPointPix(lat, lon, &r); double tlat, tlon; - canvas->GetCanvasPixPoint(r.x - m_point.m_drag_icon_offset, r.y - m_point.m_drag_icon_offset, - tlat, tlon); + canvas->GetCanvasPixPoint(r.x - m_point.m_drag_icon_offset, + r.y - m_point.m_drag_icon_offset, tlat, tlon); m_point.m_lat = tlat; m_point.m_lon = tlon; } @@ -732,9 +743,9 @@ void RoutePointGui::SetPointFromDraghandlePoint(ChartCanvas *canvas, double lat, void RoutePointGui::SetPointFromDraghandlePoint(ChartCanvas *canvas, int x, int y) { double tlat, tlon; - canvas->GetCanvasPixPoint(x - m_point.m_drag_icon_offset - m_point.m_draggingOffsetx, - y - m_point.m_drag_icon_offset - m_point.m_draggingOffsety, tlat, - tlon); + canvas->GetCanvasPixPoint( + x - m_point.m_drag_icon_offset - m_point.m_draggingOffsetx, + y - m_point.m_drag_icon_offset - m_point.m_draggingOffsety, tlat, tlon); m_point.m_lat = tlat; m_point.m_lon = tlon; } @@ -751,8 +762,8 @@ wxPoint2DDouble RoutePointGui::computeDragHandlePoint(ChartCanvas *canvas) { wxPoint r; canvas->GetCanvasPointPix(m_point.m_lat, m_point.m_lon, &r); double lat, lon; - canvas->GetCanvasPixPoint(r.x + m_point.m_drag_icon_offset, r.y + m_point.m_drag_icon_offset, - lat, lon); + canvas->GetCanvasPixPoint(r.x + m_point.m_drag_icon_offset, + r.y + m_point.m_drag_icon_offset, lat, lon); // Keep the members updated m_point.m_dragHandleLat = lat; @@ -767,8 +778,8 @@ void RoutePointGui::ShowScaleWarningMessage(ChartCanvas *canvas) { wxString strC = _("Therefore the new waypoint will not be visible at this zoom level."); wxString MessStr = - wxString::Format(_T("%s %li,\n %s %.0f.\n%s"), strA, m_point.GetScaMin(), strB, - canvas->GetScaleValue(), strC); + wxString::Format(_T("%s %li,\n %s %.0f.\n%s"), strA, m_point.GetScaMin(), + strB, canvas->GetScaleValue(), strC); OCPNMessageBox(canvas, MessStr); } @@ -781,11 +792,11 @@ void RoutePointGui::EnableDragHandle(bool bEnable) { int bm_size = g_Platform->GetDisplayDPmm() * 9; // 9 mm nominal // What icon? - wxString UserIconPath = g_Platform->GetSharedDataDir() - + _T("uidata") + wxFileName::GetPathSeparator(); + wxString UserIconPath = g_Platform->GetSharedDataDir() + _T("uidata") + + wxFileName::GetPathSeparator(); m_point.m_dragIcon = LoadSVG(UserIconPath + _T("DragHandle.svg"), bm_size, - bm_size, m_point.m_pbmIcon); + bm_size, m_point.m_pbmIcon); // build a texture #ifdef ocpnUSE_GL @@ -829,8 +840,8 @@ void RoutePointGui::EnableDragHandle(bool bEnable) { } glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_point.m_dragIconTextureWidth, - m_point.m_dragIconTextureHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, - NULL); + m_point.m_dragIconTextureHeight, 0, GL_RGBA, + GL_UNSIGNED_BYTE, NULL); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, e); @@ -873,7 +884,8 @@ void RoutePointGui::ReLoadIcon(void) { wxBitmap bmp = style->GetIcon(_T("circle")); if (bmp.IsOk()) { wxImage image = bmp.ConvertToImage(); - WayPointmanGui(*pWayPointMan).ProcessIcon(image, "tempsub", "tempsub"); + WayPointmanGui(*pWayPointMan) + .ProcessIcon(image, "tempsub", "tempsub"); } } } @@ -896,7 +908,6 @@ void RoutePointGui::ReLoadIcon(void) { } bool RoutePointGui::SendToGPS(const wxString &com_name, SendToGpsDlg *dialog) { - N0183DlgCtx dlg_ctx = GetDialogCtx(dialog); ::wxBeginBusyCursor(); int result = SendWaypointToGPS_N0183(&m_point, com_name, *g_pMUX, dlg_ctx); @@ -920,7 +931,8 @@ bool RoutePointGui::SendToGPS(const wxString &com_name, SendToGpsDlg *dialog) { int RoutePointGui::GetIconImageIndex() { if (m_point.IsShared()) { // Get an array of all routes using this point - wxArrayPtrVoid *proute_array = g_pRouteMan->GetRouteArrayContaining(&m_point); + wxArrayPtrVoid *proute_array = + g_pRouteMan->GetRouteArrayContaining(&m_point); // Use route array (if any) to determine actual visibility for this point bool brp_viz = false; diff --git a/gui/src/routeman_gui.cpp b/gui/src/routeman_gui.cpp index 77fe0875e7..c8a873a147 100644 --- a/gui/src/routeman_gui.cpp +++ b/gui/src/routeman_gui.cpp @@ -56,12 +56,12 @@ extern bool g_bShowShipToActive; extern bool g_bAdvanceRouteWaypointOnArrivalOnly; -extern MyFrame* gFrame; +extern MyFrame *gFrame; extern ConsoleCanvas *console; -extern std::vector g_TrackList; -extern ActiveTrack* g_pActiveTrack; +extern std::vector g_TrackList; +extern ActiveTrack *g_pActiveTrack; extern TrackPropDlg *pTrackPropDialog; extern RouteManagerDialog *pRouteManagerDialog; extern MyConfig *pConfig; @@ -69,29 +69,30 @@ extern MyConfig *pConfig; static bool ConfirmDeleteAisMob() { int r = OCPNMessageBox(NULL, _("You are trying to delete an active AIS MOB " - "route, are you REALLY sure?"), + "route, are you REALLY sure?"), _("OpenCPN Warning"), wxYES_NO); return r == wxID_YES; } RoutemanDlgCtx RoutemanGui::GetDlgCtx() { - RoutemanDlgCtx ctx; - ctx.confirm_delete_ais_mob = []() { return ConfirmDeleteAisMob(); }; - ctx.get_global_colour = [](wxString c) { return GetGlobalColor(c); }; - ctx.show_with_fresh_fonts = - []{ if (console) console->ShowWithFreshFonts(); }; - ctx.clear_console_background = [] () { - console->pCDI->ClearBackground(); - console->Show(false); }; - ctx.route_mgr_dlg_update_list_ctrl = []() { - if (pRouteManagerDialog && pRouteManagerDialog->IsShown()) - pRouteManagerDialog->UpdateRouteListCtrl(); - }; - return ctx; + RoutemanDlgCtx ctx; + ctx.confirm_delete_ais_mob = []() { return ConfirmDeleteAisMob(); }; + ctx.get_global_colour = [](wxString c) { return GetGlobalColor(c); }; + ctx.show_with_fresh_fonts = [] { + if (console) console->ShowWithFreshFonts(); + }; + ctx.clear_console_background = []() { + console->pCDI->ClearBackground(); + console->Show(false); + }; + ctx.route_mgr_dlg_update_list_ctrl = []() { + if (pRouteManagerDialog && pRouteManagerDialog->IsShown()) + pRouteManagerDialog->UpdateRouteListCtrl(); + }; + return ctx; } - bool RoutemanGui::UpdateProgress() { bool bret_val = false; @@ -101,8 +102,8 @@ bool RoutemanGui::UpdateProgress() { // Bearing is calculated as Mercator Sailing, i.e. a cartographic // "bearing" double north, east; - toSM(m_routeman.pActivePoint->m_lat, m_routeman.pActivePoint->m_lon, - gLat, gLon, &east, &north); + toSM(m_routeman.pActivePoint->m_lat, m_routeman.pActivePoint->m_lon, gLat, + gLon, &east, &north); double a = atan(north / east); if (fabs(m_routeman.pActivePoint->m_lon - gLon) < 180.) { if (m_routeman.pActivePoint->m_lon > gLon) @@ -118,23 +119,24 @@ bool RoutemanGui::UpdateProgress() { // Calculate range using Great Circle Formula - double d5 = - DistGreatCircle(gLat, gLon, m_routeman.pActivePoint->m_lat, m_routeman.pActivePoint->m_lon); + double d5 = DistGreatCircle(gLat, gLon, m_routeman.pActivePoint->m_lat, + m_routeman.pActivePoint->m_lon); m_routeman.CurrentRngToActivePoint = d5; // Get the XTE vector, normal to current segment vector2D va, vb, vn; double brg1, dist1, brg2, dist2; - DistanceBearingMercator(m_routeman.pActivePoint->m_lat, m_routeman.pActivePoint->m_lon, - m_routeman.pActiveRouteSegmentBeginPoint->m_lat, - m_routeman.pActiveRouteSegmentBeginPoint->m_lon, &brg1, - &dist1); + DistanceBearingMercator( + m_routeman.pActivePoint->m_lat, m_routeman.pActivePoint->m_lon, + m_routeman.pActiveRouteSegmentBeginPoint->m_lat, + m_routeman.pActiveRouteSegmentBeginPoint->m_lon, &brg1, &dist1); vb.x = dist1 * sin(brg1 * PI / 180.); vb.y = dist1 * cos(brg1 * PI / 180.); - DistanceBearingMercator(m_routeman.pActivePoint->m_lat, m_routeman.pActivePoint->m_lon, gLat, - gLon, &brg2, &dist2); + DistanceBearingMercator(m_routeman.pActivePoint->m_lat, + m_routeman.pActivePoint->m_lon, gLat, gLon, &brg2, + &dist2); va.x = dist2 * sin(brg2 * PI / 180.); va.y = dist2 * cos(brg2 * PI / 180.); @@ -165,7 +167,7 @@ bool RoutemanGui::UpdateProgress() { double e1 = atan2((x2 - x1), (y2 - y1)); m_routeman.CurrentSegmentCourse = e1 * 180 / PI; if (m_routeman.CurrentSegmentCourse < 0) - m_routeman.CurrentSegmentCourse += 360; + m_routeman.CurrentSegmentCourse += 360; // Compute XTE direction double h = atan(vn.y / vn.x); @@ -223,11 +225,11 @@ bool RoutemanGui::UpdateProgress() { // Test to see if we are moving away from the arrival point, and // have been moving away for 2 seconds. // If so, we should declare "Arrival" - if ((m_routeman.CurrentRangeToActiveNormalCrossing - m_routeman.m_arrival_min) > + if ((m_routeman.CurrentRangeToActiveNormalCrossing - + m_routeman.m_arrival_min) > m_routeman.pActivePoint->GetWaypointArrivalRadius()) { if (++m_routeman.m_arrival_test > 2 && - !g_bAdvanceRouteWaypointOnArrivalOnly) - { + !g_bAdvanceRouteWaypointOnArrivalOnly) { m_routeman.m_bArrival = true; m_routeman.UpdateAutopilot(); @@ -239,8 +241,9 @@ bool RoutemanGui::UpdateProgress() { } } if (!bDidArrival) - m_routeman.m_arrival_min = wxMin(m_routeman.m_arrival_min, - m_routeman.CurrentRangeToActiveNormalCrossing); + m_routeman.m_arrival_min = + wxMin(m_routeman.m_arrival_min, + m_routeman.CurrentRangeToActiveNormalCrossing); // Only once on arrival if (!bDidArrival) m_routeman.UpdateAutopilot(); bret_val = true; // a route is active @@ -272,7 +275,7 @@ void RoutemanGui::DeleteTrack(Track *pTrack) { pTrackPropDialog->Hide(); } - if ((pTrack == g_pActiveTrack) && pTrack->IsRunning()){ + if ((pTrack == g_pActiveTrack) && pTrack->IsRunning()) { pTrack = gFrame->TrackOff(); } // Remove the track from associated lists @@ -297,7 +300,7 @@ void RoutemanGui::DeleteAllTracks() { // Iterate on the RouteList, we delete from g_TrackList in DeleteTrack, // bigger refactoring is viable, but for now, we simply make a copy // that goes out of scope soon. - std::vector to_del = g_TrackList; + std::vector to_del = g_TrackList; for (Track *ptrack : to_del) { if (ptrack->m_bIsInLayer) continue; @@ -316,7 +319,8 @@ void RoutemanGui::DeleteAllTracks() { } void RoutemanGui::DoAdvance(void) { - if (!m_routeman.ActivateNextPoint(m_routeman.pActiveRoute, false)) // at the end? + if (!m_routeman.ActivateNextPoint(m_routeman.pActiveRoute, + false)) // at the end? { Route *pthis_route = m_routeman.pActiveRoute; m_routeman.DeactivateRoute(true); // this is an arrival diff --git a/gui/src/routemanagerdialog.cpp b/gui/src/routemanagerdialog.cpp index 454f9370f6..0ad4b5a625 100644 --- a/gui/src/routemanagerdialog.cpp +++ b/gui/src/routemanagerdialog.cpp @@ -42,6 +42,7 @@ #include "model/ais_decoder.h" #include "model/config_vars.h" #include "model/georef.h" +#include "model/mdns_cache.h" #include "model/mDNS_query.h" #include "model/navutil_base.h" #include "model/own_ship.h" @@ -80,7 +81,7 @@ enum { colWPTICON = 0, colWPTSCALE, colWPTNAME, colWPTDIST }; // GLOBALS :0 extern RouteList *pRouteList; -extern std::vector g_TrackList; +extern std::vector g_TrackList; extern LayerList *pLayerList; extern wxString GetLayerName(int id); extern RoutePropDlgImpl *pRoutePropDialog; @@ -93,8 +94,6 @@ extern MyFrame *gFrame; extern bool g_bShowLayers; extern wxString g_default_wp_icon; extern OCPNPlatform *g_Platform; -extern std::vector> g_DNS_cache; -extern wxDateTime g_DNS_cache_time; // Helper for conditional file name separator void appendOSDirSlash(wxString *pString); @@ -503,7 +502,6 @@ void RouteManagerDialog::Create() { wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(RouteManagerDialog::OnRteExportClick), NULL, this); - btnRteResequence = new wxButton(winr, -1, reseq_label); bsRouteButtonsInner->Add(btnRteResequence, 0, wxALL | wxEXPAND, DIALOG_MARGIN); @@ -664,8 +662,7 @@ void RouteManagerDialog::Create() { this); btnTrkSendToPeer = new wxButton(wint, -1, _("Send to &Peer")); - bsTrkButtonsInner->Add(btnTrkSendToPeer, 0, wxALL | wxEXPAND, - DIALOG_MARGIN); + bsTrkButtonsInner->Add(btnTrkSendToPeer, 0, wxALL | wxEXPAND, DIALOG_MARGIN); btnTrkSendToPeer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(RouteManagerDialog::OnTrkSendToPeerClick), NULL, @@ -710,8 +707,7 @@ void RouteManagerDialog::Create() { wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(RouteManagerDialog::OnFilterChanged), NULL, this); - m_cbShowAllWP = - new wxCheckBox(m_pPanelWpt, wxID_ANY, _("Show all marks")); + m_cbShowAllWP = new wxCheckBox(m_pPanelWpt, wxID_ANY, _("Show all marks")); bSizerWptContents->Add(m_cbShowAllWP, 0, wxEXPAND | wxLEFT, 5); m_cbShowAllWP->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, @@ -749,8 +745,8 @@ void RouteManagerDialog::Create() { 4 * char_width); m_pWptListCtrl->InsertColumn(colWPTSCALE, _("Scale"), wxLIST_FORMAT_LEFT, 8 * char_width); - m_pWptListCtrl->InsertColumn(colWPTNAME, _("Mark Name"), - wxLIST_FORMAT_LEFT, 15 * char_width); + m_pWptListCtrl->InsertColumn(colWPTNAME, _("Mark Name"), wxLIST_FORMAT_LEFT, + 15 * char_width); m_pWptListCtrl->InsertColumn(colWPTDIST, _("Distance from own ship"), wxLIST_FORMAT_LEFT, 14 * char_width); @@ -812,8 +808,7 @@ void RouteManagerDialog::Create() { this); btnWptSendToPeer = new wxButton(winw, -1, _("Send to &Peer")); - bsWptButtonsInner->Add(btnWptSendToPeer, 0, wxALL | wxEXPAND, - DIALOG_MARGIN); + bsWptButtonsInner->Add(btnWptSendToPeer, 0, wxALL | wxEXPAND, DIALOG_MARGIN); btnWptSendToPeer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(RouteManagerDialog::OnWptSendToPeerClick), NULL, @@ -854,14 +849,12 @@ void RouteManagerDialog::Create() { // Dialog OK button wxSize sz = ::wxGetDisplaySize(); - if (sz.y < sz.x) { // landscape + if (sz.y < sz.x) { // landscape itemBoxSizer6->Add(0, 0, 1, wxEXPAND, 5); // Spacer itemBoxSizer6->Add(new wxButton(this, wxID_OK), 0, wxALL, DIALOG_MARGIN); - } - else { - wxStaticLine* staticLine121 = - new wxStaticLine(this, wxID_ANY, wxDefaultPosition, - wxDefaultSize, wxLI_HORIZONTAL); + } else { + wxStaticLine *staticLine121 = new wxStaticLine( + this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL); itemBoxSizer1->Add(staticLine121, 0, wxALL | wxEXPAND, DIALOG_MARGIN); wxBoxSizer *itemBoxSizer7 = new wxBoxSizer(wxHORIZONTAL); @@ -871,7 +864,8 @@ void RouteManagerDialog::Create() { itemBoxSizer7->Add(itemBoxSizer7a, 1, wxEXPAND); itemBoxSizer7a->AddStretchSpacer(); - itemBoxSizer7a->Add(new wxButton(this, wxID_OK), 0, wxRIGHT | wxALIGN_RIGHT, DIALOG_MARGIN *4); + itemBoxSizer7a->Add(new wxButton(this, wxID_OK), 0, wxRIGHT | wxALIGN_RIGHT, + DIALOG_MARGIN * 4); } // Create "Layers" panel @@ -1384,13 +1378,13 @@ void RouteManagerDialog::ZoomtoRoute(Route *route) { DistanceBearingMercator(RBBox.GetMinLat(), RBBox.GetMinLon(), RBBox.GetMaxLat(), RBBox.GetMinLon(), NULL, &rh); - gFrame->GetPrimaryCanvas()->GetSize(&ww, &wh); - - ppm = wxMin(ww / (rw * 1852), wh / (rh * 1852)) * (100 - fabs(clat)) / 90; + if (gFrame->GetFocusCanvas()) { + gFrame->GetFocusCanvas()->GetSize(&ww, &wh); + ppm = wxMin(ww / (rw * 1852), wh / (rh * 1852)) * (100 - fabs(clat)) / 90; + ppm = wxMin(ppm, 1.0); - ppm = wxMin(ppm, 1.0); - - gFrame->JumpToPosition(gFrame->GetPrimaryCanvas(), clat, clon, ppm); + gFrame->JumpToPosition(gFrame->GetFocusCanvas(), clat, clon, ppm); + } m_bNeedConfigFlush = true; } @@ -1590,7 +1584,7 @@ void RouteManagerDialog::OnRteResequenceClick(wxCommandEvent &event) { } void RouteManagerDialog::OnRteSendToPeerClick(wxCommandEvent &event) { - std::vector list; + std::vector list; long item = -1; for (;;) { item = m_pRouteListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, @@ -1604,37 +1598,30 @@ void RouteManagerDialog::OnRteSendToPeerClick(wxCommandEvent &event) { } } if (!list.empty()) { - SendToPeerDlg dlg; - for (auto r : list) { - dlg.SetRoute(r); - } - - // Perform initial scan, if necessary + SendToPeerDlg dlg; + for (auto r : list) { + dlg.SetRoute(r); + } - // Check for stale cache... - bool bDNScacheStale = true; - wxDateTime tnow = wxDateTime::Now(); - if (g_DNS_cache_time.IsValid()){ - wxTimeSpan delta = tnow.Subtract(g_DNS_cache_time); - if (delta.GetMinutes() < 5) - bDNScacheStale = false; - } + // Perform initial scan, if necessary - if ((g_DNS_cache.size() == 0) || bDNScacheStale) - dlg.SetScanOnCreate(true); + // Check for stale cache... + MdnsCache::GetInstance().Validate(); + if (MdnsCache::GetInstance().GetCache().empty()) dlg.SetScanOnCreate(true); - dlg.SetScanTime(5); // seconds - dlg.Create(NULL, -1, _("Send Route(s) to OpenCPN Peer") + _T( "..." ), _T("")); - dlg.ShowModal(); + dlg.SetScanTime(5); // seconds + dlg.Create(NULL, -1, _("Send Route(s) to OpenCPN Peer") + _T( "..." ), + _T("")); + dlg.ShowModal(); } } void RouteManagerDialog::OnWptSendToPeerClick(wxCommandEvent &event) { - std::vector list; + std::vector list; long item = -1; for (;;) { item = m_pWptListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); + wxLIST_STATE_SELECTED); if (item == -1) break; RoutePoint *proutep = (RoutePoint *)m_pWptListCtrl->GetItemData(item); @@ -1644,37 +1631,30 @@ void RouteManagerDialog::OnWptSendToPeerClick(wxCommandEvent &event) { } } if (!list.empty()) { - SendToPeerDlg dlg; - for (auto r : list) { - dlg.SetWaypoint(r); - } - - // Perform initial scan, if necessary + SendToPeerDlg dlg; + for (auto r : list) { + dlg.SetWaypoint(r); + } - // Check for stale cache... - bool bDNScacheStale = true; - wxDateTime tnow = wxDateTime::Now(); - if (g_DNS_cache_time.IsValid()){ - wxTimeSpan delta = tnow.Subtract(g_DNS_cache_time); - if (delta.GetMinutes() < 5) - bDNScacheStale = false; - } + // Perform initial scan, if necessary - if ((g_DNS_cache.size() == 0) || bDNScacheStale) - dlg.SetScanOnCreate(true); + // Check for stale cache... + MdnsCache::GetInstance().Validate(); + if (MdnsCache::GetInstance().GetCache().empty()) dlg.SetScanOnCreate(true); - dlg.SetScanTime(5); // seconds - dlg.Create(NULL, -1, _("Send Waypoint(s) to OpenCPN Peer") + _T( "..." ), _T("")); - dlg.ShowModal(); + dlg.SetScanTime(5); // seconds + dlg.Create(NULL, -1, _("Send Waypoint(s) to OpenCPN Peer") + _T( "..." ), + _T("")); + dlg.ShowModal(); } } void RouteManagerDialog::OnTrkSendToPeerClick(wxCommandEvent &event) { - std::vector list; + std::vector list; long item = -1; for (;;) { item = m_pTrkListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, - wxLIST_STATE_SELECTED); + wxLIST_STATE_SELECTED); if (item == -1) break; Track *ptrk = (Track *)m_pTrkListCtrl->GetItemData(item); @@ -1684,28 +1664,21 @@ void RouteManagerDialog::OnTrkSendToPeerClick(wxCommandEvent &event) { } } if (!list.empty()) { - SendToPeerDlg dlg; - for (auto r : list) { - dlg.SetTrack(r); - } - - // Perform initial scan, if necessary + SendToPeerDlg dlg; + for (auto r : list) { + dlg.SetTrack(r); + } - // Check for stale cache... - bool bDNScacheStale = true; - wxDateTime tnow = wxDateTime::Now(); - if (g_DNS_cache_time.IsValid()){ - wxTimeSpan delta = tnow.Subtract(g_DNS_cache_time); - if (delta.GetMinutes() < 5) - bDNScacheStale = false; - } + // Perform initial scan, if necessary - if ((g_DNS_cache.size() == 0) || bDNScacheStale) - dlg.SetScanOnCreate(true); + // Check for stale cache... + MdnsCache::GetInstance().Validate(); + if (MdnsCache::GetInstance().GetCache().empty()) dlg.SetScanOnCreate(true); - dlg.SetScanTime(5); // seconds - dlg.Create(NULL, -1, _("Send Track(s) to OpenCPN Peer") + _T( "..." ), _T("")); - dlg.ShowModal(); + dlg.SetScanTime(5); // seconds + dlg.Create(NULL, -1, _("Send Track(s) to OpenCPN Peer") + _T( "..." ), + _T("")); + dlg.ShowModal(); } } @@ -2066,7 +2039,7 @@ void RouteManagerDialog::UpdateTrkListCtrl() { m_pTrkListCtrl->DeleteAllItems(); // then add tracks to the listctrl - std::vector::iterator it; + std::vector::iterator it; int index = 0; int list_index = 0; bool bpartialViz = false; @@ -2253,7 +2226,7 @@ void RouteManagerDialog::OnTrkPropertiesClick(wxCommandEvent &event) { } void RouteManagerDialog::OnTrkDeleteClick(wxCommandEvent &event) { - std::vector list; + std::vector list; int answer = OCPNMessageBox( this, _("Are you sure you want to delete the selected object(s)"), @@ -2303,7 +2276,7 @@ void RouteManagerDialog::OnTrkDeleteClick(wxCommandEvent &event) { } void RouteManagerDialog::OnTrkExportClick(wxCommandEvent &event) { - std::vector list; + std::vector list; wxString suggested_name = _T("tracks"); long item = -1; @@ -2596,7 +2569,8 @@ void RouteManagerDialog::OnWptToggleVisibility(wxMouseEvent &event) { if (!wp->IsSharedInVisibleRoute()) { wp->SetVisible(!wp->IsVisible()); - m_pWptListCtrl->SetItemImage(clicked_index, RoutePointGui(*wp).GetIconImageIndex()); + m_pWptListCtrl->SetItemImage(clicked_index, + RoutePointGui(*wp).GetIconImageIndex()); pConfig->UpdateWayPoint(wp); } @@ -2651,22 +2625,23 @@ void RouteManagerDialog::OnWptNewClick(wxCommandEvent &event) { // Dialog g_pMarkInfoDialog = new MarkInfoDlg(GetParent()); - WptShowPropertiesDialog(std::vector {pWP}, GetParent()); + WptShowPropertiesDialog(std::vector{pWP}, GetParent()); } void RouteManagerDialog::OnWptPropertiesClick(wxCommandEvent &event) { std::vector wptlist; long item = wxNOT_FOUND; - item = m_pWptListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - while (item != wxNOT_FOUND) - { + item = + m_pWptListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + while (item != wxNOT_FOUND) { auto wp = (RoutePoint *)m_pWptListCtrl->GetItemData(item); if (wp) { wptlist.push_back(wp); } - item = m_pWptListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + item = m_pWptListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, + wxLIST_STATE_SELECTED); } - + if (wptlist.size() == 0) return; WptShowPropertiesDialog(wptlist, GetParent()); @@ -2675,8 +2650,8 @@ void RouteManagerDialog::OnWptPropertiesClick(wxCommandEvent &event) { m_bNeedConfigFlush = true; } -void RouteManagerDialog::WptShowPropertiesDialog(std::vector wptlist, - wxWindow *parent) { +void RouteManagerDialog::WptShowPropertiesDialog( + std::vector wptlist, wxWindow *parent) { if (!g_pMarkInfoDialog) // There is one global instance of the MarkProp // Dialog g_pMarkInfoDialog = new MarkInfoDlg(parent); @@ -2685,17 +2660,16 @@ void RouteManagerDialog::WptShowPropertiesDialog(std::vector wptli g_pMarkInfoDialog->UpdateProperties(); wxString base_title = _("Mark Properties"); - if (wptlist[0]->m_bIsInRoute) - base_title = _("Waypoint Properties"); + if (wptlist[0]->m_bIsInRoute) base_title = _("Waypoint Properties"); if (wptlist[0]->m_bIsInLayer) { - wxString caption(wxString::Format(_T("%s, %s: %s"), - base_title, _("Layer"), + wxString caption(wxString::Format(_T("%s, %s: %s"), base_title, _("Layer"), GetLayerName(wptlist[0]->m_LayerID))); g_pMarkInfoDialog->SetDialogTitle(caption); } else { if (wptlist.size() > 1) - g_pMarkInfoDialog->SetDialogTitle(base_title + wxString::Format(_(" (%lu points)"), wptlist.size())); + g_pMarkInfoDialog->SetDialogTitle( + base_title + wxString::Format(_(" (%lu points)"), wptlist.size())); else g_pMarkInfoDialog->SetDialogTitle(base_title); } @@ -2714,8 +2688,10 @@ void RouteManagerDialog::OnWptZoomtoClick(wxCommandEvent &event) { if (!wp) return; - gFrame->JumpToPosition(gFrame->GetPrimaryCanvas(), wp->m_lat, wp->m_lon, - gFrame->GetPrimaryCanvas()->GetVPScale()); + if (gFrame->GetFocusCanvas()) { + gFrame->JumpToPosition(gFrame->GetFocusCanvas(), wp->m_lat, wp->m_lon, + gFrame->GetFocusCanvas()->GetVPScale()); + } } void RouteManagerDialog::OnWptDeleteClick(wxCommandEvent &event) { @@ -3148,7 +3124,7 @@ void RouteManagerDialog::ToggleLayerContentsOnChart(Layer *layer) { node1 = node1->GetNext(); } - for (Track* pTrack : g_TrackList) { + for (Track *pTrack : g_TrackList) { if (pTrack->m_bIsInLayer && (pTrack->m_LayerID == layer->m_LayerID)) pTrack->SetVisible(layer->IsVisibleOnChart()); } diff --git a/gui/src/routeprintout.cpp b/gui/src/routeprintout.cpp index f5a9846fd5..a8c33d59a1 100644 --- a/gui/src/routeprintout.cpp +++ b/gui/src/routeprintout.cpp @@ -31,7 +31,7 @@ #include #endif // precompiled headers #ifdef __WXMSW__ -//#include "c:\\Program Files\\visual leak detector\\include\\vld.h" +// #include "c:\\Program Files\\visual leak detector\\include\\vld.h" #endif #include diff --git a/gui/src/s57/src/s57obj.cpp b/gui/src/s57/src/s57obj.cpp index c7f5f955aa..d52786c651 100644 --- a/gui/src/s57/src/s57obj.cpp +++ b/gui/src/s57/src/s57obj.cpp @@ -81,7 +81,6 @@ extern bool g_b_EnableVBO; - //---------------------------------------------------------------------------------- // S57Obj CTOR //---------------------------------------------------------------------------------- @@ -152,7 +151,7 @@ void S57Obj::Init() { geoPtz = NULL; geoPt = NULL; bIsClone = false; - Scamin = 1e8+2; // Default is very large number, effectively unused. + Scamin = 1e8 + 2; // Default is very large number, effectively unused. SuperScamin = -1; nRef = 0; @@ -268,7 +267,7 @@ bool S57Obj::SetPointGeometry(double lat, double lon, double ref_lat, m_lat = lat; // Set initial BoundingBox limits to 1 NM - double bound = 1. / 60.; // 1 NM, nominal + double bound = 1. / 60.; // 1 NM, nominal BBObj.Set(m_lat - bound, m_lon - bound, m_lat + bound, m_lon + bound); bBBObj_valid = false; diff --git a/gui/src/s57/src/s57reader.cpp b/gui/src/s57/src/s57reader.cpp index 9ee4756030..a84c2a7828 100644 --- a/gui/src/s57/src/s57reader.cpp +++ b/gui/src/s57/src/s57reader.cpp @@ -2452,8 +2452,7 @@ int S57Reader::FindAndApplyUpdates(const char *pszPath) #endif #endif -OGRErr -S57Reader::GetExtent(OGREnvelope *psExtent, int bForce) +OGRErr S57Reader::GetExtent(OGREnvelope *psExtent, int bForce) { #define INDEX_COUNT 4 diff --git a/gui/src/s57chart.cpp b/gui/src/s57chart.cpp index 85f029133d..038ce5d034 100644 --- a/gui/src/s57chart.cpp +++ b/gui/src/s57chart.cpp @@ -87,7 +87,7 @@ #include "ssl/sha1.h" #ifdef ocpnUSE_GL - #include "shaders.h" +#include "shaders.h" #endif #include "chart_ctx_factory.h" @@ -102,7 +102,6 @@ void OpenCPN_OGRErrorHandler( CPLErr eErrClass, int nError, const char *pszErrorMsg); // installed GDAL OGR library error handler - extern s52plib *ps52plib; extern S57ClassRegistrar *g_poRegistrar; extern wxString g_csv_locn; @@ -192,7 +191,6 @@ unsigned long connector_key::hash() const { return hash_fast32(k, sizeof k, 0); } - //---------------------------------------------------------------------------------- // render_canvas_parms Implementation //---------------------------------------------------------------------------------- @@ -202,24 +200,13 @@ render_canvas_parms::render_canvas_parms() { pix_buff = NULL; } render_canvas_parms::~render_canvas_parms(void) {} static void PrepareForRender(ViewPort *pvp, s52plib *plib) { - if(!plib) - return; - - plib->SetVPointCompat( - pvp->pix_width, - pvp->pix_height, - pvp->view_scale_ppm, - pvp->rotation, - pvp->clat, - pvp->clon, - pvp->chart_scale, - pvp->rv_rect, - pvp->GetBBox(), - pvp->ref_scale, - GetOCPNCanvasWindow()->GetContentScaleFactor() - ); - plib->PrepareForRender(); + if (!plib) return; + plib->SetVPointCompat(pvp->pix_width, pvp->pix_height, pvp->view_scale_ppm, + pvp->rotation, pvp->clat, pvp->clon, pvp->chart_scale, + pvp->rv_rect, pvp->GetBBox(), pvp->ref_scale, + GetOCPNCanvasWindow()->GetContentScaleFactor()); + plib->PrepareForRender(); } //---------------------------------------------------------------------------------- @@ -331,8 +318,7 @@ s57chart::~s57chart() { m_vc_hash.clear(); #ifdef ocpnUSE_GL - if ((m_LineVBO_name > 0)) - glDeleteBuffers(1, (GLuint *)&m_LineVBO_name); + if ((m_LineVBO_name > 0)) glDeleteBuffers(1, (GLuint *)&m_LineVBO_name); #endif free(m_this_chart_context); @@ -437,12 +423,12 @@ void s57chart::ChangeThumbColor(ColorScheme cs) { wxImage gimg = img; #endif - //#ifdef ocpnUSE_ocpnBitmap - // ocpnBitmap *pBMP = new ocpnBitmap(gimg, - // m_pDIBThumbDay->GetDepth()); - //#else + // #ifdef ocpnUSE_ocpnBitmap + // ocpnBitmap *pBMP = new ocpnBitmap(gimg, + // m_pDIBThumbDay->GetDepth()); + // #else wxBitmap *pBMP = new wxBitmap(gimg); - //#endif + // #endif m_pDIBThumbDim = pBMP; m_pDIBThumbOrphan = m_pDIBThumbDay; } @@ -1391,16 +1377,14 @@ void s57chart::AssembleLineGeometry(void) { #ifdef ocpnUSE_GL if (g_b_EnableVBO) { if (grow_buffer) { - if (m_LineVBO_name > 0){ - glDeleteBuffers(1, (GLuint *)&m_LineVBO_name); - m_LineVBO_name = -1; + if (m_LineVBO_name > 0) { + glDeleteBuffers(1, (GLuint *)&m_LineVBO_name); + m_LineVBO_name = -1; } } } #endif - - - } +} void s57chart::BuildLineVBO(void) { #ifdef ocpnUSE_GL @@ -1422,7 +1406,7 @@ void s57chart::BuildLineVBO(void) { glEnableClientState(GL_VERTEX_ARRAY); // activate vertex coords array #endif glBufferData(GL_ARRAY_BUFFER, m_vbo_byte_length, m_line_vertex_buffer, - GL_STATIC_DRAW); + GL_STATIC_DRAW); #else // get the size of VBO data block needed for all AREA objects @@ -1439,37 +1423,38 @@ void s57chart::BuildLineVBO(void) { top = top->next; // next object // Get the vertex data for this object - PolyTriGroup *ppg_vbo = crnt->obj->pPolyTessGeo->Get_PolyTriGroup_head(); - //add the byte length + PolyTriGroup *ppg_vbo = + crnt->obj->pPolyTessGeo->Get_PolyTriGroup_head(); + // add the byte length vbo_area_size_bytes += ppg_vbo->single_buffer_size; } } - glGetError(); //clear it + glGetError(); // clear it // Allocate the VBO - glBufferData(GL_ARRAY_BUFFER, m_vbo_byte_length + vbo_area_size_bytes, - NULL, GL_STATIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, m_vbo_byte_length + vbo_area_size_bytes, NULL, + GL_STATIC_DRAW); GLenum err = glGetError(); - if (err) { - wxString msg; - msg.Printf(_T("S57 VBO Error 1: %d"), err); - wxLogMessage(msg); - printf("S57 VBO Error 1: %d", err); - } + if (err) { + wxString msg; + msg.Printf(_T("S57 VBO Error 1: %d"), err); + wxLogMessage(msg); + printf("S57 VBO Error 1: %d", err); + } // Upload the line vertex data - glBufferSubData(GL_ARRAY_BUFFER, 0, m_vbo_byte_length, m_line_vertex_buffer); + glBufferSubData(GL_ARRAY_BUFFER, 0, m_vbo_byte_length, + m_line_vertex_buffer); err = glGetError(); - if (err) { - wxString msg; - msg.Printf(_T("S57 VBO Error 2: %d"), err); - wxLogMessage(msg); - printf("S57 VBO Error 2: %d", err); - } - + if (err) { + wxString msg; + msg.Printf(_T("S57 VBO Error 2: %d"), err); + wxLogMessage(msg); + printf("S57 VBO Error 2: %d", err); + } // Get the Area Object vertices, and add to the VBO, one by one int vbo_load_offset = m_vbo_byte_length; @@ -1485,12 +1470,12 @@ void s57chart::BuildLineVBO(void) { top = top->next; // next object // Get the vertex data for this object - PolyTriGroup *ppg_vbo = crnt->obj->pPolyTessGeo->Get_PolyTriGroup_head(); + PolyTriGroup *ppg_vbo = + crnt->obj->pPolyTessGeo->Get_PolyTriGroup_head(); // append data to VBO glBufferSubData(GL_ARRAY_BUFFER, vbo_load_offset, - ppg_vbo->single_buffer_size, - ppg_vbo->single_buffer); + ppg_vbo->single_buffer_size, ppg_vbo->single_buffer); // store the VBO offset in the object crnt->obj->vboAreaOffset = vbo_load_offset; vbo_load_offset += ppg_vbo->single_buffer_size; @@ -1498,12 +1483,12 @@ void s57chart::BuildLineVBO(void) { } err = glGetError(); - if (err) { - wxString msg; - msg.Printf(_T("S57 VBO Error 3: %d"), err); - wxLogMessage(msg); - printf("S57 VBO Error 3: %d", err); - } + if (err) { + wxString msg; + msg.Printf(_T("S57 VBO Error 3: %d"), err); + wxLogMessage(msg); + printf("S57 VBO Error 3: %d", err); + } #endif @@ -1609,7 +1594,7 @@ bool s57chart::DoRenderRegionViewOnGL(const wxGLContext &glc, SetVPParms(VPoint); - PrepareForRender((ViewPort *)&VPoint, ps52plib); + PrepareForRender((ViewPort *)&VPoint, ps52plib); if (m_plib_state_hash != ps52plib->GetStateHash()) { m_bLinePrioritySet = false; // need to reset line priorities @@ -1634,12 +1619,12 @@ bool s57chart::DoRenderRegionViewOnGL(const wxGLContext &glc, ViewPort vp = VPoint; -// printf("\n"); + // printf("\n"); // region always has either 1 or 2 rectangles (full screen or panning // rectangles) for (OCPNRegionIterator upd(RectRegion); upd.HaveRects(); upd.NextRect()) { wxRect upr = upd.GetRect(); - //printf("updRect: %d %d %d %d\n",upr.x, upr.y, upr.width, upr.height); + // printf("updRect: %d %d %d %d\n",upr.x, upr.y, upr.width, upr.height); LLRegion chart_region = vp.GetLLRegion(upd.GetRect()); chart_region.Intersect(Region); @@ -1649,18 +1634,18 @@ bool s57chart::DoRenderRegionViewOnGL(const wxGLContext &glc, // cm93 vpoint crossing Greenwich, panning east, was rendering areas // incorrectly. ViewPort cvp = glChartCanvas::ClippedViewport(VPoint, chart_region); -// printf("CVP: %g %g %g %g\n", -// cvp.GetBBox().GetMinLat(), -// cvp.GetBBox().GetMaxLat(), -// cvp.GetBBox().GetMinLon(), -// cvp.GetBBox().GetMaxLon()); + // printf("CVP: %g %g %g %g\n", + // cvp.GetBBox().GetMinLat(), + // cvp.GetBBox().GetMaxLat(), + // cvp.GetBBox().GetMinLon(), + // cvp.GetBBox().GetMaxLon()); if (CHART_TYPE_CM93 == GetChartType()) { // for now I will revert to the faster rectangle clipping now that // rendering order is resolved // glChartCanvas::SetClipRegion(cvp, chart_region); glChartCanvas::SetClipRect(cvp, upd.GetRect(), false); - //ps52plib->m_last_clip_rect = upd.GetRect(); + // ps52plib->m_last_clip_rect = upd.GetRect(); } else { #ifdef OPT_USE_ANDROID_GLES2 @@ -1717,7 +1702,6 @@ bool s57chart::DoRenderRegionViewOnGL(const wxGLContext &glc, return true; } - bool s57chart::DoRenderOnGL(const wxGLContext &glc, const ViewPort &VPoint) { #ifdef ocpnUSE_GL @@ -1815,7 +1799,7 @@ bool s57chart::DoRenderOnGL(const wxGLContext &glc, const ViewPort &VPoint) { } // qDebug() << "Done Points" << sw.GetTime(); -#endif //#ifdef ocpnUSE_GL +#endif // #ifdef ocpnUSE_GL return true; } @@ -1881,7 +1865,7 @@ bool s57chart::DoRenderOnGLText(const wxGLContext &glc, } } -#endif //#ifdef ocpnUSE_GL +#endif // #ifdef ocpnUSE_GL return true; } @@ -2972,13 +2956,12 @@ void s57chart::SetSafetyContour(void) { m_next_safe_cnt = (double)1e6; } -void s57chart::CreateChartContext(){ +void s57chart::CreateChartContext() { // Set up the chart context m_this_chart_context = (chart_context *)calloc(sizeof(chart_context), 1); } -void s57chart::PopulateObjectsWithContext(){ - +void s57chart::PopulateObjectsWithContext() { m_this_chart_context->chart = this; m_this_chart_context->chart_type = GetChartType(); m_this_chart_context->vertex_buffer = GetLineVertexBuffer(); @@ -2986,8 +2969,8 @@ void s57chart::PopulateObjectsWithContext(){ m_this_chart_context->pFloatingATONArray = pFloatingATONArray; m_this_chart_context->pRigidATONArray = pRigidATONArray; m_this_chart_context->safety_contour = m_next_safe_cnt; - m_this_chart_context->pt2GetAssociatedObjects = &s57chart::GetAssociatedObjects; - + m_this_chart_context->pt2GetAssociatedObjects = + &s57chart::GetAssociatedObjects; // Loop and populate all the objects ObjRazRules *top; @@ -3003,7 +2986,6 @@ void s57chart::PopulateObjectsWithContext(){ } } - void s57chart::InvalidateCache() { delete pDIB; pDIB = NULL; @@ -3497,11 +3479,11 @@ bool s57chart::GetNearestSafeContour(double safe_cnt, double &next_safe_cnt) { -------------------------------------------------------------------------- */ -std::list *s57chart::GetAssociatedObjects(S57Obj *obj) { +std::list *s57chart::GetAssociatedObjects(S57Obj *obj) { int disPrioIdx; bool gotit; - std::list *pobj_list = new std::list(); + std::list *pobj_list = new std::list(); double lat, lon; fromSM((obj->x * obj->x_rate) + obj->x_origin, @@ -3761,8 +3743,7 @@ int s57chart::GetUpdateFileArray(const wxFileName file000, umdate.ParseFormat(_T("20000101"), _T("%Y%m%d")); umdate.ResetTime(); - if (!umdate.IsValid()) - int yyp = 4; + if (!umdate.IsValid()) int yyp = 4; // Fetch the EDTN(Edition) field if (pr) { @@ -4447,7 +4428,7 @@ void s57chart::ResetPointBBoxes(const ViewPort &vp_last, ObjRazRules *top; ObjRazRules *nxx; - if (vp_last.view_scale_ppm == 1.0) // Skip the startup case + if (vp_last.view_scale_ppm == 1.0) // Skip the startup case return; double d = vp_last.view_scale_ppm / vp_this.view_scale_ppm; @@ -4729,8 +4710,9 @@ ListOfObjRazRules *s57chart::GetLightsObjRuleListVisibleAtLatLon( } } - // Copy the rules in order into a wxList so the function returns the correct type - for(std::size_t i = 0; i < selected_rules.size(); ++i) { + // Copy the rules in order into a wxList so the function returns the correct + // type + for (std::size_t i = 0; i < selected_rules.size(); ++i) { ret_ptr->Append(selected_rules[i]); } @@ -4741,7 +4723,6 @@ ListOfObjRazRules *s57chart::GetObjRuleListAtLatLon(float lat, float lon, float select_radius, ViewPort *VPoint, int selection_mask) { - ListOfObjRazRules *ret_ptr = new ListOfObjRazRules; std::vector selected_rules; @@ -4768,8 +4749,6 @@ ListOfObjRazRules *s57chart::GetObjRuleListAtLatLon(float lat, float lon, } } - - // Check the child branch, if any. // This is where Multipoint soundings are captured individually if (top->child) { @@ -4820,40 +4799,41 @@ ListOfObjRazRules *s57chart::GetObjRuleListAtLatLon(float lat, float lon, } } - // Sort Point objects by distance to searched lat/lon - // This lambda function could be modified to also sort GEO_LINES and GEO_AREAS if needed - auto sortObjs = [lat, lon, this] (const ObjRazRules* obj1, const ObjRazRules* obj2) -> bool - { + // This lambda function could be modified to also sort GEO_LINES and GEO_AREAS + // if needed + auto sortObjs = [lat, lon, this](const ObjRazRules *obj1, + const ObjRazRules *obj2) -> bool { double br1, dd1, br2, dd2; - if(obj1->obj->Primitive_type == GEO_POINT && obj2->obj->Primitive_type == GEO_POINT){ + if (obj1->obj->Primitive_type == GEO_POINT && + obj2->obj->Primitive_type == GEO_POINT) { double lat1, lat2, lon1, lon2; fromSM((obj1->obj->x * obj1->obj->x_rate) + obj1->obj->x_origin, - (obj1->obj->y * obj1->obj->y_rate) + obj1->obj->y_origin, - ref_lat, ref_lon, &lat1, &lon1); + (obj1->obj->y * obj1->obj->y_rate) + obj1->obj->y_origin, ref_lat, + ref_lon, &lat1, &lon1); if (lon1 > 180.0) lon1 -= 360.; fromSM((obj2->obj->x * obj2->obj->x_rate) + obj2->obj->x_origin, - (obj2->obj->y * obj2->obj->y_rate) + obj2->obj->y_origin, - ref_lat, ref_lon, &lat2, &lon2); + (obj2->obj->y * obj2->obj->y_rate) + obj2->obj->y_origin, ref_lat, + ref_lon, &lat2, &lon2); if (lon2 > 180.0) lon2 -= 360.; DistanceBearingMercator(lat, lon, lat1, lon1, &br1, &dd1); DistanceBearingMercator(lat, lon, lat2, lon2, &br2, &dd2); - return dd1>dd2; + return dd1 > dd2; } return false; - }; // Sort the selected rules by using the lambda sort function defined above std::sort(selected_rules.begin(), selected_rules.end(), sortObjs); - // Copy the rules in order into a wxList so the function returns the correct type - for(std::size_t i = 0; i < selected_rules.size(); ++i) { + // Copy the rules in order into a wxList so the function returns the correct + // type + for (std::size_t i = 0; i < selected_rules.size(); ++i) { ret_ptr->Append(selected_rules[i]); } @@ -4975,8 +4955,8 @@ bool s57chart::DoesLatLonSelectObject(float lat, float lon, float select_radius, if (obj->m_ls_list) { float *ppt; unsigned char *vbo_point = - (unsigned char *) - obj->m_chart_context->vertex_buffer; //chart->GetLineVertexBuffer(); + (unsigned char *)obj->m_chart_context + ->vertex_buffer; // chart->GetLineVertexBuffer(); line_segment_element *ls = obj->m_ls_list; while (ls && vbo_point) { @@ -5840,7 +5820,7 @@ wxString s57chart::CreateObjDescriptions(ListOfObjRazRules *rule_list) { // 119,2.2,122,1.9,125,1.5,130,0.9,270,0.1,299,1.4,300,2.1,301,2.0,303,1.7,307,1.2 wxStringTokenizer tk(value, wxT(",")); ts1 = - tk.GetNextToken(); // get first token this will be skipped always + tk.GetNextToken(); // get first token this will be skipped always long l; do { // Skip up upto the first non number. This is Port Name ts1 = tk.GetNextToken().Trim(false); @@ -5985,15 +5965,15 @@ wxString s57chart::CreateObjDescriptions(ListOfObjRazRules *rule_list) { if (vis.Contains(_T("8"))) { if (attrIndex != wxNOT_FOUND) { wxString color = thisLight->attributeValues.Item(attrIndex); - if (( color == _T("red (3)") || color == _T("red(3)"))) + if ((color == _T("red (3)") || color == _T("red(3)"))) colorStr = _T("
   
"); - if (( color == _T("green (4)") || color == _T("green(4)"))) + if ((color == _T("green (4)") || color == _T("green(4)"))) colorStr = _T("
   
"); - if (( color == _T("white (1)") || color == _T("white(1)"))) + if ((color == _T("white (1)") || color == _T("white(1)"))) colorStr = _T("
   
"); @@ -6017,9 +5997,10 @@ wxString s57chart::CreateObjDescriptions(ListOfObjRazRules *rule_list) { lightsHtml << _T(" "); } - attrIndex = thisLight->attributeNames.Index( _T("COLOUR") ); - if( attrIndex != wxNOT_FOUND ) { - lightsHtml << _T(" ") << thisLight->attributeValues.Item( attrIndex ).Upper()[0]; + attrIndex = thisLight->attributeNames.Index(_T("COLOUR")); + if (attrIndex != wxNOT_FOUND) { + lightsHtml << _T(" ") + << thisLight->attributeValues.Item(attrIndex).Upper()[0]; lightsHtml << _T(" "); } @@ -6332,10 +6313,9 @@ void s57_DrawExtendedLightSectors(ocpnDC &dc, ViewPort &viewport, penWidth = wxMin(20, penWidth); penWidth = wxMax(5, penWidth); - int legOpacity; - wxPen *arcpen = wxThePenList->FindOrCreatePen(sectorlegs[i].color, penWidth, - wxPENSTYLE_SOLID); + wxPen *arcpen = wxThePenList->FindOrCreatePen(sectorlegs[i].color, + penWidth, wxPENSTYLE_SOLID); arcpen->SetCap(wxCAP_BUTT); dc.SetPen(*arcpen); @@ -6420,7 +6400,7 @@ void s57_DrawExtendedLightSectors(ocpnDC &dc, ViewPort &viewport, #ifdef ocpnUSE_GL void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, - std::vector §orlegs) { + std::vector §orlegs) { float rangeScale = 0.0; if (sectorlegs.size() > 0) { @@ -6444,7 +6424,6 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, wxPoint lightPos = viewport.GetPixFromLL(sectorlegs[i].pos.m_y, sectorlegs[i].pos.m_x); - // Make sure arcs are well inside viewport. float rangePx = sqrtf(powf((float)(lightPos.x - end1.x), 2) + powf((float)(lightPos.y - end1.y), 2)); @@ -6474,30 +6453,29 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, int lpy = lightPos.y; if (sectorlegs[i].isleading && (angle2 - angle1 < 60)) { - wxPoint yellowCone[3]; - yellowCone[0] = lightPos; - yellowCone[1] = end1; - yellowCone[2] = end2; - wxPen *arcpen = wxThePenList->FindOrCreatePen(wxColor(0, 0, 0, 0), 1, - wxPENSTYLE_SOLID); - dc.SetPen(*arcpen); - wxColor c = sectorlegs[i].color; - c.Set(c.Red(), c.Green(), c.Blue(), 0.6 * c.Alpha()); - dc.SetBrush(wxBrush(c)); - dc.StrokePolygon(3, yellowCone, 0, 0); - legOpacity = 50; + wxPoint yellowCone[3]; + yellowCone[0] = lightPos; + yellowCone[1] = end1; + yellowCone[2] = end2; + wxPen *arcpen = wxThePenList->FindOrCreatePen(wxColor(0, 0, 0, 0), 1, + wxPENSTYLE_SOLID); + dc.SetPen(*arcpen); + wxColor c = sectorlegs[i].color; + c.Set(c.Red(), c.Green(), c.Blue(), 0.6 * c.Alpha()); + dc.SetBrush(wxBrush(c)); + dc.StrokePolygon(3, yellowCone, 0, 0); + legOpacity = 50; } else { - // Center point + // Center point wxPoint r(lpx, lpy); // radius scaled to display float rad = rangePx; - //float arcw = arc_width * canvas_pix_per_mm; - // On larger screens, make the arc_width 1.0 mm - //if ( m_display_size_mm > 200) //200 mm, about 8 inches - //arcw = canvas_pix_per_mm; - + // float arcw = arc_width * canvas_pix_per_mm; + // On larger screens, make the arc_width 1.0 mm + // if ( m_display_size_mm > 200) //200 mm, about 8 inches + // arcw = canvas_pix_per_mm; // Enable anti-aliased lines, at best quality glEnable(GL_BLEND); @@ -6512,7 +6490,7 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, coords[6] = rad; coords[7] = -rad; - GLShaderProgram *shader = pring_shader_program[0/*GetCanvasIndex()*/]; + GLShaderProgram *shader = pring_shader_program[0 /*GetCanvasIndex()*/]; shader->Bind(); // Get pointers to the attributes in the program. @@ -6546,7 +6524,8 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, colorv[2] = colorb.Blue() / float(256); colorv[3] = colorb.Alpha() / float(256); - GLint colloc = glGetUniformLocation(shader->programId(), "circle_color"); + GLint colloc = + glGetUniformLocation(shader->programId(), "circle_color"); glUniform4fv(colloc, 1, colorv); // Border color @@ -6556,7 +6535,8 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, bcolorv[2] = 0; bcolorv[3] = 0; - GLint bcolloc = glGetUniformLocation(shader->programId(), "border_color"); + GLint bcolloc = + glGetUniformLocation(shader->programId(), "border_color"); glUniform4fv(bcolloc, 1, bcolorv); // Border Width @@ -6570,9 +6550,11 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, glUniform1f(ringWidthloc, arcw); // Visible sectors, rotated to vp orientation - float sr1 = sectorlegs[i].sector1 + (viewport.rotation * 180 / PI) + 180; + float sr1 = + sectorlegs[i].sector1 + (viewport.rotation * 180 / PI) + 180; if (sr1 > 360.) sr1 -= 360.; - float sr2 = sectorlegs[i].sector2 + (viewport.rotation * 180 / PI) + 180; + float sr2 = + sectorlegs[i].sector2 + (viewport.rotation * 180 / PI) + 180; if (sr2 > 360.) sr2 -= 360.; float sb, se; @@ -6590,9 +6572,11 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, se += 360.; } - GLint sector1loc = glGetUniformLocation(shader->programId(), "sector_1"); + GLint sector1loc = + glGetUniformLocation(shader->programId(), "sector_1"); glUniform1f(sector1loc, (sb * PI / 180.)); - GLint sector2loc = glGetUniformLocation(shader->programId(), "sector_2"); + GLint sector2loc = + glGetUniformLocation(shader->programId(), "sector_2"); glUniform1f(sector2loc, (se * PI / 180.)); // Rotate and translate @@ -6616,13 +6600,12 @@ void s57_DrawExtendedLightSectorsGL(ocpnDC &dc, ViewPort &viewport, glDisableVertexAttribArray(mPosAttrib); shader->UnBind(); - } #if 1 wxPen *arcpen = wxThePenList->FindOrCreatePen(wxColor(0, 0, 0, 128), 1, - wxPENSTYLE_SOLID); + wxPENSTYLE_SOLID); dc.SetPen(*arcpen); // Only draw each leg line once. @@ -6872,7 +6855,8 @@ bool s57_GetVisibleLightSectors(ChartCanvas *cc, double lat, double lon, // Find the chart that is currently shown at the given lat/lon wxPoint calcPoint = viewport.GetPixFromLL(lat, lon); ChartBase *target_chart; - if (cc->m_singleChart && (cc->m_singleChart->GetChartFamily() == CHART_FAMILY_VECTOR)) + if (cc->m_singleChart && + (cc->m_singleChart->GetChartFamily() == CHART_FAMILY_VECTOR)) target_chart = cc->m_singleChart; else if (viewport.b_quilt) target_chart = cc->m_pQuilt->GetChartAtPix(viewport, calcPoint); diff --git a/gui/src/safe_mode_gui.cpp b/gui/src/safe_mode_gui.cpp index 7dd4bdf5af..a09319709f 100644 --- a/gui/src/safe_mode_gui.cpp +++ b/gui/src/safe_mode_gui.cpp @@ -19,7 +19,9 @@ static const int TIMEOUT_SECONDS = 15; static const char* LAST_RUN_ERROR_MSG = _("

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" - "features?\n



You may consider visiting the list of known issues.

"); + "features?\n



You may consider visiting the list of known issues.

"); /** * Check if the last start failed, possibly invoke user dialog and set diff --git a/gui/src/shaders.cpp b/gui/src/shaders.cpp index df6e1327ac..973570540d 100644 --- a/gui/src/shaders.cpp +++ b/gui/src/shaders.cpp @@ -31,21 +31,19 @@ #endif #ifdef USE_ANDROID_GLES2 -const GLchar* preamble = -"\n"; +const GLchar *preamble = "\n"; #else -const GLchar* preamble = -"#version 120\n" -"#define precision\n" -"#define lowp\n" -"#define mediump\n" -"#define highp\n"; +const GLchar *preamble = + "#version 120\n" + "#define precision\n" + "#define lowp\n" + "#define mediump\n" + "#define highp\n"; #endif - // Simple colored triangle shader -static const GLchar* color_tri_vertex_shader_source = +static const GLchar *color_tri_vertex_shader_source = "attribute vec2 position;\n" "uniform mat4 MVMatrix;\n" "uniform mat4 TransformMatrix;\n" @@ -56,7 +54,7 @@ static const GLchar* color_tri_vertex_shader_source = " gl_Position = MVMatrix * TransformMatrix * vec4(position, 0.0, 1.0);\n" "}\n"; -static const GLchar* color_tri_fragment_shader_source = +static const GLchar *color_tri_fragment_shader_source = "precision lowp float;\n" "varying vec4 fragColor;\n" "void main() {\n" @@ -64,7 +62,7 @@ static const GLchar* color_tri_fragment_shader_source = "}\n"; // Simple 2D texture shader -static const GLchar* texture_2D_vertex_shader_source = +static const GLchar *texture_2D_vertex_shader_source = "attribute vec2 aPos;\n" "attribute vec2 aUV;\n" "uniform mat4 MVMatrix;\n" @@ -75,7 +73,7 @@ static const GLchar* texture_2D_vertex_shader_source = " varCoord = aUV;\n" "}\n"; -static const GLchar* texture_2D_fragment_shader_source = +static const GLchar *texture_2D_fragment_shader_source = "precision lowp float;\n" "uniform sampler2D uTex;\n" "varying vec2 varCoord;\n" @@ -85,7 +83,7 @@ static const GLchar* texture_2D_fragment_shader_source = // Circle shader -static const GLchar* circle_filled_vertex_shader_source = +static const GLchar *circle_filled_vertex_shader_source = "precision highp float;\n" "attribute vec2 aPos;\n" "uniform mat4 MVMatrix;\n" @@ -94,7 +92,7 @@ static const GLchar* circle_filled_vertex_shader_source = " gl_Position = MVMatrix * TransformMatrix * vec4(aPos, 0.0, 1.0);\n" "}\n"; -static const GLchar* circle_filled_fragment_shader_source = +static const GLchar *circle_filled_fragment_shader_source = "precision highp float;\n" "uniform float border_width;\n" "uniform float circle_radius;\n" @@ -109,7 +107,7 @@ static const GLchar* circle_filled_fragment_shader_source = "}\n"; // Alpha 2D texture shader -static const GLchar* texture_2DA_vertex_shader_source = +static const GLchar *texture_2DA_vertex_shader_source = "attribute vec2 aPos;\n" "attribute vec2 aUV;\n" "uniform mat4 MVMatrix;\n" @@ -120,7 +118,7 @@ static const GLchar* texture_2DA_vertex_shader_source = " varCoord = aUV;\n" "}\n"; -static const GLchar* texture_2DA_fragment_shader_source = +static const GLchar *texture_2DA_fragment_shader_source = "precision lowp float;\n" "uniform sampler2D uTex;\n" "varying vec2 varCoord;\n" @@ -129,24 +127,22 @@ static const GLchar* texture_2DA_fragment_shader_source = " gl_FragColor = texture2D(uTex, varCoord) + color;\n" "}\n"; - -//https://vitaliburkov.wordpress.com/2016/09/17/simple-and-fast-high-quality-antialiased-lines-with-opengl/ -static const GLchar* AALine_vertex_shader_source = +// https://vitaliburkov.wordpress.com/2016/09/17/simple-and-fast-high-quality-antialiased-lines-with-opengl/ +static const GLchar *AALine_vertex_shader_source = "uniform vec2 uViewPort; //Width and Height of the viewport\n" "varying vec2 vLineCenter;\n" "attribute vec2 position;\n" "uniform mat4 MVMatrix;\n" "uniform mat4 TransformMatrix;\n" - "void main()\n" - "{\n" - " vec4 pp = MVMatrix * vec4(position, 0.0, 1.0);\n" - " gl_Position = pp;\n" - " vec2 vp = uViewPort;\n" - " vLineCenter = 0.5*(pp.xy + vec2(1, 1))*vp;\n" - "}\n"; - + "void main()\n" + "{\n" + " vec4 pp = MVMatrix * vec4(position, 0.0, 1.0);\n" + " gl_Position = pp;\n" + " vec2 vp = uViewPort;\n" + " vLineCenter = 0.5*(pp.xy + vec2(1, 1))*vp;\n" + "}\n"; -static const GLchar* AALine_fragment_shader_source = +static const GLchar *AALine_fragment_shader_source = "precision mediump float;\n" "uniform float uLineWidth;\n" "uniform vec4 color;\n" @@ -231,8 +227,8 @@ static const GLchar *ring_fragment_shader_source = "}\n" "}\n"; - // Alpha 2D texture shader -static const GLchar* Android_texture_2DA_vertex_shader_source = +// Alpha 2D texture shader +static const GLchar *Android_texture_2DA_vertex_shader_source = "attribute vec2 aPos;\n" "attribute vec2 aUV;\n" "uniform mat4 MVMatrix;\n" @@ -243,7 +239,7 @@ static const GLchar* Android_texture_2DA_vertex_shader_source = " varCoord = aUV;\n" "}\n"; -static const GLchar* Android_texture_2DA_fragment_shader_source = +static const GLchar *Android_texture_2DA_fragment_shader_source = "precision lowp float;\n" "uniform sampler2D uTex;\n" "varying vec2 varCoord;\n" @@ -263,7 +259,6 @@ GLint texture_2DA_vertex_shader_p; GLint texture_2DA_fragment_shader_p; GLint texture_2DA_shader_program; - bool bShadersLoaded[2]; bool loadShaders(int index) { @@ -276,22 +271,24 @@ bool loadShaders(int index) { bool ret_val = true; GLint success; - // Simple colored triangle shader if (!pcolor_tri_shader_program[index]) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(color_tri_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(color_tri_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(color_tri_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(color_tri_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); - if (shaderProgram->isOK()) - pcolor_tri_shader_program[index] = shaderProgram; + if (shaderProgram->isOK()) pcolor_tri_shader_program[index] = shaderProgram; } if (!ptexture_2D_shader_program[index]) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(texture_2D_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(texture_2D_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(texture_2D_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(texture_2D_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); if (shaderProgram->isOK()) @@ -300,8 +297,10 @@ bool loadShaders(int index) { if (!pcircle_filled_shader_program[index]) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(circle_filled_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(circle_filled_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(circle_filled_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(circle_filled_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); if (shaderProgram->isOK()) @@ -310,8 +309,10 @@ bool loadShaders(int index) { if (!ptexture_2DA_shader_program[index]) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(texture_2DA_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(texture_2DA_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(texture_2DA_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(texture_2DA_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); if (shaderProgram->isOK()) @@ -320,23 +321,25 @@ bool loadShaders(int index) { if (!pAALine_shader_program[index]) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(AALine_fragment_shader_source, GL_FRAGMENT_SHADER); - shaderProgram->addShaderFromSource(AALine_vertex_shader_source, GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(AALine_fragment_shader_source, + GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(AALine_vertex_shader_source, + GL_VERTEX_SHADER); shaderProgram->linkProgram(); - if (shaderProgram->isOK()) - pAALine_shader_program[index] = shaderProgram; + if (shaderProgram->isOK()) pAALine_shader_program[index] = shaderProgram; } // ring shader if (!pring_shader_program[index]) { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(ring_fragment_shader_source, GL_FRAGMENT_SHADER); - shaderProgram->addShaderFromSource(ring_vertex_shader_source, GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(ring_fragment_shader_source, + GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(ring_vertex_shader_source, + GL_VERTEX_SHADER); shaderProgram->linkProgram(); - if (shaderProgram->isOK()) - pring_shader_program[index] = shaderProgram; + if (shaderProgram->isOK()) pring_shader_program[index] = shaderProgram; } #ifdef __ANDROID__ @@ -347,12 +350,11 @@ bool loadShaders(int index) { glShaderSource(texture_2DA_vertex_shader_p, 1, &Android_texture_2DA_vertex_shader_source, NULL); glCompileShader(texture_2DA_vertex_shader_p); - glGetShaderiv(texture_2DA_vertex_shader_p, GL_COMPILE_STATUS, - &success); + glGetShaderiv(texture_2DA_vertex_shader_p, GL_COMPILE_STATUS, &success); if (!success) { - //glGetShaderInfoLog(texture_2DA_vertex_shader_p, INFOLOG_LEN, NULL, - // infoLog); - //printf("ERROR::SHADER::VERTEX::COMPILATION_FAILED\n%s\n", infoLog); + // glGetShaderInfoLog(texture_2DA_vertex_shader_p, INFOLOG_LEN, NULL, + // infoLog); + // printf("ERROR::SHADER::VERTEX::COMPILATION_FAILED\n%s\n", infoLog); ret_val = false; } } @@ -363,12 +365,11 @@ bool loadShaders(int index) { glShaderSource(texture_2DA_fragment_shader_p, 1, &Android_texture_2DA_fragment_shader_source, NULL); glCompileShader(texture_2DA_fragment_shader_p); - glGetShaderiv(texture_2DA_fragment_shader_p, GL_COMPILE_STATUS, - &success); + glGetShaderiv(texture_2DA_fragment_shader_p, GL_COMPILE_STATUS, &success); if (!success) { - //glGetShaderInfoLog(texture_2DA_fragment_shader_p, INFOLOG_LEN, - // NULL, infoLog); - //printf("ERROR::SHADER::FRAGMENT::COMPILATION_FAILED\n%s\n", infoLog); + // glGetShaderInfoLog(texture_2DA_fragment_shader_p, INFOLOG_LEN, + // NULL, infoLog); + // printf("ERROR::SHADER::FRAGMENT::COMPILATION_FAILED\n%s\n", infoLog); ret_val = false; } } @@ -376,17 +377,14 @@ bool loadShaders(int index) { if (!texture_2DA_shader_program) { /* Link shaders */ texture_2DA_shader_program = glCreateProgram(); - glAttachShader(texture_2DA_shader_program, - texture_2DA_vertex_shader_p); - glAttachShader(texture_2DA_shader_program, - texture_2DA_fragment_shader_p); + glAttachShader(texture_2DA_shader_program, texture_2DA_vertex_shader_p); + glAttachShader(texture_2DA_shader_program, texture_2DA_fragment_shader_p); glLinkProgram(texture_2DA_shader_program); - glGetProgramiv(texture_2DA_shader_program, GL_LINK_STATUS, - &success); + glGetProgramiv(texture_2DA_shader_program, GL_LINK_STATUS, &success); if (!success) { - //glGetProgramInfoLog(texture_2DA_shader_program, INFOLOG_LEN, - // NULL, infoLog); - //printf("ERROR::SHADER::PROGRAM::LINKING_FAILED\n%s\n", infoLog); + // glGetProgramInfoLog(texture_2DA_shader_program, INFOLOG_LEN, + // NULL, infoLog); + // printf("ERROR::SHADER::PROGRAM::LINKING_FAILED\n%s\n", infoLog); ret_val = false; } } @@ -398,17 +396,16 @@ bool loadShaders(int index) { return ret_val; } -void reConfigureShaders(int index) { -} +void reConfigureShaders(int index) {} -void unloadShaders() { - bShadersLoaded[0] = bShadersLoaded[1] = false; -} +void unloadShaders() { bShadersLoaded[0] = bShadersLoaded[1] = false; } GLShaderProgram *GetStaticTriShader() { GLShaderProgram *shaderProgram = new GLShaderProgram; - shaderProgram->addShaderFromSource(color_tri_vertex_shader_source, GL_VERTEX_SHADER); - shaderProgram->addShaderFromSource(color_tri_fragment_shader_source, GL_FRAGMENT_SHADER); + shaderProgram->addShaderFromSource(color_tri_vertex_shader_source, + GL_VERTEX_SHADER); + shaderProgram->addShaderFromSource(color_tri_fragment_shader_source, + GL_FRAGMENT_SHADER); shaderProgram->linkProgram(); if (shaderProgram->isOK()) @@ -417,5 +414,4 @@ GLShaderProgram *GetStaticTriShader() { return NULL; } - #endif diff --git a/gui/src/shapefile_basemap.cpp b/gui/src/shapefile_basemap.cpp index 0c3e591ce0..fd4e5c4296 100644 --- a/gui/src/shapefile_basemap.cpp +++ b/gui/src/shapefile_basemap.cpp @@ -42,7 +42,7 @@ #define __CALL_CONVENTION #endif -extern OCPNPlatform* g_Platform; +extern OCPNPlatform *g_Platform; extern wxString gWorldShapefileLocation; #ifdef ocpnUSE_GL @@ -128,8 +128,7 @@ void __CALL_CONVENTION shpsvertexCallback(GLvoid *arg) { } #endif -ShapeBaseChartSet::ShapeBaseChartSet() : _loaded(false) { -} +ShapeBaseChartSet::ShapeBaseChartSet() : _loaded(false) {} wxPoint2DDouble ShapeBaseChartSet::GetDoublePixFromLL(ViewPort &vp, double lat, double lon) { @@ -171,7 +170,6 @@ ShapeBaseChart &ShapeBaseChartSet::HighestQualityBaseMap() { } ShapeBaseChart &ShapeBaseChartSet::SelectBaseMap(const size_t &scale) { - if (_basemap_map.find(Quality::full) != _basemap_map.end() && _basemap_map.at(Quality::full).IsUsable() && scale <= _basemap_map.at(Quality::full).MinScale()) { @@ -211,9 +209,9 @@ void ShapeBaseChartSet::LoadBasemaps(const std::string &dir) { wxColor land_color = wxColor(170, 175, 80); if (fs::exists(ShapeBaseChart::ConstructPath(dir, "crude_10x10"))) { - auto c = ShapeBaseChart(ShapeBaseChart::ConstructPath(dir, "crude_10x10"), 300000000, - land_color); - c._dmod= 10; + auto c = ShapeBaseChart(ShapeBaseChart::ConstructPath(dir, "crude_10x10"), + 300000000, land_color); + c._dmod = 10; _basemap_map.insert(std::make_pair(Quality::crude, c)); } @@ -241,8 +239,8 @@ void ShapeBaseChartSet::LoadBasemaps(const std::string &dir) { land_color))); } _loaded = true; - //if(_basemap_map.size()) - //LowestQualityBaseMap().LoadSHP(); + // if(_basemap_map.size()) + // LowestQualityBaseMap().LoadSHP(); } bool ShapeBaseChart::LoadSHP() { @@ -413,6 +411,8 @@ void ShapeBaseChart::DoDrawPolygonFilledGL(ocpnDC &pnt, ViewPort &vp, glDrawArrays(GL_TRIANGLES, 0, polycnt); delete[] pvt; + delete[] polyv; + glDeleteBuffers(1, &vbo); shader->UnBind(); #endif @@ -454,10 +454,9 @@ void ShapeBaseChart::DrawPolygonFilled(ocpnDC &pnt, ViewPort &vp) { else lon_start = lon_start - (lon_start % pmod); - if (_is_tiled) { - for (int i = lat_start; i < ceil(bbox.GetMaxLat()) + pmod; i+=pmod) { - for (int j = lon_start; j < ceil(bbox.GetMaxLon()) + pmod; j+=pmod) { + for (int i = lat_start; i < ceil(bbox.GetMaxLat()) + pmod; i += pmod) { + for (int j = lon_start; j < ceil(bbox.GetMaxLon()) + pmod; j += pmod) { int lon{j}; if (j < -180) { lon = j + 360; diff --git a/gui/src/styles.cpp b/gui/src/styles.cpp index 5494f5bc8c..3a2b96fb28 100644 --- a/gui/src/styles.cpp +++ b/gui/src/styles.cpp @@ -699,8 +699,8 @@ void Style::SetColorScheme(ColorScheme cs) { wxBitmap bm = graphics->GetSubBitmap( wxRect(consoleTextBackgroundLoc, consoleTextBackgroundSize)); - // The background bitmap in the icons file may be too small but it's better to resize it - // when we use it + // The background bitmap in the icons file may be too small but it's better + // to resize it when we use it consoleTextBackground = SetBitmapBrightness(bm, cs); } diff --git a/gui/src/svg_utils.cpp b/gui/src/svg_utils.cpp index a0a92b646f..a31712c1c9 100644 --- a/gui/src/svg_utils.cpp +++ b/gui/src/svg_utils.cpp @@ -117,7 +117,7 @@ unsigned int get_px_length(const char* val) { num = std::stoi(val); } catch (std::invalid_argument&) { return 0; - } catch (std::out_of_range& ) { + } catch (std::out_of_range&) { return 0; } if (num < 0) { @@ -159,8 +159,8 @@ bool SVGDocumentPixelSize(const wxString filename, unsigned int& width, extern BasePlatform* g_BasePlatform; unsigned int SVGPixelsToDisplay(unsigned int svg_px) { - return g_BasePlatform->GetDisplayDPmm() * SVG_MM_TO_IN / SVG_IN_TO_PX * svg_px * - g_ChartScaleFactorExp; + return g_BasePlatform->GetDisplayDPmm() * SVG_MM_TO_IN / SVG_IN_TO_PX * + svg_px * g_ChartScaleFactorExp; } SVGBitmapCache::SVGBitmapCache() { diff --git a/gui/src/tcmgr.cpp b/gui/src/tcmgr.cpp index a8e7fe25b7..3eea1e8411 100644 --- a/gui/src/tcmgr.cpp +++ b/gui/src/tcmgr.cpp @@ -1074,7 +1074,7 @@ int TCMgr::GetStationIDXbyNameType(const wxString &prefix, double xlat, /* $Id: tide_db_default.h 1092 2006-11-16 03:02:42Z flaterco $ */ -//#include "tcd.h" +// #include "tcd.h" /***************************************************************************** * @@ -1904,9 +1904,9 @@ NV_CHAR tzfile[DEFAULT_TZFILES][DEFAULT_TZFILE_SIZE] = { /* $Id: tide_db.c 3744 2010-08-17 22:34:46Z flaterco $ */ -//#include "tcd.h" -//#include "tide_db_header.h" -//#include "tide_db_default.h" +// #include "tcd.h" +// #include "tide_db_header.h" +// #include "tide_db_default.h" /* This should be done with stdbool.h, but VC doesn't have it. */ /* Using crappy old int, must be careful not to 'require' a 64-bit value. */ @@ -7337,7 +7337,8 @@ NV_U_INT32 bit_unpack(NV_U_BYTE buffer[], NV_U_INT32 start, /* For the last byte we mask out anything after the end bit and */ /* then shift to the right (8 - end_bit) bits. */ if (mask[end_bit]) { - value += (NV_U_INT32)(buffer[start_byte] & mask[end_bit]) >> (8 - end_bit); + value += + (NV_U_INT32)(buffer[start_byte] & mask[end_bit]) >> (8 - end_bit); } } diff --git a/gui/src/toolbar.cpp b/gui/src/toolbar.cpp index e6789d2c50..910f8934a5 100644 --- a/gui/src/toolbar.cpp +++ b/gui/src/toolbar.cpp @@ -74,7 +74,6 @@ extern int g_maintoolbar_y; extern GLenum g_texture_rectangle_format; #endif - class ocpnToolBarTool : public wxToolBarToolBase { public: ocpnToolBarTool(ocpnToolBarSimple *tbar, int id, const wxString &label, @@ -178,7 +177,7 @@ ocpnFloatingToolbarDialog::ocpnFloatingToolbarDialog(wxWindow *parent, m_bAutoHideToolbar = false; m_nAutoHideToolbar = 5; m_toolbar_scale_tools_shown = false; - m_backcolorString = _T("GREY2"); + m_backcolorString = _T("GREY3"); m_toolShowMask = _T("XXXXXXXXXXXXXXXX"); n_toolbarHideMethod = TOOLBAR_HIDE_TO_GRABBER; b_canToggleOrientation = true; @@ -186,8 +185,7 @@ ocpnFloatingToolbarDialog::ocpnFloatingToolbarDialog(wxWindow *parent, m_auxOffsetY = 0; m_ptoolbar = CreateNewToolbar(); - if (m_ptoolbar) - m_ptoolbar->SetBackgroundColour(*wxBLACK); + if (m_ptoolbar) m_ptoolbar->SetBackgroundColour(GetGlobalColor("GREY3")); m_cs = (ColorScheme)-1; m_style = g_StyleManager->GetCurrentStyle(); @@ -204,11 +202,12 @@ ocpnFloatingToolbarDialog::ocpnFloatingToolbarDialog(wxWindow *parent, m_marginsInvisible = m_style->marginsInvisible; - m_FloatingToolbarConfigMenu = NULL; m_fade_timer.SetOwner(this); - this->Connect( wxEVT_TIMER, wxTimerEventHandler( ocpnFloatingToolbarDialog::FadeTimerEvent ), NULL, this ); + this->Connect(wxEVT_TIMER, + wxTimerEventHandler(ocpnFloatingToolbarDialog::FadeTimerEvent), + NULL, this); if (m_bAutoHideToolbar && (m_nAutoHideToolbar > 0)) m_fade_timer.Start(m_nAutoHideToolbar * 1000); @@ -226,14 +225,13 @@ ocpnFloatingToolbarDialog::~ocpnFloatingToolbarDialog() { void ocpnFloatingToolbarDialog::FadeTimerEvent(wxTimerEvent &event) { if (n_toolbarHideMethod == TOOLBAR_HIDE_TO_FIRST_TOOL) { if (g_bmasterToolbarFull) { - if (m_bAutoHideToolbar && (m_nAutoHideToolbar > 0) /*&& !m_bsubmerged*/ ) { - + if (m_bAutoHideToolbar && (m_nAutoHideToolbar > 0) /*&& !m_bsubmerged*/) { // Double check the mouse position - wxPoint mp = gFrame->GetPrimaryCanvas()->ScreenToClient(::wxGetMousePosition()); + wxPoint mp = + gFrame->GetPrimaryCanvas()->ScreenToClient(::wxGetMousePosition()); // in the toolbar? wxRect r = GetToolbarRect(); - if (r.Contains(mp)) - return; + if (r.Contains(mp)) return; wxCommandEvent event; event.SetId(ID_MASTERTOGGLE); @@ -356,7 +354,6 @@ bool ocpnFloatingToolbarDialog::_toolbarConfigMenuUtil( return true; } - void ocpnFloatingToolbarDialog::EnableTool(int toolid, bool enable) { if (m_ptoolbar) m_ptoolbar->EnableTool(toolid, enable); } @@ -432,7 +429,6 @@ void ocpnFloatingToolbarDialog::SetGeometry(bool bAvoid, wxRect rectAvoid) { } } - void ocpnFloatingToolbarDialog::SetDefaultPosition() { if (m_block) return; @@ -463,7 +459,8 @@ void ocpnFloatingToolbarDialog::SetDefaultPosition() { // toolbar on top of them, hinding instruments this positions the main // toolbar directly right of the left docked instruments onto the chart // wxPoint screen_pos = m_pparent->ClientToScreen( m_position ); - //wxPoint screen_pos = gFrame->GetPrimaryCanvas()->ClientToScreen(m_position); + // wxPoint screen_pos = + // gFrame->GetPrimaryCanvas()->ClientToScreen(m_position); // GTK sometimes has trouble with ClientToScreen() if executed in the // context of an event handler The position of the window is calculated @@ -474,18 +471,15 @@ void ocpnFloatingToolbarDialog::SetDefaultPosition() { // But this causes another problem. If a toolbar is NOT left docked, it // will walk left by two pixels on each call to Reposition(). // TODO - } } void ocpnFloatingToolbarDialog::Submerge() { m_bsubmerged = true; - //Hide(); + // Hide(); if (m_ptoolbar) m_ptoolbar->KillTooltip(); } - - void ocpnFloatingToolbarDialog::HideTooltip() { #ifndef __OCPN__ANDROID__ if (m_ptoolbar) m_ptoolbar->HideTooltip(); @@ -501,8 +495,8 @@ void ocpnFloatingToolbarDialog::ShowTooltips() { void ocpnFloatingToolbarDialog::ToggleOrientation() {} wxRect ocpnFloatingToolbarDialog::GetToolbarRect() { - return wxRect(m_position.x, m_position.y, - m_ptoolbar->m_maxWidth, m_ptoolbar->m_maxHeight); + return wxRect(m_position.x, m_position.y, m_ptoolbar->m_maxWidth, + m_ptoolbar->m_maxHeight); } wxSize ocpnFloatingToolbarDialog::GetToolbarSize() { @@ -514,24 +508,23 @@ wxPoint ocpnFloatingToolbarDialog::GetToolbarPosition() { } bool ocpnFloatingToolbarDialog::MouseEvent(wxMouseEvent &event) { - if (m_ptoolbar){ + if (m_ptoolbar) { bool bproc = m_ptoolbar->OnMouseEvent(event, m_position); - if (bproc) - m_ptoolbar->CreateBitmap(); + if (bproc) m_ptoolbar->CreateBitmap(); return bproc; - } - else + } else return false; } void ocpnFloatingToolbarDialog::RefreshToolbar() { - if (m_ptoolbar){ - if (m_ptoolbar->IsDirty()) + if (m_ptoolbar) { + if (m_ptoolbar->IsDirty()) { + Realize(); gFrame->GetPrimaryCanvas()->Refresh(); + } } } - void ocpnFloatingToolbarDialog::SetAutoHideTimer(int time) { m_nAutoHideToolbar = time; if (m_bAutoHideToolbar) { @@ -550,11 +543,11 @@ void ocpnFloatingToolbarDialog::SetToolShortHelp(int id, const wxString &help) { if (m_ptoolbar) m_ptoolbar->SetToolShortHelp(id, help); } - void ocpnFloatingToolbarDialog::Realize() { if (m_ptoolbar) { m_ptoolbar->Realize(); m_ptoolbar->CreateBitmap(); + m_toolbar_image.Destroy(); } } @@ -570,10 +563,9 @@ void ocpnFloatingToolbarDialog::DrawDC(ocpnDC &dc, double displayScale) { void ocpnFloatingToolbarDialog::DrawGL(ocpnDC &gldc, double displayScale) { #ifdef ocpnUSE_GL - if (!m_ptoolbar) - return; + if (!m_ptoolbar) return; - wxColour backColor = *wxBLACK; + wxColour backColor = GetGlobalColor("GREY3"); gldc.SetBrush(wxBrush(backColor)); gldc.SetPen(wxPen(backColor)); @@ -581,18 +573,15 @@ void ocpnFloatingToolbarDialog::DrawGL(ocpnDC &gldc, double displayScale) { int m_end_margin = wxMin(GetToolSize().x, GetToolSize().y) / 8; if (m_orient == wxHORIZONTAL) - gldc.DrawRoundedRectangle((r.x - m_end_margin/2)*displayScale, - (r.y-1)*displayScale, - (r.width + m_end_margin)*displayScale, - (r.height+2)*displayScale, - (m_end_margin * 1)*displayScale); + gldc.DrawRoundedRectangle( + (r.x - m_end_margin / 2) * displayScale, (r.y - 1) * displayScale, + (r.width + m_end_margin) * displayScale, (r.height + 2) * displayScale, + (m_end_margin * 1) * displayScale); else - gldc.DrawRoundedRectangle((r.x-1)*displayScale, - (r.y- m_end_margin/2)*displayScale, - (r.width + 2)*displayScale, - (r.height + m_end_margin)*displayScale, - (m_end_margin * 1.5)*displayScale); - + gldc.DrawRoundedRectangle( + (r.x - 1) * displayScale, (r.y - m_end_margin / 2) * displayScale, + (r.width + 2) * displayScale, (r.height + m_end_margin) * displayScale, + (m_end_margin * 1.5) * displayScale); int width = GetToolbarSize().x; int height = GetToolbarSize().y; @@ -616,23 +605,24 @@ void ocpnFloatingToolbarDialog::DrawGL(ocpnDC &gldc, double displayScale) { glBindTexture(g_texture_rectangle_format, m_texture); } + if (!m_toolbar_image.IsOk()) { + // fill texture data + m_toolbar_image = m_ptoolbar->GetBitmap().ConvertToImage(); - // fill texture data - wxImage image = m_ptoolbar->GetBitmap().ConvertToImage(); - - unsigned char *d = image.GetData(); - unsigned char *e = new unsigned char[4 * width * height]; - for (int y = 0; y < height; y++) - for (int x = 0; x < width; x++) { - int i = y * width + x; - memcpy(e + 4 * i, d + 3 * i, 3); - e[4 * i + 3] = 255; //d[3*i + 2] == 255 ? 0:255; //255 - d[3 * i + 2]; - } - glTexImage2D(g_texture_rectangle_format, 0, GL_RGBA, width, height, 0, - GL_RGBA, GL_UNSIGNED_BYTE, e); - delete[] e; - glDisable(g_texture_rectangle_format); - glDisable(GL_BLEND); + unsigned char *d = m_toolbar_image.GetData(); + unsigned char *e = new unsigned char[4 * width * height]; + for (int y = 0; y < height; y++) + for (int x = 0; x < width; x++) { + int i = y * width + x; + memcpy(e + 4 * i, d + 3 * i, 3); + e[4 * i + 3] = 255; // d[3*i + 2] == 255 ? 0:255; //255 - d[3 * i + 2]; + } + glTexImage2D(g_texture_rectangle_format, 0, GL_RGBA, width, height, 0, + GL_RGBA, GL_UNSIGNED_BYTE, e); + delete[] e; + glDisable(g_texture_rectangle_format); + glDisable(GL_BLEND); + } // Render the texture if (m_texture) { @@ -642,8 +632,10 @@ void ocpnFloatingToolbarDialog::DrawGL(ocpnDC &gldc, double displayScale) { int x0 = GetToolbarPosition().x, x1 = x0 + width; int y0 = GetToolbarPosition().y - 0, y1 = y0 + height; - x0 *= displayScale; x1 *= displayScale; - y0 *= displayScale; y1 *= displayScale; + x0 *= displayScale; + x1 *= displayScale; + y0 *= displayScale; + y1 *= displayScale; float tx, ty; if (GL_TEXTURE_RECTANGLE_ARB == g_texture_rectangle_format) @@ -712,8 +704,8 @@ ocpnToolBarSimple *ocpnFloatingToolbarDialog::CreateNewToolbar() { m_ptoolbar = new ocpnToolBarSimple(this, -1, wxPoint(-1, -1), wxSize(-1, -1), winstyle, m_orient); - //m_ptoolbar->SetBackgroundColour(GetGlobalColor(_T("GREY2"))); - //m_ptoolbar->ClearBackground(); + // m_ptoolbar->SetBackgroundColour(GetGlobalColor(_T("GREY2"))); + // m_ptoolbar->ClearBackground(); m_ptoolbar->SetToggledBackgroundColour(GetGlobalColor(_T("GREY1"))); m_ptoolbar->SetColorScheme(m_cs); m_ptoolbar->EnableRolloverBitmaps(GetEnableRolloverBitmaps()); @@ -743,7 +735,6 @@ void ocpnFloatingToolbarDialog::DestroyToolBar() { extern bool g_bTrackActive; extern s52plib *ps52plib; - bool ocpnFloatingToolbarDialog::CheckAndAddPlugInTool(ocpnToolBarSimple *tb) { if (!g_pi_manager) return false; @@ -798,7 +789,6 @@ bool ocpnFloatingToolbarDialog::CheckAndAddPlugInTool(ocpnToolBarSimple *tb) { return bret; } - void ocpnFloatingToolbarDialog::EnableRolloverBitmaps(bool bEnable) { m_enableRolloverBitmaps = bEnable; if (m_ptoolbar) m_ptoolbar->EnableRolloverBitmaps(bEnable); @@ -851,8 +841,10 @@ ToolTipWin::ToolTipWin(wxWindow *parent) wxNO_BORDER | wxFRAME_FLOAT_ON_PARENT | wxFRAME_NO_TASKBAR) { m_pbm = NULL; - m_back_color = GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - m_text_color = GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + m_back_color = + GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + m_text_color = + GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); SetBackgroundStyle(wxBG_STYLE_CUSTOM); SetBackgroundColour(m_back_color); @@ -864,8 +856,10 @@ ToolTipWin::ToolTipWin(wxWindow *parent) ToolTipWin::~ToolTipWin() { delete m_pbm; } void ToolTipWin::SetColorScheme(ColorScheme cs) { - m_back_color = GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - m_text_color = GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + m_back_color = + GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + m_text_color = + GetDimedColor(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); #ifndef __WXOSX__ m_text_color = GetDimedColor(FontMgr::Get().GetFontColor(_("ToolTips"))); @@ -932,7 +926,7 @@ void ToolTipWin::SetBitmap() { mdc.SetTextBackground(m_back_color); int offx = GetCharWidth(); - int offy = GetCharHeight()/4; + int offy = GetCharHeight() / 4; offx *= scaler; offy *= scaler; mdc.DrawText(m_string, offx, offy); @@ -1035,7 +1029,7 @@ wxToolBarToolBase *ocpnToolBarSimple::DoAddTool( m_xPos = xPos; m_yPos = yPos; - //InvalidateBestSize(); + // InvalidateBestSize(); return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled, kind, shortHelp, longHelp, clientData); } @@ -1046,7 +1040,7 @@ wxToolBarToolBase *ocpnToolBarSimple::AddTool( int toolid, const wxString &label, const wxBitmap &bitmap, const wxBitmap &bmpDisabled, wxItemKind kind, const wxString &shortHelp, const wxString &longHelp, wxObject *data) { - //InvalidateBestSize(); + // InvalidateBestSize(); ocpnToolBarTool *tool = (ocpnToolBarTool *)InsertTool( GetToolsCount(), toolid, label, bitmap, bmpDisabled, kind, shortHelp, longHelp, data); @@ -1140,7 +1134,7 @@ bool ocpnToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos), if (m_last_ro_tool == tool) m_last_ro_tool = NULL; - //Refresh(false); + // Refresh(false); return true; } @@ -1148,7 +1142,6 @@ bool ocpnToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos), bool ocpnToolBarSimple::Create(ocpnFloatingToolbarDialog *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, int orient) { - m_parentContainer = parent; m_orient = orient; @@ -1166,7 +1159,7 @@ bool ocpnToolBarSimple::Create(ocpnFloatingToolbarDialog *parent, wxWindowID id, m_maxCols = 32000; // a lot } - //SetCursor(*wxSTANDARD_CURSOR); + // SetCursor(*wxSTANDARD_CURSOR); m_tooltip_timer.SetOwner(this, TOOLTIPON_TIMER); m_tooltipoff_timer.SetOwner(this, TOOLTIPOFF_TIMER); @@ -1275,13 +1268,13 @@ bool ocpnToolBarSimple::Realize() { tool->last_rect.width = 0; // mark it invalid if (tool->IsSeparator()) { - //if (GetWindowStyleFlag() & wxTB_HORIZONTAL) { - //if (m_currentRowsOrColumns >= m_maxCols) - //m_lastY += separatorSize; - //else - // m_lastX += separatorSize; + // if (GetWindowStyleFlag() & wxTB_HORIZONTAL) { + // if (m_currentRowsOrColumns >= m_maxCols) + // m_lastY += separatorSize; + // else + // m_lastX += separatorSize; //} - //else + // else { if (m_currentRowsOrColumns >= m_maxRows) m_lastX += separatorSize; @@ -1324,17 +1317,17 @@ bool ocpnToolBarSimple::Realize() { } m_currentRowsOrColumns++; } - //else - //if (tool->IsControl()) { - //tool->m_x = (wxCoord)(m_lastX); - //tool->m_y = (wxCoord)(m_lastY - (topMargin / 2)); + // else + // if (tool->IsControl()) { + // tool->m_x = (wxCoord)(m_lastX); + // tool->m_y = (wxCoord)(m_lastY - (topMargin / 2)); - //tool->trect = - // wxRect(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight()); - //tool->trect.Inflate(separatorSize / 2, topMargin); + // tool->trect = + // wxRect(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight()); + // tool->trect.Inflate(separatorSize / 2, topMargin); - //wxSize s = tool->GetControl()->GetSize(); - //m_lastX += s.x + separatorSize; + // wxSize s = tool->GetControl()->GetSize(); + // m_lastX += s.x + separatorSize; //} if (m_lastX > m_maxWidth) m_maxWidth = m_lastX; @@ -1361,10 +1354,9 @@ bool ocpnToolBarSimple::Realize() { } wxBitmap &ocpnToolBarSimple::CreateBitmap(double display_scale) { - if (m_bitmap.IsOk()) - return m_bitmap; + if (m_bitmap.IsOk()) return m_bitmap; - //Make the bitmap + // Make the bitmap int width = m_maxWidth; int height = m_maxHeight; @@ -1394,8 +1386,6 @@ wxBitmap &ocpnToolBarSimple::CreateBitmap(double display_scale) { return m_bitmap; } - - void ocpnToolBarSimple::OnToolTipTimerEvent(wxTimerEvent &event) { if (!gFrame) // In case gFrame was already destroyed, but the toolbar still // exists (Which should not happen, ever.) @@ -1416,7 +1406,8 @@ void ocpnToolBarSimple::OnToolTipTimerEvent(wxTimerEvent &event) { m_pToolTipWin->Move( 0, 0); // workaround for gtk autocentre dialog behavior - wxPoint screenPosition = gFrame->GetPrimaryCanvas()->ClientToScreen(pos_in_toolbar); + wxPoint screenPosition = + gFrame->GetPrimaryCanvas()->ClientToScreen(pos_in_toolbar); wxSize tipSize = m_pToolTipWin->GetRenderedSize(); m_pToolTipWin->SetPosition(screenPosition); @@ -1438,34 +1429,27 @@ void ocpnToolBarSimple::OnToolTipOffTimerEvent(wxTimerEvent &event) { HideTooltip(); } - bool ocpnToolBarSimple::OnMouseEvent(wxMouseEvent &event, wxPoint &position) { -#ifdef __OCPN__ANDROID__ - if (!event.IsButton()) return false; -#endif - wxCoord x, y; event.GetPosition(&x, &y); // in the toolbar? - wxRect r = wxRect(position, wxSize( m_maxWidth, m_maxHeight)); - if (!r.Contains(x,y)) { + wxRect r = wxRect(position, wxSize(m_maxWidth, m_maxHeight)); + if (!r.Contains(x, y)) { HideTooltip(); return false; } m_parentContainer->RefreshFadeTimer(); - ocpnToolBarTool *tool = (ocpnToolBarTool *)FindToolForPosition(x - position.x, - y - position.y); + ocpnToolBarTool *tool = + (ocpnToolBarTool *)FindToolForPosition(x - position.x, y - position.y); if (tool == NULL) { m_tooltipoff_timer.Start(m_tooltip_off, wxTIMER_ONE_SHOT); return true; - } - else + } else m_tooltipoff_timer.Stop(); - // tooltips if (tool && tool->IsButton() /*&& IsShown()*/) { if (m_btooltip_show) { @@ -1524,6 +1508,8 @@ bool ocpnToolBarSimple::OnMouseEvent(wxMouseEvent &event, wxPoint &position) { OnRightClick(tool->GetId(), x, y); } + + // Left Button Released. Only this action confirms selection. // If the button is enabled and it is not a toggle tool and it is // in the pressed state, then raise the button and call OnLeftClick. @@ -1622,7 +1608,7 @@ void ocpnToolBarSimple::CreateToolBitmap(wxToolBarToolBase *toolBase) { } if (bmp.IsNull()) { // Tool icon not found in style definition - //bmp = m_style->BuildPluginIcon(tool->pluginNormalIcon, toggleFlag); + // bmp = m_style->BuildPluginIcon(tool->pluginNormalIcon, toggleFlag); bmp = tool->pluginNormalIcon; if (fabs(m_sizefactor - 1.0) > 0.01) { if (tool->m_width && tool->m_height) { @@ -1672,17 +1658,12 @@ void ocpnToolBarSimple::CreateToolBitmap(wxToolBarToolBase *toolBase) { tool->m_activeBitmap = bmp; } - - - - - // NB! The current DrawTool code assumes that plugin tools are never disabled // when they are present on the toolbar, since disabled plugins are removed. void ocpnToolBarSimple::DrawTool(wxDC &dc, wxToolBarToolBase *toolBase) { ocpnToolBarTool *tool = (ocpnToolBarTool *)toolBase; - //PrepareDC(dc); + // PrepareDC(dc); wxPoint drawAt(tool->m_x, tool->m_y); wxBitmap bmp = wxNullBitmap; @@ -1905,7 +1886,6 @@ void ocpnToolBarSimple::DoToggleTool(wxToolBarToolBase *tool, SetDirty(true); } - // ---------------------------------------------------------------------------- // scrolling implementation // ---------------------------------------------------------------------------- @@ -2154,7 +2134,7 @@ wxToolBarToolBase *ocpnToolBarSimple::FindById(int id) const { bool ocpnToolBarSimple::OnLeftClick(int id, bool toggleDown) { wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, id); - //event.SetEventObject(this); + // event.SetEventObject(this); // we use SetInt() to make wxCommandEvent::IsChecked() return toggleDown event.SetInt((int)toggleDown); @@ -2191,7 +2171,6 @@ void ocpnToolBarSimple::OnRightClick(int id, long WXUNUSED(x), } } - void ocpnToolBarSimple::DoPluginToolUp() { // Look for PlugIn tools // If found, make the callback. @@ -2346,7 +2325,8 @@ END_EVENT_TABLE() ToolbarChoicesDialog::ToolbarChoicesDialog() {} -ToolbarChoicesDialog::ToolbarChoicesDialog(wxWindow *parent, ocpnFloatingToolbarDialog *sponsor, +ToolbarChoicesDialog::ToolbarChoicesDialog(wxWindow *parent, + ocpnFloatingToolbarDialog *sponsor, wxWindowID id, const wxString &caption, const wxPoint &pos, diff --git a/gui/src/track_gui.cpp b/gui/src/track_gui.cpp index 8115e7d73d..6cf35ceeec 100644 --- a/gui/src/track_gui.cpp +++ b/gui/src/track_gui.cpp @@ -11,7 +11,7 @@ #include "track_gui.h" #include "glChartCanvas.h" -extern Routeman* g_pRouteMan; +extern Routeman *g_pRouteMan; extern wxColour g_colourTrackLineColour; extern wxColor GetDimColor(wxColor c); @@ -19,7 +19,7 @@ extern bool g_bHighliteTracks; extern ocpnGLOptions g_GLOptions; -void TrackPointGui::Draw(ChartCanvas* cc, ocpnDC& dc) { +void TrackPointGui::Draw(ChartCanvas *cc, ocpnDC &dc) { wxPoint r; wxRect hilitebox; @@ -61,10 +61,10 @@ void TrackGui::Finalize() { new_level.resize(n); if (level == 0) for (int i = 0; i < n; i++) { - new_level[i].m_box.SetFromSegment( - m_track.TrackPoints[i]->m_lat, m_track.TrackPoints[i]->m_lon, - m_track.TrackPoints[i + 1]->m_lat, - m_track.TrackPoints[i + 1]->m_lon); + new_level[i].m_box.SetFromSegment(m_track.TrackPoints[i]->m_lat, + m_track.TrackPoints[i]->m_lon, + m_track.TrackPoints[i + 1]->m_lat, + m_track.TrackPoints[i + 1]->m_lon); new_level[i].m_scale = 0; } else { @@ -86,14 +86,13 @@ void TrackGui::Finalize() { level++; } // if(m_track.TrackPoints.size() > 100) - // printf("fin time %f %d\n", sw1.GetTime(), (int)m_track.TrackPoints.size()); + // printf("fin time %f %d\n", sw1.GetTime(), + // (int)m_track.TrackPoints.size()); } - void TrackGui::GetPointLists(ChartCanvas *cc, std::list > &pointlists, ViewPort &VP, const LLBBox &box) { - if (!m_track.IsVisible() || m_track.GetnPoints() == 0) return; Finalize(); // OCPNStopWatch sw; @@ -124,8 +123,8 @@ void TrackGui::GetPointLists(ChartCanvas *cc, } } -void TrackGui::Draw(ChartCanvas* cc, ocpnDC& dc, ViewPort& VP, - const LLBBox& box) { +void TrackGui::Draw(ChartCanvas *cc, ocpnDC &dc, ViewPort &VP, + const LLBBox &box) { std::list > pointlists; GetPointLists(cc, pointlists, VP, box); @@ -145,8 +144,9 @@ void TrackGui::Draw(ChartCanvas* cc, ocpnDC& dc, ViewPort& VP, if (m_track.m_width != WIDTH_UNDEFINED) width = m_track.m_width; if (m_track.m_Colour == wxEmptyString) { col = basic_colour; - // Render tracks associated with persistent AIS targets as a contrasting color - if(m_track.GetName().StartsWith("AIS")) + // Render tracks associated with persistent AIS targets as a contrasting + // color + if (m_track.GetName().StartsWith("AIS")) col = GetGlobalColor(_T ( "TEAL1" )); } else { for (unsigned int i = 0; i < sizeof(::GpxxColorNames) / sizeof(wxString); @@ -158,20 +158,18 @@ void TrackGui::Draw(ChartCanvas* cc, ocpnDC& dc, ViewPort& VP, } } - - double radius = 0.; if (g_bHighliteTracks) { double radius_meters = 20; // 1.5 mm at original scale double scale = VP.view_scale_ppm; radius = wxMax((radius_meters * wxMin(scale, 1.1)), 6.0); - if (scale < 0.004) radius = 0; + if (scale < 0.004) radius = 0; } { wxPen p = *wxThePenList->FindOrCreatePen(col, width, style); #ifdef ocpnUSE_GL - if(glChartCanvas::dash_map.find(style) != glChartCanvas::dash_map.end()) { + if (glChartCanvas::dash_map.find(style) != glChartCanvas::dash_map.end()) { p.SetDashes(2, &glChartCanvas::dash_map[style][0]); } #endif @@ -212,7 +210,8 @@ void TrackGui::Draw(ChartCanvas* cc, ocpnDC& dc, ViewPort& VP, } if (m_track.m_HighlightedTrackPoint >= 0) - TrackPointGui(m_track.TrackPoints[m_track.m_HighlightedTrackPoint]).Draw(cc, dc); + TrackPointGui(m_track.TrackPoints[m_track.m_HighlightedTrackPoint]) + .Draw(cc, dc); } // Entry to recursive Assemble at the head of the SubTracks tree @@ -254,10 +253,12 @@ void TrackGui::Assemble(ChartCanvas *cc, } void TrackGui::AddPointToList(ChartCanvas *cc, - std::list > &pointlists, int n) { + std::list > &pointlists, + int n) { wxPoint r(INVALID_COORD, INVALID_COORD); if ((size_t)n < m_track.TrackPoints.size()) - cc->GetCanvasPointPix(m_track.TrackPoints[n]->m_lat, m_track.TrackPoints[n]->m_lon, &r); + cc->GetCanvasPointPix(m_track.TrackPoints[n]->m_lat, + m_track.TrackPoints[n]->m_lon, &r); std::list &pointlist = pointlists.back(); if (r.x == INVALID_COORD) { diff --git a/gui/src/udev_rule_mgr.cpp b/gui/src/udev_rule_mgr.cpp index 0a5c0102d1..318addaa11 100644 --- a/gui/src/udev_rule_mgr.cpp +++ b/gui/src/udev_rule_mgr.cpp @@ -46,7 +46,6 @@ #include "gui_lib.h" #include "udev_rule_mgr.h" - #if !defined(__linux__) || defined(__ANDROID__) // non-linux platforms: Empty place holders. @@ -56,7 +55,6 @@ bool CheckSerialAccess(wxWindow* parent, const std::string device) { } void DestroyDeviceNotFoundDialogs() {} - #else static bool hide_dongle_dialog; diff --git a/gui/src/undo.cpp b/gui/src/undo.cpp index 1b7e51e869..c4648a8936 100644 --- a/gui/src/undo.cpp +++ b/gui/src/undo.cpp @@ -167,7 +167,7 @@ void doUndoAppendWaypoint(UndoAction* action, ChartCanvas* cc) { cc->undo->InvalidateRedo(); } - if(RouteManagerDialog::getInstanceFlag()){ + if (RouteManagerDialog::getInstanceFlag()) { if (pRouteManagerDialog && pRouteManagerDialog->IsShown()) pRouteManagerDialog->UpdateWptListCtrl(); } diff --git a/gui/src/update_mgr.cpp b/gui/src/update_mgr.cpp index 80fa2f02b2..906ed4f008 100644 --- a/gui/src/update_mgr.cpp +++ b/gui/src/update_mgr.cpp @@ -310,11 +310,10 @@ class PluginTextPanel : public wxPanel { LESS += "..."; // For small displays, skip the "More" text. - if (g_Platform->getDisplaySize().x < 80 * GetCharWidth()) - MORE = ""; + if (g_Platform->getDisplaySize().x < 80 * GetCharWidth()) MORE = ""; auto sum_hbox = new wxBoxSizer(wxHORIZONTAL); - m_widthDescription = g_options->GetSize().x *4 / 10; + m_widthDescription = g_options->GetSize().x * 4 / 10; // m_summary = staticText(plugin->summary); m_summary = new wxStaticText( @@ -337,10 +336,11 @@ class PluginTextPanel : public wxPanel { SetSizer(vbox); std::string name_reduced = plugin->name; - if(plugin->name.size() * GetCharWidth() > (size_t)m_widthDescription * 7 / 10){ - int nc = (m_widthDescription *7 / 10) / GetCharWidth(); - if (nc > 3){ - name_reduced = plugin->name.substr(0, nc-3) + "..."; + if (plugin->name.size() * GetCharWidth() > + (size_t)m_widthDescription * 7 / 10) { + int nc = (m_widthDescription * 7 / 10) / GetCharWidth(); + if (nc > 3) { + name_reduced = plugin->name.substr(0, nc - 3) + "..."; } } @@ -478,13 +478,13 @@ UpdateDialog::UpdateDialog(wxWindow* parent, Center(); #ifdef __ANDROID__ - androidDisableRotation(); + androidDisableRotation(); #endif } UpdateDialog::~UpdateDialog() { #ifdef __ANDROID__ - androidEnableRotation(); + androidEnableRotation(); #endif } @@ -515,7 +515,6 @@ void UpdateDialog::RecalculateSize() { SetMinSize(g_Platform->getDisplaySize()); #endif - Fit(); SetMaxSize(g_Platform->getDisplaySize()); Layout(); diff --git a/gui/src/viewport.cpp b/gui/src/viewport.cpp index dcdfe2736b..683c68273b 100644 --- a/gui/src/viewport.cpp +++ b/gui/src/viewport.cpp @@ -133,7 +133,7 @@ ViewPort::ViewPort() { m_projection_type = PROJECTION_MERCATOR; } -void ViewPort::PixelScale(float scale){ +void ViewPort::PixelScale(float scale) { pix_width *= scale; pix_height *= scale; view_scale_ppm *= scale; @@ -142,8 +142,8 @@ void ViewPort::PixelScale(float scale){ // TODO: eliminate the use of this function wxPoint ViewPort::GetPixFromLL(double lat, double lon) { wxPoint2DDouble p = GetDoublePixFromLL(lat, lon); - if (wxFinite(p.m_x) && wxFinite(p.m_y)){ - if( (abs(p.m_x) < 1e6) && (abs(p.m_y) < 1e6) ) + if (wxFinite(p.m_x) && wxFinite(p.m_y)) { + if ((abs(p.m_x) < 1e6) && (abs(p.m_y) < 1e6)) return wxPoint(wxRound(p.m_x), wxRound(p.m_y)); } return wxPoint(INVALID_COORD, INVALID_COORD); @@ -355,7 +355,7 @@ LLRegion ViewPort::GetLLRegion(const OCPNRegion ®ion) { int x1 = rect.x, y1 = rect.y, x2 = x1 + rect.width, y2 = y1 + rect.height; int p[8] = {x1, y1, x2, y1, x2, y2, x1, y2}; - double pll[2896]; // Max splits is 180, ((180 * 2) + 2) * 8 = 2896. + double pll[2896]; // Max splits is 180, ((180 * 2) + 2) * 8 = 2896. int j; /* if the viewport is rotated, we must split the segments as straight lines @@ -963,11 +963,10 @@ void ViewPort::SetBBoxDirect(double latmin, double lonmin, double latmax, double lonmax) { vpBBox.Set(latmin, lonmin, latmax, lonmax); } -bool ViewPort::ContainsIDL(){ +bool ViewPort::ContainsIDL() { if ((vpBBox.GetMinLon() <= -180.) && (vpBBox.GetMaxLon() > -180.)) return true; - if ((vpBBox.GetMinLon() <= 180.) && (vpBBox.GetMaxLon() > 180.)) - return true; + if ((vpBBox.GetMinLon() <= 180.) && (vpBBox.GetMaxLon() > 180.)) return true; return false; } @@ -982,12 +981,10 @@ ViewPort ViewPort::BuildExpandedVP(int width, int height) { } void ViewPort::SetVPTransformMatrix() { - mat4x4 m; - mat4x4_identity(m); - mat4x4_scale_aniso((float(*)[4])vp_matrix_transform, m, - 2.0 / (float)pix_width, -2.0 / (float)pix_height, - 1.0); - mat4x4_translate_in_place((float(*)[4])vp_matrix_transform, -pix_width / 2, - -pix_height / 2, 0); - + mat4x4 m; + mat4x4_identity(m); + mat4x4_scale_aniso((float(*)[4])vp_matrix_transform, m, + 2.0 / (float)pix_width, -2.0 / (float)pix_height, 1.0); + mat4x4_translate_in_place((float(*)[4])vp_matrix_transform, -pix_width / 2, + -pix_height / 2, 0); } diff --git a/gui/src/waypointman_gui.cpp b/gui/src/waypointman_gui.cpp index b55358a5e1..3ec8c7a5b1 100644 --- a/gui/src/waypointman_gui.cpp +++ b/gui/src/waypointman_gui.cpp @@ -38,8 +38,8 @@ #elif defined(__WXOSX__) #include #include -typedef void (* _GLUfuncptr)(); -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 +typedef void (*_GLUfuncptr)(); +#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 #elif defined(__WXQT__) || defined(__WXGTK__) #include @@ -65,7 +65,7 @@ typedef void (* _GLUfuncptr)(); #include "waypointman_gui.h" #include "ocpn_plugin.h" -extern BasePlatform* g_BasePlatform; +extern BasePlatform *g_BasePlatform; extern float g_MarkScaleFactorExp; extern ocpnStyle::StyleManager *g_StyleManager; extern bool g_bUserIconsFirst; @@ -74,7 +74,6 @@ static int CompareMarkIcons(MarkIcon *mi1, MarkIcon *mi2) { return (mi1->icon_name.CmpNoCase(mi2->icon_name)); } - void WayPointmanGui::ProcessUserIcons(ocpnStyle::Style *style, double displayDPmm) { wxString msg; @@ -93,13 +92,14 @@ void WayPointmanGui::ProcessUserIcons(ocpnStyle::Style *style, wxLogMessage(_T("Loading UserIcons from ") + UserIconPath); wxArrayString FileList; - wxBitmap default_bm = wxBitmap(1,1); //empty + wxBitmap default_bm = wxBitmap(1, 1); // empty int n_files = wxDir::GetAllFiles(UserIconPath, &FileList, _T(""), wxDIR_FILES); for (int ifile = 0; ifile < n_files; ifile++) { - wxString name = g_bUserIconsFirst ? FileList[n_files - ifile - 1] : FileList[ifile]; + wxString name = + g_bUserIconsFirst ? FileList[n_files - ifile - 1] : FileList[ifile]; wxFileName fn(name); wxString iconname = fn.GetName(); @@ -124,7 +124,7 @@ void WayPointmanGui::ProcessUserIcons(ocpnStyle::Style *style, // This is to be a mark icon // Make it a nominal max size - double bm_size_nom = wxMin(wxMax(w,h), floor(displayDPmm * 20)); + double bm_size_nom = wxMin(wxMax(w, h), floor(displayDPmm * 20)); // We want certain minimal size for the icons, 15px (approx 3mm) be it bm_size_nom = wxMax(bm_size_nom, 15); @@ -137,9 +137,8 @@ void WayPointmanGui::ProcessUserIcons(ocpnStyle::Style *style, // Make the rendered icon square, if necessary if (fabs(aspect - 1.0) > .05) { wxImage image = - LoadSVG(name, (int)bm_size_nom, - (int)bm_size_nom, - &default_bm).ConvertToImage(); + LoadSVG(name, (int)bm_size_nom, (int)bm_size_nom, &default_bm) + .ConvertToImage(); if (image.IsOk()) { wxRect rClip = CropImageOnAlpha(image); @@ -148,11 +147,10 @@ void WayPointmanGui::ProcessUserIcons(ocpnStyle::Style *style, wxIMAGE_QUALITY_BICUBIC); pmi = ProcessIcon(imageClip, iconname, iconname, g_bUserIconsFirst); } - } - else { + } else { const unsigned int bm_size = bm_size_nom; // horizontal - wxImage iconSVG = LoadSVG(name, bm_size, bm_size, - &default_bm, false).ConvertToImage(); + wxImage iconSVG = LoadSVG(name, bm_size, bm_size, &default_bm, false) + .ConvertToImage(); wxRect rClip = CropImageOnAlpha(iconSVG); wxImage imageClip = iconSVG.GetSubImage(rClip); pmi = ProcessIcon(iconSVG, iconname, iconname, g_bUserIconsFirst); @@ -164,8 +162,9 @@ void WayPointmanGui::ProcessUserIcons(ocpnStyle::Style *style, } } -MarkIcon* WayPointmanGui::ProcessIcon(wxImage image, const wxString& key, - const wxString& description, bool add_in_front) { +MarkIcon *WayPointmanGui::ProcessIcon(wxImage image, const wxString &key, + const wxString &description, + bool add_in_front) { MarkIcon *pmi = 0; bool newIcon = true; @@ -190,7 +189,6 @@ MarkIcon* WayPointmanGui::ProcessIcon(wxImage image, const wxString& key, } } - wxBitmap *pbm = new wxBitmap(image); pmi->icon_name = key; pmi->icon_description = description; @@ -256,8 +254,8 @@ void WayPointmanGui::ProcessDefaultIcons(double displayDPmm) { if (m_waypoint_man.m_pLegacyIconArray) m_waypoint_man.m_pLegacyIconArray->Clear(); else - m_waypoint_man.m_pLegacyIconArray = - new SortedArrayOfMarkIcon(CompareMarkIcons); + m_waypoint_man.m_pLegacyIconArray = + new SortedArrayOfMarkIcon(CompareMarkIcons); pmi = ProcessLegacyIcon(iconDir + _T("Symbol-Empty.svg"), _T("empty"), _T("Empty"), displayDPmm); @@ -343,8 +341,9 @@ void WayPointmanGui::ProcessDefaultIcons(double displayDPmm) { pmi = ProcessLegacyIcon(iconDir + _T("Hazard-Oil-Platform.svg"), _T("platform"), _T("Platform"), displayDPmm); if (pmi) pmi->preScaled = true; - pmi = ProcessLegacyIcon(iconDir + _T("Marks-Light-Red-Green.svg"), - _T("redgreenlite"), _T("Red/Green Light"), displayDPmm); + pmi = + ProcessLegacyIcon(iconDir + _T("Marks-Light-Red-Green.svg"), + _T("redgreenlite"), _T("Red/Green Light"), displayDPmm); if (pmi) pmi->preScaled = true; pmi = ProcessLegacyIcon(iconDir + _T("Marks-Light-Red.svg"), _T("redlite"), _T("Red Light"), displayDPmm); @@ -489,12 +488,12 @@ void WayPointmanGui::ProcessDefaultIcons(double displayDPmm) { size = m_waypoint_man.m_pExtendedIconArray->GetCount(); for (unsigned int i = 0; i < size; i++) { - pmi = (MarkIcon *) m_waypoint_man.m_pExtendedIconArray->Item(i); + pmi = (MarkIcon *)m_waypoint_man.m_pExtendedIconArray->Item(i); // Do not add any icons from the extended array if they have already been // used as legacy substitutes bool noAdd = false; - auto legacy_count = m_waypoint_man.m_pLegacyIconArray->GetCount(); + auto legacy_count = m_waypoint_man.m_pLegacyIconArray->GetCount(); for (unsigned int j = 0; j < legacy_count; j++) { MarkIcon *pmiLegacy = (MarkIcon *)m_waypoint_man.m_pLegacyIconArray->Item(j); @@ -514,10 +513,10 @@ void WayPointmanGui::ReloadAllIcons(double displayDPmm) { MarkIcon *pmi = (MarkIcon *)m_waypoint_man.m_pIconArray->Item(i); wxImage dim_image; if (m_waypoint_man.m_cs == GLOBAL_COLOR_SCHEME_DUSK) { - dim_image = m_waypoint_man.CreateDimImage(pmi->iconImage, .50); + dim_image = m_waypoint_man.CreateDimImage(pmi->iconImage, .50); pmi->iconImage = dim_image; } else if (m_waypoint_man.m_cs == GLOBAL_COLOR_SCHEME_NIGHT) { - dim_image = m_waypoint_man.CreateDimImage(pmi->iconImage, .20); + dim_image = m_waypoint_man.CreateDimImage(pmi->iconImage, .20); pmi->iconImage = dim_image; } } @@ -529,7 +528,8 @@ void WayPointmanGui::SetColorScheme(ColorScheme cs, double displayDPmm) { ReloadAllIcons(displayDPmm); } -MarkIcon *WayPointmanGui::ProcessLegacyIcon(wxString fileName, const wxString &key, +MarkIcon *WayPointmanGui::ProcessLegacyIcon(wxString fileName, + const wxString &key, const wxString &description, double displayDPmm) { double bm_size = -1.0; @@ -548,8 +548,7 @@ MarkIcon *WayPointmanGui::ProcessLegacyIcon(wxString fileName, const wxString &k // Android uses "density buckets", so simple math produces poor results. // Thus, these factors have been empirically tweaked to provide good results // on a variety of devices - float nominal_legacy_icon_size_pixels = wxMax(4.0, - floor(displayDPmm * 12.0)); + float nominal_legacy_icon_size_pixels = wxMax(4.0, floor(displayDPmm * 12.0)); // legacy icon size float pix_factor = nominal_legacy_icon_size_pixels / 68.0; @@ -564,13 +563,12 @@ MarkIcon *WayPointmanGui::ProcessLegacyIcon(wxString fileName, const wxString &k SVGDocumentPixelSize(fileName, w, h); w = wxMax(wxMax(w, h), 15); // We want certain minimal size for the icons, // 15px (approx 3mm) be it - bm_size = w * g_MarkScaleFactorExp; //SVGPixelsToDisplay(w); + bm_size = w * g_MarkScaleFactorExp; // SVGPixelsToDisplay(w); bm_size /= OCPN_GetWinDIPScaleFactor(); #endif wxBitmap bm = LoadSVG(fileName, (int)bm_size, (int)bm_size); - if (!bm.IsOk()) - return NULL; + if (!bm.IsOk()) return NULL; wxImage image = LoadSVG(fileName, (int)bm_size, (int)bm_size).ConvertToImage(); @@ -583,7 +581,8 @@ MarkIcon *WayPointmanGui::ProcessLegacyIcon(wxString fileName, const wxString &k bool newIcon = true; // avoid adding duplicates - for (unsigned int i = 0; i < m_waypoint_man.m_pLegacyIconArray->GetCount(); i++) { + for (unsigned int i = 0; i < m_waypoint_man.m_pLegacyIconArray->GetCount(); + i++) { pmi = (MarkIcon *)m_waypoint_man.m_pLegacyIconArray->Item(i); if (pmi->icon_name.IsSameAs(key)) { newIcon = false; @@ -712,7 +711,7 @@ void WayPointmanGui::ReloadRoutepointIcons() { } unsigned int WayPointmanGui::GetIconTexture(const wxBitmap *pbm, int &glw, - int &glh) { + int &glh) { #ifdef ocpnUSE_GL int index = m_waypoint_man.GetIconIndex(pbm); MarkIcon *pmi = (MarkIcon *)m_waypoint_man.m_pIconArray->Item(index); diff --git a/include/ocpn_plugin.h b/include/ocpn_plugin.h index 273e7ca4e8..a14952ab49 100644 --- a/include/ocpn_plugin.h +++ b/include/ocpn_plugin.h @@ -601,11 +601,13 @@ class DECL_EXP opencpn_plugin_118 : public opencpn_plugin_117 { /// should draw only when priority is OVERLAY_LEGACY (0) /// \return true if overlay was rendered, false otherwise #ifdef _MSC_VER - virtual bool RenderGLOverlayMultiCanvas(wxGLContext *pcontext, PlugIn_ViewPort *vp, - int canvasIndex, int priority = -1); + virtual bool RenderGLOverlayMultiCanvas(wxGLContext *pcontext, + PlugIn_ViewPort *vp, int canvasIndex, + int priority = -1); #else - virtual bool RenderGLOverlayMultiCanvas(wxGLContext *pcontext, PlugIn_ViewPort *vp, - int canvasIndex, int priority); + virtual bool RenderGLOverlayMultiCanvas(wxGLContext *pcontext, + PlugIn_ViewPort *vp, int canvasIndex, + int priority); bool RenderGLOverlayMultiCanvas(wxGLContext *pcontext, PlugIn_ViewPort *vp, int canvas_ix) override { @@ -613,8 +615,6 @@ class DECL_EXP opencpn_plugin_118 : public opencpn_plugin_117 { } #endif - - /// Render plugin overlay over chart canvas in non-OpenGL mode /// /// \param dc Reference to the "device context" @@ -627,14 +627,13 @@ class DECL_EXP opencpn_plugin_118 : public opencpn_plugin_117 { virtual bool RenderOverlayMultiCanvas(wxDC &dc, PlugIn_ViewPort *vp, int canvasIndex, int priority = -1); #else - virtual bool RenderOverlayMultiCanvas(wxDC &dc, PlugIn_ViewPort *vp, int canvas_ix, - int priority); + virtual bool RenderOverlayMultiCanvas(wxDC &dc, PlugIn_ViewPort *vp, + int canvas_ix, int priority); bool RenderOverlayMultiCanvas(wxDC &dc, PlugIn_ViewPort *vp, int canvas_ix) override { return RenderOverlayMultiCanvas(dc, vp, canvas_ix, -1); } #endif - }; //------------------------------------------------------------------ // Route and Waypoint PlugIn support @@ -1581,7 +1580,6 @@ class DECL_EXP PlugIn_Route_Ex { bool m_isVisible; wxString m_Description; - Plugin_WaypointExList *pWaypointList; }; @@ -1674,7 +1672,7 @@ class ObservableListener; /** Facade for NavAddr2000. */ struct NMEA2000Id { const uint64_t id; - NMEA2000Id(int value) : id(static_cast(value)){}; + NMEA2000Id(int value) : id(static_cast(value)) {}; }; extern DECL_EXP std::shared_ptr GetListener( @@ -1683,7 +1681,7 @@ extern DECL_EXP std::shared_ptr GetListener( /** Facade for NavAddr0183. */ struct NMEA0183Id { const std::string id; - NMEA0183Id(const std::string &s) : id(s){}; + NMEA0183Id(const std::string &s) : id(s) {}; }; extern DECL_EXP std::shared_ptr GetListener( @@ -1692,7 +1690,7 @@ extern DECL_EXP std::shared_ptr GetListener( /** Facade for NavAddrSignalK. */ struct SignalkId { const std::string id; - SignalkId(const std::string &s) : id(s){}; + SignalkId(const std::string &s) : id(s) {}; }; extern DECL_EXP std::shared_ptr GetListener( @@ -1820,7 +1818,7 @@ extern DECL_EXP std::vector GetActiveDrivers(); /** Query driver attributes */ extern DECL_EXP const std::unordered_map - GetAttributes(DriverHandle handle); +GetAttributes(DriverHandle handle); /* Writing to a specific driver */ @@ -1830,13 +1828,12 @@ extern DECL_EXP const std::unordered_map * Return value is number of bytes queued for transmission. */ extern DECL_EXP CommDriverResult WriteCommDriver( - DriverHandle handle, - const std::shared_ptr > &payload); + DriverHandle handle, const std::shared_ptr> &payload); /** Send a PGN message to an NMEA2000 address. */ extern DECL_EXP CommDriverResult WriteCommDriverN2K( DriverHandle handle, int PGN, int destinationCANAddress, int priority, - const std::shared_ptr > &payload); + const std::shared_ptr> &payload); /** * Special NMEA2000 requirements @@ -1850,14 +1847,13 @@ extern DECL_EXP CommDriverResult WriteCommDriverN2K( extern DECL_EXP CommDriverResult RegisterTXPGNs(DriverHandle handle, std::vector &pgn_list); - // API 1.19 // /** Facade for NavAddrPluginMsg. */ struct PluginMsgId { const std::string id; - PluginMsgId(const std::string &s) : id(s){}; + PluginMsgId(const std::string &s) : id(s) {}; }; extern DECL_EXP std::shared_ptr GetListener( diff --git a/libs/AndroidLibs.cmake b/libs/AndroidLibs.cmake index e38290c66c..5554202319 100644 --- a/libs/AndroidLibs.cmake +++ b/libs/AndroidLibs.cmake @@ -81,7 +81,7 @@ target_link_libraries(${PACKAGE_NAME} PRIVATE ${_qtlibs}/libQt5AndroidExtras.so ) -target_link_libraries(${PACKAGE_NAME} PRIVATE +set(_all_wx_libs # Link order is critical to avoid circular dependencies ${_wxlibs}/libwx_qtu_html-3.1-arm-linux-androideabi.a ${_wxlibs}/libwx_baseu_xml-3.1-arm-linux-androideabi.a @@ -97,6 +97,11 @@ target_link_libraries(${PACKAGE_NAME} PRIVATE ${_wxlibs}/libwx_qtu_gl-3.1-arm-linux-androideabi.a ${_wxlibs}/libwx_baseu_net-3.1-arm-linux-androideabi.a ) +target_link_libraries(${PACKAGE_NAME} PRIVATE ${_all_wx_libs}) + +if ("${OCPN_TARGET_TUPLE}" MATCHES "Android-armhf") + target_link_libraries(${PACKAGE_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/buildandroid/ndk/linux-atomic.o") +endif () add_compile_definitions( __WXQT__ @@ -108,9 +113,12 @@ add_compile_definitions( USE_GLU_TESS ) - SET(OPENGLES_FOUND "YES") - SET(OPENGL_FOUND "YES") - SET(USE_GLES2 ON ) +set(OPENGLES_FOUND "YES") +set(OPENGL_FOUND "YES") +set(USE_GLES2 ON ) + +set(ANDROID_WX_INCLUDES ${_wx_setup}) +set(ANDROID_WX_LIBS ${_all_wx_libs}) #if (NOT CMAKE_BUILD_TYPE STREQUAL Debug) # string(APPEND CMAKE_SHARED_LINKER_FLAGS " -s") diff --git a/libs/libdnet/CMakeLists.txt b/libs/libdnet/CMakeLists.txt index 794bea0a82..81548261fb 100644 --- a/libs/libdnet/CMakeLists.txt +++ b/libs/libdnet/CMakeLists.txt @@ -1,330 +1,84 @@ -cmake_minimum_required(VERSION 3.14) - -project(dnet VERSION 1.18.0 LANGUAGES C) - -find_package(TCL) - -include(CheckFunctionExists) -include(CheckIncludeFile) -include(CheckIncludeFiles) -include(CheckStructHasMember) -include(CheckSymbolExists) -include(CheckTypeSize) -include(CheckCSourceCompiles) -include(GNUInstallDirs) - -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS True) -option(BUILD_SHARED_LIBS "Build in shared lib mode" OFF) - -foreach (header stdio.h stdlib.h string.h inttypes.h) - string(TOUPPER HAVE_${header} var) - string(REGEX REPLACE "\\.|/" "_" var ${var}) - check_include_file(${header} ${var}) -endforeach () - -if (MSVC) - add_definitions(-DWIN32_LEAN_AND_MEAN) - check_include_file(winsock2.h HAVE_WINSOCK2_H) - set(HAVE_LIBWS2_32 ${HAVE_WINSOCK2_H}) - check_c_source_compiles(" - #define WIN32_LEAN_AND_MEAN - #include - #include - int main() { return 0; }" - HAVE_IPHLPAPI_H) - set(HAVE_LIBIPHLPAPI ${HAVE_IPHLPAPI_H}) - set(CMAKE_REQUIRED_LIBRARIES "ws2_32") - check_symbol_exists(inet_pton WS2tcpip.h HAVE_INET_PTON) - set(CMAKE_REQUIRED_LIBRARIES ) -endif() -if(UNIX) - foreach (header strings.h - unistd.h sys/bufmod.h sys/dlpi.h sys/dlpihdr.h sys/dlpi_ext.h - sys/ioctl.h sys/mib.h sys/ndd_var.h sys/socket.h sys/sockio.h - sys/time.h sys/stat.h net/if.h net/if_var.h - net/if_dl.h net/pfilt.h - net/radix.h net/raw.h net/route.h netinet/in_var.h - linux/if_tun.h netinet/ip_fw.h linux/ip_fw.h - linux/ip_fwchains.h linux/netfilter_ipv4/ipchains_core.h - ip_fil_compat.h netinet/ip_fil_compat.h ip_compat.h - netinet/ip_compat.h ip_fil.h netinet/ip_fil.h - hpsecurity.h stropts.h dlfcn.h fcntl.h) - string(TOUPPER HAVE_${header} var) - string(REGEX REPLACE "\\.|/" "_" var ${var}) - check_include_file(${header} ${var}) - endforeach () - - check_include_files("sys/types.h;net/bpf.h" HAVE_NET_BPF_H) - check_include_files("sys/types.h;net/if_arp.h" HAVE_NET_IF_ARP_H) - check_include_files("sys/types.h;net/if_tun.h" HAVE_NET_IF_TUN_H) - check_include_files("sys/types.h;net/if.h;net/pfvar.h" HAVE_NET_PFVAR_H) - check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYS_SYSCTL_H) -endif() - -set(CMAKE_REQUIRED_LIBRARIES ) -foreach (func err strlcat strlcpy strse) - string(TOUPPER HAVE_${func} var) - check_function_exists(${func} ${var}) -endforeach () - -if (UNIX) - set(CMAKE_REQUIRED_LIBRARIES "nm") - check_function_exists(open_mib HAVE_OPEN_MIB) - set(CMAKE_REQUIRED_LIBRARIES ) - - CHECK_STRUCT_HAS_MEMBER("struct arpreq" arp_dev net/if_arp.h HAVE_ARPREQ_ARP_DEV LANGUAGE C) - CHECK_STRUCT_HAS_MEMBER("struct sockaddr" sa_len sys/socket.h HAVE_SOCKADDR_SA_LEN LANGUAGE C) - CHECK_STRUCT_HAS_MEMBER("struct rt_msghdr" rtm_msglen "sys/socket.h;net/if.h;net/route.h" HAVE_ROUTE_RT_MSGHDR LANGUAGE C) - - set(CMAKE_EXTRA_INCLUDE_FILES "netinet/in.h") - check_type_size("struct sockaddr_in6" HAVE_SOCKADDR_IN6 LANGUAGE C) - set(CMAKE_EXTRA_INCLUDE_FILES ) - - if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - file(STRINGS /proc/sys/kernel/ostype PROCFS) - message(STATUS "${PROCFS}") - if (${PROCFS} STREQUAL "Linux") - set(HAVE_LINUX_PROCFS True) - endif() - endif() - - check_include_file(inet/mib2.h HAVE_STREAMS_MIB2) - - check_symbol_exists(ETH_P_ALL linux/if_ether.h HAVE_LINUX_PF_PACKET) - - check_symbol_exists(RTSTR_SEND net/route.h HAVE_STREAMS_ROUTE) - - check_symbol_exists(SIOCGARP sys/ioctl.h HAVE_IOCTL_ARP) - - string(TOLOWER ${CMAKE_SYSTEM_NAME} CMAKE_SYSTEM_NAME_LOWER) - - string(REGEX MATCH "bsd" BSD ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "darwin" DARWIN ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "osf" OSF ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "unixware" UNIXWARE ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "openbsd" OPENBSD ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "solaris" SOLARIS ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "irix" IRIX ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "freebsd5" FREEBSD5 ${CMAKE_SYSTEM_NAME_LOWER}) - string(REGEX MATCH "kfreebsd" KFREEBSD ${CMAKE_SYSTEM_NAME_LOWER}) - - if (BSD OR DARWIN OR OSF OR UNIXWARE) - set(HAVE_RAWIP_HOST_OFFLEN True) - endif() - - if (OPENBSD) - set(HAVE_RAWIP_HOST_OFFLEN False) - endif() - - if (SOLARIS OR IRIX) - set(HAVE_RAWIP_COOKED True) - endif() - - set(CMAKE_REQUIRED_LIBRARIES ) - foreach (func err strlcat strlcpy strse) - string(TOUPPER HAVE_${func} var) - check_function_exists(${func} ${var}) - endforeach () - - - - set(CMAKE_REQUIRED_LIBRARIES nsl socket) - check_function_exists(gethostbyname HAVE_GETHOSTBYNAME) - if (NOT HAVE_GETHOSTBYNAME) - unset(HAVE_GETHOSTBYNAME CACHE) - set(CMAKE_REQUIRED_LIBRARIES nsl) - check_function_exists(gethostbyname HAVE_GETHOSTBYNAME) - if (NOT HAVE_GETHOSTBYNAME) - unset(HAVE_GETHOSTBYNAME CACHE) - set(CMAKE_REQUIRED_LIBRARIES) - check_function_exists(gethostbyname HAVE_GETHOSTBYNAME) - endif() - endif() - set(CMAKE_REQUIRED_LIBRARIES ) - check_function_exists(gethostbyaddr HAVE_GETHOSTBYADDR) - check_function_exists(gethostname HAVE_GETHOSTNAME) -endif (UNIX) - -check_function_exists(inet_ntoa HAVE_INET_NTOA) -check_function_exists(memset HAVE_MEMSET) -check_function_exists(select HAVE_SELECT) -check_function_exists(socket HAVE_SOCKET) -check_function_exists(strerror HAVE_STRERROR) -check_function_exists(strsep HAVE_STRSEP) - -set(CMAKE_REQUIRED_LIBRARIES str) -check_function_exists(putmsg HAVE_PUTMSG) -set(CMAKE_REQUIRED_LIBRARIES ) - -set(PACKAGE ${PROJECT_NAME}) -set(PACKAGE_BUGREPORT) -set(PACKAGE_NAME ${PROJECT_NAME}) -set(PACKAGE_STRING "${PROJECT_NAME} ${CMAKE_PROJECT_VERSION}") -set(PACKAGE_TARNAME ${PROJECT_NAME}) -set(PACKAGE_URL) -set(PACKAGE_VERSION ${CMAKE_PROJECT_VERSION}) -set(VERSION ${CMAKE_PROJECT_VERSION}) - -configure_file(config.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) - -set(PLATFORM_SOURCES) - -if (NOT HAVE_STRLCAT) - list(APPEND PLATFORM_SOURCES src/strlcat.c) -endif() -if (NOT HAVE_STRLCPY) - list(APPEND PLATFORM_SOURCES src/strlcpy.c) -endif() -if (NOT HAVE_STRSEP) - list(APPEND PLATFORM_SOURCES src/strsep.c) -endif() - - -if (HAVE_ROUTE_RT_MSGHDR) - list(APPEND PLATFORM_SOURCES src/arp-bsd.c) -elseif (HAVE_IOCTL_ARP) - list(APPEND PLATFORM_SOURCES src/arp-ioctl.c) -elseif (HAVE_IPHLPAPI_H) - list(APPEND PLATFORM_SOURCES src/arp-win32.c) -else() - list(APPEND PLATFORM_SOURCES src/arp-none.c) -endif() - -if (HAVE_IPHLPAPI_H) -# no npcap support -# list(APPEND PLATFORM_SOURCES src/eth-win32.c) -elseif(HAVE_NET_PFILT_H) - list(APPEND PLATFORM_SOURCES src/eth-pfilt.c) -elseif(HAVE_LINUX_PF_PACKET) - list(APPEND PLATFORM_SOURCES src/eth-linux.c) -elseif(HAVE_NET_BPF_H) - list(APPEND PLATFORM_SOURCES src/eth-bsd.c) -elseif(HAVE_NET_RAW_H) - list(APPEND PLATFORM_SOURCES src/eth-snoop.c) -elseif(HAVE_SYS_NDD_VAR_H) - list(APPEND PLATFORM_SOURCES src/eth-ndd.c) -elseif(HAVE_SYS_DLPI_H OR HAVE_SYS_DLPIHDR_H) - list(APPEND PLATFORM_SOURCES src/eth-dlpi.c) -else() - list(APPEND PLATFORM_SOURCES src/eth-none.c) -endif() - -if (HAVE_IPHLPAPI_H) - list(APPEND PLATFORM_SOURCES src/fw-pktfilter.c) -elseif(HAVE_NET_PFVAR_H) - list(APPEND PLATFORM_SOURCES src/fw-pf.c) -elseif(HAVE_NETINET_IP_FW_H) - if (FREEBSD5 OR KFREEBSD) - list(APPEND PLATFORM_SOURCES src/fw-none.c) - else() - list(APPEND PLATFORM_SOURCES src/fw-ipfw.c) - endif() -elseif(HAVE_IP_FIL_H) - list(APPEND PLATFORM_SOURCES src/fw-ipf.c) -elseif(HAVE_LINUX_IP_FW_H OR HAVE_LINUX_IP_FWCHAINS_H OR HAVE_LINUX_NETFILTER_IPV4_IPCHAINS_CORE_H) - list(APPEND PLATFORM_SOURCES src/fw-ipchains.c) -else() - list(APPEND PLATFORM_SOURCES src/fw-none.c) -endif() - -if (HAVE_IPHLPAPI_H) - list(APPEND PLATFORM_SOURCES src/intf-win32.c) -else() - list(APPEND PLATFORM_SOURCES src/intf.c) -endif() - -if (HAVE_IPHLPAPI_H) - list(APPEND PLATFORM_SOURCES src/ip-win32.c) -elseif(HAVE_RAWIP_COOKED) - list(APPEND PLATFORM_SOURCES src/ip-cooked.c) -else() - list(APPEND PLATFORM_SOURCES src/ip.c) -endif() - -if (HAVE_IPHLPAPI_H) - list(APPEND PLATFORM_SOURCES src/route-win32.c) -elseif(HAVE_ROUTE_RT_MSGHDR) - list(APPEND PLATFORM_SOURCES src/route-bsd.c) -elseif(HAVE_LINUX_PROCFS) - list(APPEND PLATFORM_SOURCES src/route-linux.c) -elseif(HAVE_HPSECURITY_H) - list(APPEND PLATFORM_SOURCES src/route-hpux.c) -else() - list(APPEND PLATFORM_SOURCES src/route-none.c) -endif() - -if(HAVE_LINUX_PROCFS) - list(APPEND PLATFORM_SOURCES src/ndisc-linux.c) -else() - list(APPEND PLATFORM_SOURCES src/ndisc-none.c) -endif() - -find_file(HAVE_DEV_TUN - NAMES /dev/tun0 - DOC "Check for tun0") - -if(HAVE_LINUX_IF_TUN_H) - list(APPEND PLATFORM_SOURCES src/tun-linux.c) -elseif(HAVE_NET_IF_TUN_H) - if(HAVE_STROPTS_H) - list(APPEND PLATFORM_SOURCES src/tun-solaris.c) - else() - list(APPEND PLATFORM_SOURCES src/tun-bsd.c) - endif() -elseif(HAVE_DEV_TUN) - list(APPEND PLATFORM_SOURCES src/tun-bsd.c) -else() - list(APPEND PLATFORM_SOURCES src/tun-none.c) -endif() - -add_library(${PROJECT_NAME} - src/addr-util.c - src/addr.c - src/blob.c - src/err.c - src/ip-util.c - src/ip6.c - src/rand.c - ${PLATFORM_SOURCES}) - -target_include_directories(${PROJECT_NAME} PUBLIC - $ - $ - $ - $ +# ~~~ +# Include the libdnet library from https://github.com/ofalk/libdnet +# +# Exports: ocpn::dnet transitive link target +# +# License: GPLv3+ +# Copyright (c) 2023 Alec Leamas +# ~~~ + +# 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 3 of the License, or +# (at your option) any later version. + +cmake_minimum_required(VERSION 3.5.0) + +if (TARGET ocpn::dnet) + return () +endif () + +cmake_policy(SET CMP0026 NEW) +if (POLICY CMP0135) + cmake_policy(SET CMP0135 NEW) +endif () + +include(ExternalProject) +set(LIBDNET_SRC ${CMAKE_BINARY_DIR}/libdnet-src) +if (APPLE) + if (DEFINED CMAKE_OSX_ARCHITECTURES + AND NOT CMAKE_OSX_ARCHITECTURES STREQUAL "" + ) + string(REPLACE ";" "$" DNET_ARCHS "${CMAKE_OSX_ARCHITECTURES}") + set(CMAKE_ADDITIONAL_PARAMS "-DCMAKE_OSX_ARCHITECTURES='${DNET_ARCHS}'") + endif () +endif () + +set( + LIBDNET_PATCH + ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in-Fix-wrong-return-type.patch ) - -set(DNET_HEADERS - include/dnet/addr.h - include/dnet/arp.h - include/dnet/blob.h - include/dnet/eth.h - include/dnet/fw.h - include/dnet/icmp.h - include/dnet/intf.h - include/dnet/ip.h - include/dnet/ip6.h - include/dnet/ndisc.h - include/dnet/os.h - include/dnet/rand.h - include/dnet/route.h - include/dnet/sctp.h - include/dnet/tcp.h - include/dnet/tun.h - include/dnet/udp.h +ExternalProject_Add( + _libdnet EXCLUDE_FROM_ALL + DOWNLOAD_COMMAND + ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_CURRENT_SOURCE_DIR}/libdnet-libdnet-1.18.0 ${LIBDNET_SRC} + UPDATE_COMMAND "" + PATCH_COMMAND + ${CMAKE_COMMAND} -Dpatch:FILEPATH=${LIBDNET_PATCH} + -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PatchFile.cmake + CMAKE_ARGS + -G${CMAKE_GENERATOR} + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libdnet-src/installed + -DCMAKE_INSTALL_LIBDIR=lib + -DCMAKE_INSTALL_INCLUDEDIR=include + -DCMAKE_INSTALL_DATADIR=share + ${CMAKE_ADDITIONAL_PARAMS} + SOURCE_DIR "${LIBDNET_SRC}" + TEST_COMMAND "" + INSTALL_COMMAND + cmake --build . --target install --config $ ) -set(DNET_HEADERS1 - include/dnet.h - include/err.h - include/queue.h - ${CMAKE_CURRENT_BINARY_DIR}/config.h -) -set_target_properties( - ${PROJECT_NAME} - PROPERTIES - PUBLIC_HEADER "${DNET_HEADERS}" +message(STATUS "Using patched libdnet at ${CMAKE_BINARY_DIR}/libdnet") + +if (WIN32) + set(_DNET_LIB ${LIBDNET_SRC}/installed/lib/dnet.lib) +else () + set(_DNET_LIB ${LIBDNET_SRC}/installed/lib/libdnet.a) +endif () + +add_custom_target( + _dnet_build + COMMAND ${CMAKE_COMMAND} -E echo "Built the libdnet library" + DEPENDS _libdnet + BYPRODUCTS ${_DNET_LIB} ) -if (MSVC) - target_link_libraries(${PROJECT_NAME} PUBLIC Iphlpapi ws2_32) -endif() \ No newline at end of file +add_library(_DNET_IF INTERFACE) +add_library(ocpn::dnet ALIAS _DNET_IF) +add_dependencies(_DNET_IF _dnet_build) +target_include_directories( + _DNET_IF INTERFACE ${LIBDNET_SRC}/installed/include + _DNET_IF INTERFACE ${LIBDNET_SRC}/installed/include/dnet +) +target_link_libraries(_DNET_IF INTERFACE ${_DNET_LIB}) diff --git a/libs/libdnet/cmake/PatchFile.cmake b/libs/libdnet/cmake/PatchFile.cmake new file mode 100644 index 0000000000..70dfec8630 --- /dev/null +++ b/libs/libdnet/cmake/PatchFile.cmake @@ -0,0 +1,59 @@ +# Source: https://github.com/scivision/cmake-patch-file + +#[==[ + +MIT License + +Copyright (c) 2021 Michael + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +]==] + +find_package(Git REQUIRED) + +set(CMAKE_EXECUTE_PROCESS_COMMAND_ECHO STDOUT) + +cmake_path(GET patch FILENAME patch_name) + +execute_process( + COMMAND ${GIT_EXECUTABLE} --git-dir= apply -p1 --ignore-whitespace "${patch}" + RESULT_VARIABLE ret + ERROR_VARIABLE err + TIMEOUT 5 +) +# if patch already applied - will fail + +if (NOT ret EQUAL 0) + execute_process( + COMMAND ${GIT_EXECUTABLE} --git-dir= + apply -p1 --ignore-whitespace --check -R "${patch}" + RESULT_VARIABLE ret1 + ERROR_VARIABLE err1 + TIMEOUT 5 + ) + # if succeeds - patch sucessfully applied - conf OK + + if (NOT ret1 EQUAL 0) + message( + FATAL_ERROR "Patch ${patch} failed to apply: + ${ret} ${err} + ${ret1} ${err1}" + ) + endif () +endif () diff --git a/libs/libdnet/config.h.in-Fix-wrong-return-type.patch b/libs/libdnet/config.h.in-Fix-wrong-return-type.patch new file mode 100644 index 0000000000..00b9bf45d9 --- /dev/null +++ b/libs/libdnet/config.h.in-Fix-wrong-return-type.patch @@ -0,0 +1,45 @@ +From 0562b89561a00654d7ad74955379dcb525047786 Mon Sep 17 00:00:00 2001 +From: ALec Leamas +Date: Tue, 20 Aug 2024 14:08:09 +0200 +Subject: [PATCH] os.h: Remove conflicting ssize_t definition + +Forwarded: https://github.com/ofalk/libdnet/pull/102 + +--- + include/config.h.in | 4 ++-- + include/dnet/os.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/config.h.in b/include/config.h.in +index d57625b..87d1243 100644 +--- a/include/config.h.in ++++ b/include/config.h.in +@@ -293,11 +293,11 @@ int inet_pton(int, const char *, void *); + #endif + + #ifndef HAVE_STRLCAT +-int strlcat(char *, const char *, int); ++size_t strlcat(char *, const char *, int); + #endif + + #ifndef HAVE_STRLCPY +-int strlcpy(char *, const char *, int); ++size_t strlcpy(char *, const char *, int); + #endif + + #ifndef HAVE_STRSEP +diff --git a/include/dnet/os.h b/include/dnet/os.h +index 29d3ea8..aa659d3 100644 +--- a/include/dnet/os.h ++++ b/include/dnet/os.h +@@ -23,7 +23,7 @@ + typedef u_short uint16_t; + typedef u_int uint32_t; + # ifndef __CYGWIN__ +- typedef long ssize_t; ++ typedef ptrdiff_t ssize_t; + # endif + #else + # include +-- +2.35.1.windows.1 diff --git a/libs/libdnet/libdnet-libdnet-1.18.0/.github/workflows/cmake.yml b/libs/libdnet/libdnet-libdnet-1.18.0/.github/workflows/cmake.yml index 7cff85897d..1440d1e39d 100644 --- a/libs/libdnet/libdnet-libdnet-1.18.0/.github/workflows/cmake.yml +++ b/libs/libdnet/libdnet-libdnet-1.18.0/.github/workflows/cmake.yml @@ -11,7 +11,7 @@ name: cmake env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release - + jobs: build: runs-on: ubuntu-${{ matrix.ubuntu_version }} @@ -35,7 +35,7 @@ jobs: - name: Configure - run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -B "${{github.workspace}}/build" + run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -B "${{github.workspace}}/build" - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} @@ -59,4 +59,4 @@ jobs: run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -B "${{github.workspace}}/build" - name: Build - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} \ No newline at end of file + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/libs/libdnet/libdnet-libdnet-1.18.0/CMakeLists.txt b/libs/libdnet/libdnet-libdnet-1.18.0/CMakeLists.txt new file mode 100644 index 0000000000..c20bcde852 --- /dev/null +++ b/libs/libdnet/libdnet-libdnet-1.18.0/CMakeLists.txt @@ -0,0 +1,379 @@ +cmake_minimum_required(VERSION 3.14) + +project(dnet VERSION 1.18.0 LANGUAGES C) + +find_package(TCL) + +include(CheckFunctionExists) +include(CheckIncludeFile) +include(CheckIncludeFiles) +include(CheckStructHasMember) +include(CheckSymbolExists) +include(CheckTypeSize) +include(CheckCSourceCompiles) +include(GNUInstallDirs) + +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS True) +option(BUILD_SHARED_LIBS "Build in shared lib mode" OFF) + +foreach (header stdio.h stdlib.h string.h inttypes.h) + string(TOUPPER HAVE_${header} var) + string(REGEX REPLACE "\\.|/" "_" var ${var}) + check_include_file(${header} ${var}) +endforeach () + +if (MSVC) + add_definitions(-DWIN32_LEAN_AND_MEAN) + check_include_file(winsock2.h HAVE_WINSOCK2_H) + set(HAVE_LIBWS2_32 ${HAVE_WINSOCK2_H}) + check_c_source_compiles(" + #define WIN32_LEAN_AND_MEAN + #include + #include + int main() { return 0; }" + HAVE_IPHLPAPI_H) + set(HAVE_LIBIPHLPAPI ${HAVE_IPHLPAPI_H}) + set(CMAKE_REQUIRED_LIBRARIES "ws2_32") + check_symbol_exists(inet_pton WS2tcpip.h HAVE_INET_PTON) + set(CMAKE_REQUIRED_LIBRARIES ) +endif() +if(UNIX) + foreach (header strings.h + unistd.h sys/bufmod.h sys/dlpi.h sys/dlpihdr.h sys/dlpi_ext.h + sys/ioctl.h sys/mib.h sys/ndd_var.h sys/socket.h sys/sockio.h + sys/time.h sys/stat.h net/if.h net/if_var.h + net/if_dl.h net/pfilt.h + net/radix.h net/raw.h net/route.h netinet/in_var.h + linux/if_tun.h netinet/ip_fw.h linux/ip_fw.h + linux/ip_fwchains.h linux/netfilter_ipv4/ipchains_core.h + ip_fil_compat.h netinet/ip_fil_compat.h ip_compat.h + netinet/ip_compat.h ip_fil.h netinet/ip_fil.h + hpsecurity.h stropts.h dlfcn.h fcntl.h) + string(TOUPPER HAVE_${header} var) + string(REGEX REPLACE "\\.|/" "_" var ${var}) + check_include_file(${header} ${var}) + endforeach () + + check_include_files("sys/types.h;net/bpf.h" HAVE_NET_BPF_H) + check_include_files("sys/types.h;net/if_arp.h" HAVE_NET_IF_ARP_H) + check_include_files("sys/types.h;net/if_tun.h" HAVE_NET_IF_TUN_H) + check_include_files("sys/types.h;net/if.h;net/pfvar.h" HAVE_NET_PFVAR_H) + check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYS_SYSCTL_H) +endif() + +set(CMAKE_REQUIRED_LIBRARIES ) +foreach (func err strlcat strlcpy strse) + string(TOUPPER HAVE_${func} var) + check_function_exists(${func} ${var}) +endforeach () + +if (UNIX) + set(CMAKE_REQUIRED_LIBRARIES "nm") + check_function_exists(open_mib HAVE_OPEN_MIB) + set(CMAKE_REQUIRED_LIBRARIES ) + + CHECK_STRUCT_HAS_MEMBER("struct arpreq" arp_dev net/if_arp.h HAVE_ARPREQ_ARP_DEV LANGUAGE C) + CHECK_STRUCT_HAS_MEMBER("struct sockaddr" sa_len sys/socket.h HAVE_SOCKADDR_SA_LEN LANGUAGE C) + CHECK_STRUCT_HAS_MEMBER("struct rt_msghdr" rtm_msglen "sys/socket.h;net/if.h;net/route.h" HAVE_ROUTE_RT_MSGHDR LANGUAGE C) + + set(CMAKE_EXTRA_INCLUDE_FILES "netinet/in.h") + check_type_size("struct sockaddr_in6" HAVE_SOCKADDR_IN6 LANGUAGE C) + set(CMAKE_EXTRA_INCLUDE_FILES ) + + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + file(STRINGS /proc/sys/kernel/ostype PROCFS) + message(STATUS "${PROCFS}") + if (${PROCFS} STREQUAL "Linux") + set(HAVE_LINUX_PROCFS True) + endif() + endif() + + check_include_file(inet/mib2.h HAVE_STREAMS_MIB2) + + check_symbol_exists(ETH_P_ALL linux/if_ether.h HAVE_LINUX_PF_PACKET) + + check_symbol_exists(RTSTR_SEND net/route.h HAVE_STREAMS_ROUTE) + + check_symbol_exists(SIOCGARP sys/ioctl.h HAVE_IOCTL_ARP) + + string(TOLOWER ${CMAKE_SYSTEM_NAME} CMAKE_SYSTEM_NAME_LOWER) + + string(REGEX MATCH "bsd" BSD ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "darwin" DARWIN ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "osf" OSF ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "unixware" UNIXWARE ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "openbsd" OPENBSD ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "solaris" SOLARIS ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "irix" IRIX ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "freebsd5" FREEBSD5 ${CMAKE_SYSTEM_NAME_LOWER}) + string(REGEX MATCH "kfreebsd" KFREEBSD ${CMAKE_SYSTEM_NAME_LOWER}) + + if (BSD OR DARWIN OR OSF OR UNIXWARE) + set(HAVE_RAWIP_HOST_OFFLEN True) + endif() + + if (OPENBSD) + set(HAVE_RAWIP_HOST_OFFLEN False) + endif() + + if (SOLARIS OR IRIX) + set(HAVE_RAWIP_COOKED True) + endif() + + set(CMAKE_REQUIRED_LIBRARIES ) + foreach (func err strlcat strlcpy strse) + string(TOUPPER HAVE_${func} var) + check_function_exists(${func} ${var}) + endforeach () + + + + set(CMAKE_REQUIRED_LIBRARIES nsl socket) + check_function_exists(gethostbyname HAVE_GETHOSTBYNAME) + if (NOT HAVE_GETHOSTBYNAME) + unset(HAVE_GETHOSTBYNAME CACHE) + set(CMAKE_REQUIRED_LIBRARIES nsl) + check_function_exists(gethostbyname HAVE_GETHOSTBYNAME) + if (NOT HAVE_GETHOSTBYNAME) + unset(HAVE_GETHOSTBYNAME CACHE) + set(CMAKE_REQUIRED_LIBRARIES) + check_function_exists(gethostbyname HAVE_GETHOSTBYNAME) + endif() + endif() + set(CMAKE_REQUIRED_LIBRARIES ) + check_function_exists(gethostbyaddr HAVE_GETHOSTBYADDR) + check_function_exists(gethostname HAVE_GETHOSTNAME) +endif (UNIX) + +check_function_exists(inet_ntoa HAVE_INET_NTOA) +check_function_exists(memset HAVE_MEMSET) +check_function_exists(select HAVE_SELECT) +check_function_exists(socket HAVE_SOCKET) +check_function_exists(strerror HAVE_STRERROR) +check_function_exists(strsep HAVE_STRSEP) + +set(CMAKE_REQUIRED_LIBRARIES str) +check_function_exists(putmsg HAVE_PUTMSG) +set(CMAKE_REQUIRED_LIBRARIES ) + +set(PACKAGE ${PROJECT_NAME}) +set(PACKAGE_BUGREPORT) +set(PACKAGE_NAME ${PROJECT_NAME}) +set(PACKAGE_STRING "${PROJECT_NAME} ${CMAKE_PROJECT_VERSION}") +set(PACKAGE_TARNAME ${PROJECT_NAME}) +set(PACKAGE_URL) +set(PACKAGE_VERSION ${CMAKE_PROJECT_VERSION}) +set(VERSION ${CMAKE_PROJECT_VERSION}) + +configure_file(config.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) + +set(PLATFORM_SOURCES) + +if (NOT HAVE_STRLCAT) + list(APPEND PLATFORM_SOURCES src/strlcat.c) +endif() +if (NOT HAVE_STRLCPY) + list(APPEND PLATFORM_SOURCES src/strlcpy.c) +endif() +if (NOT HAVE_STRSEP) + list(APPEND PLATFORM_SOURCES src/strsep.c) +endif() + + +if (HAVE_ROUTE_RT_MSGHDR) + list(APPEND PLATFORM_SOURCES src/arp-bsd.c) +elseif (HAVE_IOCTL_ARP) + list(APPEND PLATFORM_SOURCES src/arp-ioctl.c) +elseif (HAVE_IPHLPAPI_H) + list(APPEND PLATFORM_SOURCES src/arp-win32.c) +else() + list(APPEND PLATFORM_SOURCES src/arp-none.c) +endif() + +if (HAVE_IPHLPAPI_H) +# no npcap support +# list(APPEND PLATFORM_SOURCES src/eth-win32.c) +elseif(HAVE_NET_PFILT_H) + list(APPEND PLATFORM_SOURCES src/eth-pfilt.c) +elseif(HAVE_LINUX_PF_PACKET) + list(APPEND PLATFORM_SOURCES src/eth-linux.c) +elseif(HAVE_NET_BPF_H) + list(APPEND PLATFORM_SOURCES src/eth-bsd.c) +elseif(HAVE_NET_RAW_H) + list(APPEND PLATFORM_SOURCES src/eth-snoop.c) +elseif(HAVE_SYS_NDD_VAR_H) + list(APPEND PLATFORM_SOURCES src/eth-ndd.c) +elseif(HAVE_SYS_DLPI_H OR HAVE_SYS_DLPIHDR_H) + list(APPEND PLATFORM_SOURCES src/eth-dlpi.c) +else() + list(APPEND PLATFORM_SOURCES src/eth-none.c) +endif() + +if (HAVE_IPHLPAPI_H) + list(APPEND PLATFORM_SOURCES src/fw-pktfilter.c) +elseif(HAVE_NET_PFVAR_H) + list(APPEND PLATFORM_SOURCES src/fw-pf.c) +elseif(HAVE_NETINET_IP_FW_H) + if (FREEBSD5 OR KFREEBSD) + list(APPEND PLATFORM_SOURCES src/fw-none.c) + else() + list(APPEND PLATFORM_SOURCES src/fw-ipfw.c) + endif() +elseif(HAVE_IP_FIL_H) + list(APPEND PLATFORM_SOURCES src/fw-ipf.c) +elseif(HAVE_LINUX_IP_FW_H OR HAVE_LINUX_IP_FWCHAINS_H OR HAVE_LINUX_NETFILTER_IPV4_IPCHAINS_CORE_H) + list(APPEND PLATFORM_SOURCES src/fw-ipchains.c) +else() + list(APPEND PLATFORM_SOURCES src/fw-none.c) +endif() + +if (HAVE_IPHLPAPI_H) + list(APPEND PLATFORM_SOURCES src/intf-win32.c) +else() + list(APPEND PLATFORM_SOURCES src/intf.c) +endif() + +if (HAVE_IPHLPAPI_H) + list(APPEND PLATFORM_SOURCES src/ip-win32.c) +elseif(HAVE_RAWIP_COOKED) + list(APPEND PLATFORM_SOURCES src/ip-cooked.c) +else() + list(APPEND PLATFORM_SOURCES src/ip.c) +endif() + +if (HAVE_IPHLPAPI_H) + list(APPEND PLATFORM_SOURCES src/route-win32.c) +elseif(HAVE_ROUTE_RT_MSGHDR) + list(APPEND PLATFORM_SOURCES src/route-bsd.c) +elseif(HAVE_LINUX_PROCFS) + list(APPEND PLATFORM_SOURCES src/route-linux.c) +elseif(HAVE_HPSECURITY_H) + list(APPEND PLATFORM_SOURCES src/route-hpux.c) +else() + list(APPEND PLATFORM_SOURCES src/route-none.c) +endif() + +if(HAVE_LINUX_PROCFS) + list(APPEND PLATFORM_SOURCES src/ndisc-linux.c) +else() + list(APPEND PLATFORM_SOURCES src/ndisc-none.c) +endif() + +find_file(HAVE_DEV_TUN + NAMES /dev/tun0 + DOC "Check for tun0") + +if(HAVE_LINUX_IF_TUN_H) + list(APPEND PLATFORM_SOURCES src/tun-linux.c) +elseif(HAVE_NET_IF_TUN_H) + if(HAVE_STROPTS_H) + list(APPEND PLATFORM_SOURCES src/tun-solaris.c) + else() + list(APPEND PLATFORM_SOURCES src/tun-bsd.c) + endif() +elseif(HAVE_DEV_TUN) + list(APPEND PLATFORM_SOURCES src/tun-bsd.c) +else() + list(APPEND PLATFORM_SOURCES src/tun-none.c) +endif() + +add_library(${PROJECT_NAME} + src/addr-util.c + src/addr.c + src/blob.c + src/err.c + src/ip-util.c + src/ip6.c + src/rand.c + ${PLATFORM_SOURCES}) + +target_include_directories(${PROJECT_NAME} PUBLIC + $ + $ + $ + $ +) + +set(DNET_HEADERS + include/dnet/addr.h + include/dnet/arp.h + include/dnet/blob.h + include/dnet/eth.h + include/dnet/fw.h + include/dnet/icmp.h + include/dnet/intf.h + include/dnet/ip.h + include/dnet/ip6.h + include/dnet/ndisc.h + include/dnet/os.h + include/dnet/rand.h + include/dnet/route.h + include/dnet/sctp.h + include/dnet/tcp.h + include/dnet/tun.h + include/dnet/udp.h +) +set(DNET_HEADERS1 + include/dnet.h + include/err.h + include/queue.h + ${CMAKE_CURRENT_BINARY_DIR}/config.h +) +set_target_properties( + ${PROJECT_NAME} + PROPERTIES + PUBLIC_HEADER "${DNET_HEADERS}" +) + +if (MSVC) + target_link_libraries(${PROJECT_NAME} PUBLIC Iphlpapi ws2_32) +endif() + +install(TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${PROJECT_NAME} COMPONENT devel +) + + +install(FILES ${DNET_HEADERS1} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} + COMPONENT devel) + +install(EXPORT ${PROJECT_NAME}Targets + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/ + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE ${PROJECT_NAME}:: + COMPONENT devel +) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + @ONLY +) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config-version.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake + @ONLY +) +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/ + COMPONENT devel +) + +if(UNIX) + if(NOT CPACK_GENERATOR) + set(CPACK_GENERATOR "DEB") + endif() + + set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) + set(CPACK_STRIP_FILES 1) + if(${CMAKE_VERSION} VERSION_GREATER "3.5") + set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) + endif() +endif() + +include(CPack) diff --git a/libs/libdnet/INSTALL b/libs/libdnet/libdnet-libdnet-1.18.0/INSTALL similarity index 100% rename from libs/libdnet/INSTALL rename to libs/libdnet/libdnet-libdnet-1.18.0/INSTALL diff --git a/libs/libdnet/LICENSE b/libs/libdnet/libdnet-libdnet-1.18.0/LICENSE similarity index 90% rename from libs/libdnet/LICENSE rename to libs/libdnet/libdnet-libdnet-1.18.0/LICENSE index 54c4d20601..c6e21316f4 100644 --- a/libs/libdnet/LICENSE +++ b/libs/libdnet/libdnet-libdnet-1.18.0/LICENSE @@ -1,31 +1,31 @@ - + Copyright (c) 2000-2006 Dug Song All rights reserved, all wrongs reversed. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions +modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. The names of the authors and copyright holders may not be used - to endorse or promote products derived from this software +3. The names of the authors and copyright holders may not be used + to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libs/libdnet/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/Makefile.am similarity index 100% rename from libs/libdnet/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/Makefile.am diff --git a/libs/libdnet/Makefile.am.common b/libs/libdnet/libdnet-libdnet-1.18.0/Makefile.am.common similarity index 100% rename from libs/libdnet/Makefile.am.common rename to libs/libdnet/libdnet-libdnet-1.18.0/Makefile.am.common diff --git a/libs/libdnet/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/Makefile.in similarity index 99% rename from libs/libdnet/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/Makefile.in index c3021fcccb..e6d1b80a2d 100644 --- a/libs/libdnet/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/Makefile.in @@ -140,11 +140,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = diff --git a/libs/libdnet/README.md b/libs/libdnet/libdnet-libdnet-1.18.0/README.md similarity index 100% rename from libs/libdnet/README.md rename to libs/libdnet/libdnet-libdnet-1.18.0/README.md diff --git a/libs/libdnet/THANKS b/libs/libdnet/libdnet-libdnet-1.18.0/THANKS similarity index 100% rename from libs/libdnet/THANKS rename to libs/libdnet/libdnet-libdnet-1.18.0/THANKS diff --git a/libs/libdnet/TODO b/libs/libdnet/libdnet-libdnet-1.18.0/TODO similarity index 100% rename from libs/libdnet/TODO rename to libs/libdnet/libdnet-libdnet-1.18.0/TODO diff --git a/libs/libdnet/acconfig.h b/libs/libdnet/libdnet-libdnet-1.18.0/acconfig.h similarity index 100% rename from libs/libdnet/acconfig.h rename to libs/libdnet/libdnet-libdnet-1.18.0/acconfig.h diff --git a/libs/libdnet/aclocal.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/aclocal.m4 similarity index 100% rename from libs/libdnet/aclocal.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/aclocal.m4 diff --git a/libs/libdnet/cmake/dnet-config-version.cmake.in b/libs/libdnet/libdnet-libdnet-1.18.0/cmake/dnet-config-version.cmake.in similarity index 100% rename from libs/libdnet/cmake/dnet-config-version.cmake.in rename to libs/libdnet/libdnet-libdnet-1.18.0/cmake/dnet-config-version.cmake.in diff --git a/libs/libdnet/cmake/dnet-config.cmake.in b/libs/libdnet/libdnet-libdnet-1.18.0/cmake/dnet-config.cmake.in similarity index 100% rename from libs/libdnet/cmake/dnet-config.cmake.in rename to libs/libdnet/libdnet-libdnet-1.18.0/cmake/dnet-config.cmake.in diff --git a/libs/libdnet/config.h.cmake.in b/libs/libdnet/libdnet-libdnet-1.18.0/config.h.cmake.in similarity index 100% rename from libs/libdnet/config.h.cmake.in rename to libs/libdnet/libdnet-libdnet-1.18.0/config.h.cmake.in diff --git a/libs/libdnet/config/compile b/libs/libdnet/libdnet-libdnet-1.18.0/config/compile similarity index 100% rename from libs/libdnet/config/compile rename to libs/libdnet/libdnet-libdnet-1.18.0/config/compile diff --git a/libs/libdnet/config/config.guess b/libs/libdnet/libdnet-libdnet-1.18.0/config/config.guess similarity index 100% rename from libs/libdnet/config/config.guess rename to libs/libdnet/libdnet-libdnet-1.18.0/config/config.guess diff --git a/libs/libdnet/config/config.sub b/libs/libdnet/libdnet-libdnet-1.18.0/config/config.sub similarity index 100% rename from libs/libdnet/config/config.sub rename to libs/libdnet/libdnet-libdnet-1.18.0/config/config.sub diff --git a/libs/libdnet/config/install-sh b/libs/libdnet/libdnet-libdnet-1.18.0/config/install-sh similarity index 100% rename from libs/libdnet/config/install-sh rename to libs/libdnet/libdnet-libdnet-1.18.0/config/install-sh diff --git a/libs/libdnet/config/libtool.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/config/libtool.m4 similarity index 99% rename from libs/libdnet/config/libtool.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/config/libtool.m4 index 0f53cb592e..5f7d9dbebc 100644 --- a/libs/libdnet/config/libtool.m4 +++ b/libs/libdnet/libdnet-libdnet-1.18.0/config/libtool.m4 @@ -2444,7 +2444,7 @@ AC_DEFUN([AC_PROG_NM], lt_cv_path_NM="$NM" else lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do @@ -5593,7 +5593,7 @@ EOF sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 diff --git a/libs/libdnet/config/ltmain.sh b/libs/libdnet/libdnet-libdnet-1.18.0/config/ltmain.sh similarity index 100% rename from libs/libdnet/config/ltmain.sh rename to libs/libdnet/libdnet-libdnet-1.18.0/config/ltmain.sh diff --git a/libs/libdnet/config/missing b/libs/libdnet/libdnet-libdnet-1.18.0/config/missing similarity index 100% rename from libs/libdnet/config/missing rename to libs/libdnet/libdnet-libdnet-1.18.0/config/missing diff --git a/libs/libdnet/config/mkinstalldirs b/libs/libdnet/libdnet-libdnet-1.18.0/config/mkinstalldirs similarity index 100% rename from libs/libdnet/config/mkinstalldirs rename to libs/libdnet/libdnet-libdnet-1.18.0/config/mkinstalldirs diff --git a/libs/libdnet/config/test-driver b/libs/libdnet/libdnet-libdnet-1.18.0/config/test-driver similarity index 100% rename from libs/libdnet/config/test-driver rename to libs/libdnet/libdnet-libdnet-1.18.0/config/test-driver diff --git a/libs/libdnet/configure b/libs/libdnet/libdnet-libdnet-1.18.0/configure similarity index 99% rename from libs/libdnet/configure rename to libs/libdnet/libdnet-libdnet-1.18.0/configure index 8872bd557e..ee8566bab7 100755 --- a/libs/libdnet/configure +++ b/libs/libdnet/libdnet-libdnet-1.18.0/configure @@ -18333,5 +18333,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - - diff --git a/libs/libdnet/configure.ac b/libs/libdnet/libdnet-libdnet-1.18.0/configure.ac similarity index 99% rename from libs/libdnet/configure.ac rename to libs/libdnet/libdnet-libdnet-1.18.0/configure.ac index e1d71bfd5e..e6d814bc2e 100644 --- a/libs/libdnet/configure.ac +++ b/libs/libdnet/libdnet-libdnet-1.18.0/configure.ac @@ -80,7 +80,7 @@ AC_ARG_WITH(python, AC_MSG_ERROR(python not found in $withval) fi ;; - esac + esac ]) AC_SUBST(PYTHON) AC_SUBST(TCLINC) @@ -97,11 +97,11 @@ if test "$CYGWIN" = yes ; then if test -d /usr/include/mingw ; then CPPFLAGS="$CPPFLAGS -mno-cygwin" CFLAGS="$CFLAGS -mno-cygwin" - AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, + AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, [Define for faster code generation.]) AC_CHECK_LIB(ws2_32, main) AC_CHECK_LIB(iphlpapi, main) - AC_DEFINE(snprintf, _snprintf, + AC_DEFINE(snprintf, _snprintf, [Use MingW32's internal snprintf]) else AC_MSG_ERROR([need MingW32 package to build under Cygwin]) diff --git a/libs/libdnet/dnet-config.in b/libs/libdnet/libdnet-libdnet-1.18.0/dnet-config.in similarity index 99% rename from libs/libdnet/dnet-config.in rename to libs/libdnet/libdnet-libdnet-1.18.0/dnet-config.in index 3db827f4a7..dab72c4758 100644 --- a/libs/libdnet/dnet-config.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/dnet-config.in @@ -87,6 +87,6 @@ fi if test "$echo_libs" = "yes"; then echo -L$libdir -ldnet @LIBS@ -fi +fi exit 0 diff --git a/libs/libdnet/include/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/include/Makefile.am similarity index 100% rename from libs/libdnet/include/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/include/Makefile.am diff --git a/libs/libdnet/include/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/include/Makefile.in similarity index 99% rename from libs/libdnet/include/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/include/Makefile.in index e96ee58e25..8d22ee4d81 100644 --- a/libs/libdnet/include/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/Makefile.in @@ -109,11 +109,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = diff --git a/libs/libdnet/include/config.h.in b/libs/libdnet/libdnet-libdnet-1.18.0/include/config.h.in similarity index 100% rename from libs/libdnet/include/config.h.in rename to libs/libdnet/libdnet-libdnet-1.18.0/include/config.h.in diff --git a/libs/libdnet/include/dnet.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet.h similarity index 100% rename from libs/libdnet/include/dnet.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet.h diff --git a/libs/libdnet/include/dnet/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/Makefile.am similarity index 100% rename from libs/libdnet/include/dnet/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/Makefile.am diff --git a/libs/libdnet/include/dnet/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/Makefile.in similarity index 99% rename from libs/libdnet/include/dnet/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/Makefile.in index c043d26f00..cdd1da153a 100644 --- a/libs/libdnet/include/dnet/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/Makefile.in @@ -109,11 +109,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = diff --git a/libs/libdnet/include/dnet/addr.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/addr.h similarity index 99% rename from libs/libdnet/include/dnet/addr.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/addr.h index 40a97c2a13..5eb60fbdb0 100644 --- a/libs/libdnet/include/dnet/addr.h +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/addr.h @@ -23,7 +23,7 @@ struct addr { eth_addr_t __eth; ip_addr_t __ip; ip6_addr_t __ip6; - + uint8_t __data8[16]; uint16_t __data16[8]; uint32_t __data32[4]; diff --git a/libs/libdnet/include/dnet/arp.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/arp.h similarity index 99% rename from libs/libdnet/include/dnet/arp.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/arp.h index d2c982fba5..a19d44b304 100644 --- a/libs/libdnet/include/dnet/arp.h +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/arp.h @@ -1,6 +1,6 @@ /* * arp.h - * + * * Address Resolution Protocol. * RFC 826 * diff --git a/libs/libdnet/include/dnet/blob.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/blob.h similarity index 100% rename from libs/libdnet/include/dnet/blob.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/blob.h diff --git a/libs/libdnet/include/dnet/eth.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/eth.h similarity index 100% rename from libs/libdnet/include/dnet/eth.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/eth.h diff --git a/libs/libdnet/include/dnet/fw.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/fw.h similarity index 100% rename from libs/libdnet/include/dnet/fw.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/fw.h diff --git a/libs/libdnet/include/dnet/icmp.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/icmp.h similarity index 100% rename from libs/libdnet/include/dnet/icmp.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/icmp.h diff --git a/libs/libdnet/include/dnet/intf.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/intf.h similarity index 100% rename from libs/libdnet/include/dnet/intf.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/intf.h diff --git a/libs/libdnet/include/dnet/ip.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/ip.h similarity index 99% rename from libs/libdnet/include/dnet/ip.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/ip.h index 40f4ac256f..d66c4ca8a7 100644 --- a/libs/libdnet/include/dnet/ip.h +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/ip.h @@ -42,7 +42,7 @@ struct ip_hdr { uint8_t ip_hl:4, ip_v:4; #else -# error "need to include " +# error "need to include " #endif uint8_t ip_tos; /* type of service */ uint16_t ip_len; /* total length (incl header) */ diff --git a/libs/libdnet/include/dnet/ip6.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/ip6.h similarity index 100% rename from libs/libdnet/include/dnet/ip6.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/ip6.h diff --git a/libs/libdnet/include/dnet/ndisc.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/ndisc.h similarity index 100% rename from libs/libdnet/include/dnet/ndisc.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/ndisc.h diff --git a/libs/libdnet/include/dnet/os.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/os.h similarity index 99% rename from libs/libdnet/include/dnet/os.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/os.h index 606fb7680f..29d3ea82ba 100644 --- a/libs/libdnet/include/dnet/os.h +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/os.h @@ -23,9 +23,7 @@ typedef u_short uint16_t; typedef u_int uint32_t; # ifndef __CYGWIN__ -#ifndef HAVE_SSIZE_T typedef long ssize_t; -#endif # endif #else # include diff --git a/libs/libdnet/include/dnet/rand.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/rand.h similarity index 100% rename from libs/libdnet/include/dnet/rand.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/rand.h diff --git a/libs/libdnet/include/dnet/route.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/route.h similarity index 100% rename from libs/libdnet/include/dnet/route.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/route.h diff --git a/libs/libdnet/include/dnet/sctp.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/sctp.h similarity index 99% rename from libs/libdnet/include/dnet/sctp.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/sctp.h index f313bae2e0..6f57a7387f 100644 --- a/libs/libdnet/include/dnet/sctp.h +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/sctp.h @@ -175,4 +175,3 @@ struct sctp_chunkhdr_cookie_echo { #endif #endif /* DNET_SCTP_H */ - diff --git a/libs/libdnet/include/dnet/tcp.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/tcp.h similarity index 100% rename from libs/libdnet/include/dnet/tcp.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/tcp.h diff --git a/libs/libdnet/include/dnet/tun.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/tun.h similarity index 100% rename from libs/libdnet/include/dnet/tun.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/tun.h diff --git a/libs/libdnet/include/dnet/udp.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/udp.h similarity index 100% rename from libs/libdnet/include/dnet/udp.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/dnet/udp.h diff --git a/libs/libdnet/include/err.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/err.h similarity index 100% rename from libs/libdnet/include/err.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/err.h diff --git a/libs/libdnet/include/queue.h b/libs/libdnet/libdnet-libdnet-1.18.0/include/queue.h similarity index 99% rename from libs/libdnet/include/queue.h rename to libs/libdnet/libdnet-libdnet-1.18.0/include/queue.h index c85bb240c5..0e5ebf0eff 100644 --- a/libs/libdnet/include/queue.h +++ b/libs/libdnet/libdnet-libdnet-1.18.0/include/queue.h @@ -40,7 +40,7 @@ #define _SYS_QUEUE_H_ /* - * This file defines five types of data structures: singly-linked lists, + * This file defines five types of data structures: singly-linked lists, * lists, simple queues, tail queues, and circular queues. * * @@ -93,15 +93,15 @@ struct name { \ struct type *slh_first; /* first element */ \ } - + #define SLIST_HEAD_INITIALIZER(head) \ { NULL } - + #define SLIST_ENTRY(type) \ struct { \ struct type *sle_next; /* next element */ \ } - + /* * Singly-linked List access methods. */ @@ -302,8 +302,8 @@ struct { \ struct type **tqe_prev; /* address of previous next element */ \ } -/* - * tail queue access methods +/* + * tail queue access methods */ #define TAILQ_FIRST(head) ((head)->tqh_first) #define TAILQ_END(head) NULL @@ -406,7 +406,7 @@ struct { \ } /* - * Circular queue access methods + * Circular queue access methods */ #define CIRCLEQ_FIRST(head) ((head)->cqh_first) #define CIRCLEQ_LAST(head) ((head)->cqh_last) diff --git a/libs/libdnet/include/stamp-h.in b/libs/libdnet/libdnet-libdnet-1.18.0/include/stamp-h.in similarity index 100% rename from libs/libdnet/include/stamp-h.in rename to libs/libdnet/libdnet-libdnet-1.18.0/include/stamp-h.in diff --git a/libs/libdnet/libdnet.spec b/libs/libdnet/libdnet-libdnet-1.18.0/libdnet.spec similarity index 100% rename from libs/libdnet/libdnet.spec rename to libs/libdnet/libdnet-libdnet-1.18.0/libdnet.spec diff --git a/libs/libdnet/m4/acinclude.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/m4/acinclude.m4 similarity index 99% rename from libs/libdnet/m4/acinclude.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/m4/acinclude.m4 index f8adeb75eb..f886f094b8 100644 --- a/libs/libdnet/m4/acinclude.m4 +++ b/libs/libdnet/libdnet-libdnet-1.18.0/m4/acinclude.m4 @@ -8,7 +8,7 @@ AC_DEFUN([AC_DNET_SOCKADDR_SA_LEN], [AC_MSG_CHECKING(for sa_len in sockaddr struct) AC_CACHE_VAL(ac_cv_dnet_sockaddr_has_sa_len, AC_TRY_COMPILE([#ifndef _SOCKADDR_LEN - #define _SOCKADDR_LEN 1 + #define _SOCKADDR_LEN 1 #endif #include #include ], @@ -297,7 +297,7 @@ AC_DEFUN([AC_LBL_LIBRARY_NET], [ # libraries (i.e. libc): AC_CHECK_FUNC(gethostbyname, , # Some OSes (eg. Solaris) place it in libnsl: - AC_CHECK_LIB(nsl, gethostbyname, , + AC_CHECK_LIB(nsl, gethostbyname, , # Some strange OSes (SINIX) have it in libsocket: AC_CHECK_LIB(socket, gethostbyname, , # Unfortunately libsocket sometimes depends on libnsl. diff --git a/libs/libdnet/m4/libtool.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/m4/libtool.m4 similarity index 100% rename from libs/libdnet/m4/libtool.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/m4/libtool.m4 diff --git a/libs/libdnet/m4/ltoptions.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/m4/ltoptions.m4 similarity index 100% rename from libs/libdnet/m4/ltoptions.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/m4/ltoptions.m4 diff --git a/libs/libdnet/m4/ltsugar.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/m4/ltsugar.m4 similarity index 100% rename from libs/libdnet/m4/ltsugar.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/m4/ltsugar.m4 diff --git a/libs/libdnet/m4/ltversion.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/m4/ltversion.m4 similarity index 100% rename from libs/libdnet/m4/ltversion.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/m4/ltversion.m4 diff --git a/libs/libdnet/m4/lt~obsolete.m4 b/libs/libdnet/libdnet-libdnet-1.18.0/m4/lt~obsolete.m4 similarity index 100% rename from libs/libdnet/m4/lt~obsolete.m4 rename to libs/libdnet/libdnet-libdnet-1.18.0/m4/lt~obsolete.m4 diff --git a/libs/libdnet/man/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/man/Makefile.am similarity index 99% rename from libs/libdnet/man/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/man/Makefile.am index e941b4cc04..f42bc63c24 100644 --- a/libs/libdnet/man/Makefile.am +++ b/libs/libdnet/libdnet-libdnet-1.18.0/man/Makefile.am @@ -8,4 +8,3 @@ EXTRA_DIST = $(man_MANS) dnet.3.txt: dnet.3 groff -t -e -mdoc -Tascii dnet.3 | col -bx > $@ - diff --git a/libs/libdnet/man/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/man/Makefile.in similarity index 99% rename from libs/libdnet/man/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/man/Makefile.in index b56d025d57..17c0088e3f 100644 --- a/libs/libdnet/man/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/man/Makefile.in @@ -107,11 +107,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = diff --git a/libs/libdnet/man/dnet.3 b/libs/libdnet/libdnet-libdnet-1.18.0/man/dnet.3 similarity index 99% rename from libs/libdnet/man/dnet.3 rename to libs/libdnet/libdnet-libdnet-1.18.0/man/dnet.3 index fa442ed17d..3812a4012c 100644 --- a/libs/libdnet/man/dnet.3 +++ b/libs/libdnet/libdnet-libdnet-1.18.0/man/dnet.3 @@ -208,7 +208,7 @@ struct addr { eth_addr_t __eth; ip_addr_t __ip; ip6_addr_t __ip6; - + uint8_t __data8[16]; uint16_t __data16[8]; uint32_t __data32[4]; diff --git a/libs/libdnet/python/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/python/Makefile.am similarity index 92% rename from libs/libdnet/python/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/python/Makefile.am index f4bbdc1c63..7f5713cc7e 100644 --- a/libs/libdnet/python/Makefile.am +++ b/libs/libdnet/libdnet-libdnet-1.18.0/python/Makefile.am @@ -8,12 +8,12 @@ if PYTHON noinst_SCRIPTS = python-build -python-build: +python-build: $(PYTHON) setup.py build touch python-build python-clean: - rm -rf build dnet.c + rm -rf build dnet.c clean: python-clean distclean: clean diff --git a/libs/libdnet/python/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/python/Makefile.in similarity index 99% rename from libs/libdnet/python/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/python/Makefile.in index 1e33597612..8322c1e852 100644 --- a/libs/libdnet/python/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/python/Makefile.in @@ -109,11 +109,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = @@ -646,7 +646,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -656,7 +656,7 @@ check-TESTS: log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ exit $$?; -recheck: all +recheck: all @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @set +e; $(am__set_TESTS_bases); \ bases=`for i in $$bases; do echo $$i; done \ @@ -844,12 +844,12 @@ uninstall-am: .PRECIOUS: Makefile -@PYTHON_TRUE@python-build: +@PYTHON_TRUE@python-build: @PYTHON_TRUE@ $(PYTHON) setup.py build @PYTHON_TRUE@ touch python-build @PYTHON_TRUE@python-clean: -@PYTHON_TRUE@ rm -rf build dnet.c +@PYTHON_TRUE@ rm -rf build dnet.c @PYTHON_TRUE@clean: python-clean @PYTHON_TRUE@distclean: clean diff --git a/libs/libdnet/python/dnet.c b/libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.c similarity index 99% rename from libs/libdnet/python/dnet.c rename to libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.c index 1b459f3ecd..3358fa4b89 100644 --- a/libs/libdnet/python/dnet.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.c @@ -1524,7 +1524,7 @@ struct __pyx_defaults5; typedef struct __pyx_defaults5 __pyx_defaults5; /* "dnet.pyx":1398 - * + * * # Modified (variable block length) TEA by Niels Provos * cdef enum: # <<<<<<<<<<<<<< * TEADELTA = 0x9e3779b9 @@ -1572,10 +1572,10 @@ struct __pyx_defaults5 { /* "dnet.pyx":104 * ETH_ADDR_BROADCAST = PyBytes_FromStringAndSize("\xff\xff\xff\xff\xff\xff", 6) - * + * * cdef class eth: # <<<<<<<<<<<<<< * """eth(device) -> Ethernet device object - * + * */ struct __pyx_obj_4dnet_eth { PyObject_HEAD @@ -1585,10 +1585,10 @@ struct __pyx_obj_4dnet_eth { /* "dnet.pyx":242 * IP_ADDR_MCAST_LOCAL = PyBytes_FromStringAndSize("\xe0\x00\x00\xff", 4) - * + * * cdef class ip: # <<<<<<<<<<<<<< * """ip() -> Raw IP object - * + * */ struct __pyx_obj_4dnet_ip { PyObject_HEAD @@ -1598,10 +1598,10 @@ struct __pyx_obj_4dnet_ip { /* "dnet.pyx":438 * ADDR_TYPE_IP6 = 3 - * + * * cdef class addr: # <<<<<<<<<<<<<< * """addr(addrtxt=None, addrtype=ADDR_TYPE_NONE) -> network address object - * + * */ struct __pyx_obj_4dnet_addr { PyObject_HEAD @@ -1611,7 +1611,7 @@ struct __pyx_obj_4dnet_addr { /* "dnet.pyx":635 * return p - * + * * cdef class __addr_ip4_iter: # <<<<<<<<<<<<<< * cdef unsigned long cur # XXX - HBO * cdef unsigned long max # XXX - HBO @@ -1625,10 +1625,10 @@ struct __pyx_obj_4dnet___addr_ip4_iter { /* "dnet.pyx":700 * return ret - * + * * cdef class arp: # <<<<<<<<<<<<<< * """arp() -> ARP table object - * + * */ struct __pyx_obj_4dnet_arp { PyObject_HEAD @@ -1638,10 +1638,10 @@ struct __pyx_obj_4dnet_arp { /* "dnet.pyx":980 * return ret - * + * * cdef class intf: # <<<<<<<<<<<<<< * """intf() -> Interface table object - * + * */ struct __pyx_obj_4dnet_intf { PyObject_HEAD @@ -1651,10 +1651,10 @@ struct __pyx_obj_4dnet_intf { /* "dnet.pyx":1099 * return ret - * + * * cdef class route: # <<<<<<<<<<<<<< * """route() -> Routing table object - * + * */ struct __pyx_obj_4dnet_route { PyObject_HEAD @@ -1664,10 +1664,10 @@ struct __pyx_obj_4dnet_route { /* "dnet.pyx":1245 * return ret - * + * * cdef class fw: # <<<<<<<<<<<<<< * """fw() -> Firewall ruleset object - * + * */ struct __pyx_obj_4dnet_fw { PyObject_HEAD @@ -1677,10 +1677,10 @@ struct __pyx_obj_4dnet_fw { /* "dnet.pyx":1322 * rand_t *rand_close(rand_t *rand) - * + * * cdef class rand: # <<<<<<<<<<<<<< * """rand() -> Pseudo-random number generator - * + * */ struct __pyx_obj_4dnet_rand { PyObject_HEAD @@ -1690,7 +1690,7 @@ struct __pyx_obj_4dnet_rand { /* "dnet.pyx":1404 * TEASBOXSHIFT = 7 - * + * * cdef class __rand_xrange: # <<<<<<<<<<<<<< * cdef rand_t *rand * cdef unsigned long cur, enc, max, mask, start, sboxmask @@ -1713,10 +1713,10 @@ struct __pyx_obj_4dnet___rand_xrange { /* "dnet.pyx":1488 * tun_t *tun_close(tun_t *tun) - * + * * cdef class tun: # <<<<<<<<<<<<<< * """tun(src, dst[, mtu]) -> Network tunnel interface handle - * + * */ struct __pyx_obj_4dnet_tun { PyObject_HEAD @@ -5567,7 +5567,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) { /* "dnet.pyx":45 * from dnet cimport * - * + * * cdef __memcpy(char *dst, object src, int n): # <<<<<<<<<<<<<< * if PyBytes_Size(src) != n: * raise ValueError, "not a %d-byte binary string: %r" % (n, src) @@ -5588,7 +5588,7 @@ static PyObject *__pyx_f_4dnet___memcpy(char *__pyx_v_dst, PyObject *__pyx_v_src __Pyx_RefNannySetupContext("__memcpy", 1); /* "dnet.pyx":46 - * + * * cdef __memcpy(char *dst, object src, int n): * if PyBytes_Size(src) != n: # <<<<<<<<<<<<<< * raise ValueError, "not a %d-byte binary string: %r" % (n, src) @@ -5602,7 +5602,7 @@ static PyObject *__pyx_f_4dnet___memcpy(char *__pyx_v_dst, PyObject *__pyx_v_src * if PyBytes_Size(src) != n: * raise ValueError, "not a %d-byte binary string: %r" % (n, src) # <<<<<<<<<<<<<< * memcpy(dst, src, n) - * + * */ __pyx_t_2 = PyTuple_New(4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 47, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -5637,7 +5637,7 @@ static PyObject *__pyx_f_4dnet___memcpy(char *__pyx_v_dst, PyObject *__pyx_v_src __PYX_ERR(0, 47, __pyx_L1_error) /* "dnet.pyx":46 - * + * * cdef __memcpy(char *dst, object src, int n): * if PyBytes_Size(src) != n: # <<<<<<<<<<<<<< * raise ValueError, "not a %d-byte binary string: %r" % (n, src) @@ -5649,7 +5649,7 @@ static PyObject *__pyx_f_4dnet___memcpy(char *__pyx_v_dst, PyObject *__pyx_v_src * if PyBytes_Size(src) != n: * raise ValueError, "not a %d-byte binary string: %r" % (n, src) * memcpy(dst, src, n) # <<<<<<<<<<<<<< - * + * * cdef __oserror(): */ __pyx_t_6 = __Pyx_PyObject_AsWritableString(__pyx_v_src); if (unlikely((!__pyx_t_6) && PyErr_Occurred())) __PYX_ERR(0, 48, __pyx_L1_error) @@ -5657,7 +5657,7 @@ static PyObject *__pyx_f_4dnet___memcpy(char *__pyx_v_dst, PyObject *__pyx_v_src /* "dnet.pyx":45 * from dnet cimport * - * + * * cdef __memcpy(char *dst, object src, int n): # <<<<<<<<<<<<<< * if PyBytes_Size(src) != n: * raise ValueError, "not a %d-byte binary string: %r" % (n, src) @@ -5679,7 +5679,7 @@ static PyObject *__pyx_f_4dnet___memcpy(char *__pyx_v_dst, PyObject *__pyx_v_src /* "dnet.pyx":50 * memcpy(dst, src, n) - * + * * cdef __oserror(): # <<<<<<<<<<<<<< * cdef extern int errno = 0 * return strerror(errno) @@ -5696,11 +5696,11 @@ static PyObject *__pyx_f_4dnet___oserror(void) { __Pyx_RefNannySetupContext("__oserror", 1); /* "dnet.pyx":51 - * + * * cdef __oserror(): * cdef extern int errno = 0 # <<<<<<<<<<<<<< * return strerror(errno) - * + * */ errno = 0; @@ -5708,7 +5708,7 @@ static PyObject *__pyx_f_4dnet___oserror(void) { * cdef __oserror(): * cdef extern int errno = 0 * return strerror(errno) # <<<<<<<<<<<<<< - * + * * def __iter_append(entry, l): */ __Pyx_XDECREF(__pyx_r); @@ -5720,7 +5720,7 @@ static PyObject *__pyx_f_4dnet___oserror(void) { /* "dnet.pyx":50 * memcpy(dst, src, n) - * + * * cdef __oserror(): # <<<<<<<<<<<<<< * cdef extern int errno = 0 * return strerror(errno) @@ -5739,14 +5739,14 @@ static PyObject *__pyx_f_4dnet___oserror(void) { /* "dnet.pyx":54 * return strerror(errno) - * + * * def __iter_append(entry, l): # <<<<<<<<<<<<<< * l.append(entry) - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_1__iter_append(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_1__iter_append(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -5754,7 +5754,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_1__iter_append = {"__iter_append", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_1__iter_append, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_1__iter_append(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_1__iter_append(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -5866,20 +5866,20 @@ static PyObject *__pyx_pf_4dnet___iter_append(CYTHON_UNUSED PyObject *__pyx_self __Pyx_RefNannySetupContext("__iter_append", 1); /* "dnet.pyx":55 - * + * * def __iter_append(entry, l): * l.append(entry) # <<<<<<<<<<<<<< - * + * * # */ __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_l, __pyx_v_entry); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 55, __pyx_L1_error) /* "dnet.pyx":54 * return strerror(errno) - * + * * def __iter_append(entry, l): # <<<<<<<<<<<<<< * l.append(entry) - * + * */ /* function exit code */ @@ -5896,7 +5896,7 @@ static PyObject *__pyx_pf_4dnet___iter_append(CYTHON_UNUSED PyObject *__pyx_self /* "dnet.pyx":111 * cdef eth_t *eth - * + * * def __init__(self, device): # <<<<<<<<<<<<<< * self.eth = eth_open(device) * if not self.eth: @@ -5993,7 +5993,7 @@ static int __pyx_pf_4dnet_3eth___init__(struct __pyx_obj_4dnet_eth *__pyx_v_self __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":112 - * + * * def __init__(self, device): * self.eth = eth_open(device) # <<<<<<<<<<<<<< * if not self.eth: @@ -6007,7 +6007,7 @@ static int __pyx_pf_4dnet_3eth___init__(struct __pyx_obj_4dnet_eth *__pyx_v_self * self.eth = eth_open(device) * if not self.eth: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (!(__pyx_v_self->eth != 0)); if (unlikely(__pyx_t_2)) { @@ -6016,7 +6016,7 @@ static int __pyx_pf_4dnet_3eth___init__(struct __pyx_obj_4dnet_eth *__pyx_v_self * self.eth = eth_open(device) * if not self.eth: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def get(self): */ __pyx_t_3 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error) @@ -6030,13 +6030,13 @@ static int __pyx_pf_4dnet_3eth___init__(struct __pyx_obj_4dnet_eth *__pyx_v_self * self.eth = eth_open(device) * if not self.eth: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":111 * cdef eth_t *eth - * + * * def __init__(self, device): # <<<<<<<<<<<<<< * self.eth = eth_open(device) * if not self.eth: @@ -6056,14 +6056,14 @@ static int __pyx_pf_4dnet_3eth___init__(struct __pyx_obj_4dnet_eth *__pyx_v_self /* "dnet.pyx":116 * raise OSError, __oserror() - * + * * def get(self): # <<<<<<<<<<<<<< * """Return the MAC address associated with the device as a * binary string.""" */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3eth_3get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_3get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6072,7 +6072,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3eth_2get, "Return the MAC address associated with the device as a\n binary string."); static PyMethodDef __pyx_mdef_4dnet_3eth_3get = {"get", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3eth_3get, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3eth_2get}; -static PyObject *__pyx_pw_4dnet_3eth_3get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_3get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6130,7 +6130,7 @@ static PyObject *__pyx_pf_4dnet_3eth_2get(struct __pyx_obj_4dnet_eth *__pyx_v_se * if eth_get(self.eth, &ea) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(ea.data, 6) - * + * */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 121, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -6151,7 +6151,7 @@ static PyObject *__pyx_pf_4dnet_3eth_2get(struct __pyx_obj_4dnet_eth *__pyx_v_se * if eth_get(self.eth, &ea) < 0: * raise OSError, __oserror() * return PyBytes_FromStringAndSize(ea.data, 6) # <<<<<<<<<<<<<< - * + * * def set(self, value): */ __Pyx_XDECREF(__pyx_r); @@ -6163,7 +6163,7 @@ static PyObject *__pyx_pf_4dnet_3eth_2get(struct __pyx_obj_4dnet_eth *__pyx_v_se /* "dnet.pyx":116 * raise OSError, __oserror() - * + * * def get(self): # <<<<<<<<<<<<<< * """Return the MAC address associated with the device as a * binary string.""" @@ -6182,14 +6182,14 @@ static PyObject *__pyx_pf_4dnet_3eth_2get(struct __pyx_obj_4dnet_eth *__pyx_v_se /* "dnet.pyx":124 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def set(self, value): # <<<<<<<<<<<<<< * """Set the MAC address for the device, returning 0 on success, * -1 on failure. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3eth_5set(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_5set(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6198,7 +6198,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3eth_4set, "Set the MAC address for the device, returning 0 on success,\n -1 on failure.\n \n Arguments:\n eth_addr -- 6-byte binary string (e.g. '\\x00\\xde\\xad\\xbe\\xef\\x00')\n "); static PyMethodDef __pyx_mdef_4dnet_3eth_5set = {"set", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3eth_5set, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3eth_4set}; -static PyObject *__pyx_pw_4dnet_3eth_5set(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_5set(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6312,7 +6312,7 @@ static PyObject *__pyx_pf_4dnet_3eth_4set(struct __pyx_obj_4dnet_eth *__pyx_v_se * __memcpy(ea.data, value, 6) * if eth_set(self.eth, &ea) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (eth_set(__pyx_v_self->eth, (&__pyx_v_ea)) < 0); if (unlikely(__pyx_t_2)) { @@ -6321,7 +6321,7 @@ static PyObject *__pyx_pf_4dnet_3eth_4set(struct __pyx_obj_4dnet_eth *__pyx_v_se * __memcpy(ea.data, value, 6) * if eth_set(self.eth, &ea) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def send(self, frame): */ __pyx_t_1 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 134, __pyx_L1_error) @@ -6335,13 +6335,13 @@ static PyObject *__pyx_pf_4dnet_3eth_4set(struct __pyx_obj_4dnet_eth *__pyx_v_se * __memcpy(ea.data, value, 6) * if eth_set(self.eth, &ea) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":124 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def set(self, value): # <<<<<<<<<<<<<< * """Set the MAC address for the device, returning 0 on success, * -1 on failure. @@ -6362,14 +6362,14 @@ static PyObject *__pyx_pf_4dnet_3eth_4set(struct __pyx_obj_4dnet_eth *__pyx_v_se /* "dnet.pyx":136 * raise OSError, __oserror() - * + * * def send(self, frame): # <<<<<<<<<<<<<< * """Send an Ethernet frame, returning the number of bytes sent * or -1 on failure. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3eth_7send(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_7send(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6378,7 +6378,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3eth_6send, "Send an Ethernet frame, returning the number of bytes sent\n or -1 on failure.\n \n Arguments:\n frame -- binary string representing an Ethernet frame\n "); static PyMethodDef __pyx_mdef_4dnet_3eth_7send = {"send", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3eth_7send, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3eth_6send}; -static PyObject *__pyx_pw_4dnet_3eth_7send(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_7send(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6479,7 +6479,7 @@ static PyObject *__pyx_pf_4dnet_3eth_6send(struct __pyx_obj_4dnet_eth *__pyx_v_s * frame -- binary string representing an Ethernet frame * """ * return eth_send(self.eth, frame, PyBytes_Size(frame)) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ __Pyx_XDECREF(__pyx_r); @@ -6492,7 +6492,7 @@ static PyObject *__pyx_pf_4dnet_3eth_6send(struct __pyx_obj_4dnet_eth *__pyx_v_s /* "dnet.pyx":136 * raise OSError, __oserror() - * + * * def send(self, frame): # <<<<<<<<<<<<<< * """Send an Ethernet frame, returning the number of bytes sent * or -1 on failure. @@ -6511,7 +6511,7 @@ static PyObject *__pyx_pf_4dnet_3eth_6send(struct __pyx_obj_4dnet_eth *__pyx_v_s /* "dnet.pyx":145 * return eth_send(self.eth, frame, PyBytes_Size(frame)) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.eth: * eth_close(self.eth) @@ -6534,11 +6534,11 @@ static void __pyx_pf_4dnet_3eth_8__dealloc__(struct __pyx_obj_4dnet_eth *__pyx_v int __pyx_t_1; /* "dnet.pyx":146 - * + * * def __dealloc__(self): * if self.eth: # <<<<<<<<<<<<<< * eth_close(self.eth) - * + * */ __pyx_t_1 = (__pyx_v_self->eth != 0); if (__pyx_t_1) { @@ -6547,23 +6547,23 @@ static void __pyx_pf_4dnet_3eth_8__dealloc__(struct __pyx_obj_4dnet_eth *__pyx_v * def __dealloc__(self): * if self.eth: * eth_close(self.eth) # <<<<<<<<<<<<<< - * + * * def eth_ntoa(buf): */ (void)(eth_close(__pyx_v_self->eth)); /* "dnet.pyx":146 - * + * * def __dealloc__(self): * if self.eth: # <<<<<<<<<<<<<< * eth_close(self.eth) - * + * */ } /* "dnet.pyx":145 * return eth_send(self.eth, frame, PyBytes_Size(frame)) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.eth: * eth_close(self.eth) @@ -6579,7 +6579,7 @@ static void __pyx_pf_4dnet_3eth_8__dealloc__(struct __pyx_obj_4dnet_eth *__pyx_v */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3eth_11__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_11__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6587,7 +6587,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_3eth_11__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3eth_11__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_3eth_11__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_11__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6659,7 +6659,7 @@ static PyObject *__pyx_pf_4dnet_3eth_10__reduce_cython__(CYTHON_UNUSED struct __ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3eth_13__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_13__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6667,7 +6667,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_3eth_13__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3eth_13__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_3eth_13__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3eth_13__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6788,14 +6788,14 @@ static PyObject *__pyx_pf_4dnet_3eth_12__setstate_cython__(CYTHON_UNUSED struct /* "dnet.pyx":149 * eth_close(self.eth) - * + * * def eth_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from 6-byte packed binary string to * a printable string ('00:de:ad:be:ef:00').""" */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3eth_ntoa(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_3eth_ntoa(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6804,7 +6804,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_2eth_ntoa, "Convert an Ethernet MAC address from 6-byte packed binary string to\n a printable string ('00:de:ad:be:ef:00')."); static PyMethodDef __pyx_mdef_4dnet_3eth_ntoa = {"eth_ntoa", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3eth_ntoa, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_2eth_ntoa}; -static PyObject *__pyx_pw_4dnet_3eth_ntoa(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_3eth_ntoa(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6906,7 +6906,7 @@ static PyObject *__pyx_pf_4dnet_2eth_ntoa(CYTHON_UNUSED PyObject *__pyx_self, Py * cdef eth_addr_t ea * __memcpy(ea.data, buf, 6) # <<<<<<<<<<<<<< * return __eth_ntoa(&ea) - * + * */ __pyx_t_1 = __pyx_f_4dnet___memcpy(__pyx_v_ea.data, __pyx_v_buf, 6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 153, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -6916,7 +6916,7 @@ static PyObject *__pyx_pf_4dnet_2eth_ntoa(CYTHON_UNUSED PyObject *__pyx_self, Py * cdef eth_addr_t ea * __memcpy(ea.data, buf, 6) * return __eth_ntoa(&ea) # <<<<<<<<<<<<<< - * + * * def eth_aton(buf): */ __Pyx_XDECREF(__pyx_r); @@ -6928,7 +6928,7 @@ static PyObject *__pyx_pf_4dnet_2eth_ntoa(CYTHON_UNUSED PyObject *__pyx_self, Py /* "dnet.pyx":149 * eth_close(self.eth) - * + * * def eth_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from 6-byte packed binary string to * a printable string ('00:de:ad:be:ef:00').""" @@ -6947,14 +6947,14 @@ static PyObject *__pyx_pf_4dnet_2eth_ntoa(CYTHON_UNUSED PyObject *__pyx_self, Py /* "dnet.pyx":156 * return __eth_ntoa(&ea) - * + * * def eth_aton(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from a printable string to a * packed binary string ('\\x00\\xde\\xad\\xbe\\xef\\x00').""" */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_5eth_aton(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_5eth_aton(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -6963,7 +6963,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4eth_aton, "Convert an Ethernet MAC address from a printable string to a\n packed binary string ('\\x00\\xde\\xad\\xbe\\xef\\x00')."); static PyMethodDef __pyx_mdef_4dnet_5eth_aton = {"eth_aton", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_5eth_aton, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4eth_aton}; -static PyObject *__pyx_pw_4dnet_5eth_aton(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_5eth_aton(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7078,7 +7078,7 @@ static PyObject *__pyx_pf_4dnet_4eth_aton(CYTHON_UNUSED PyObject *__pyx_self, Py * if __eth_aton(buf, &ea) < 0: * raise ValueError, "invalid Ethernet address" # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(ea.data, 6) - * + * */ __Pyx_Raise(__pyx_builtin_ValueError, __pyx_kp_u_invalid_Ethernet_address, 0, 0); __PYX_ERR(0, 161, __pyx_L1_error) @@ -7096,7 +7096,7 @@ static PyObject *__pyx_pf_4dnet_4eth_aton(CYTHON_UNUSED PyObject *__pyx_self, Py * if __eth_aton(buf, &ea) < 0: * raise ValueError, "invalid Ethernet address" * return PyBytes_FromStringAndSize(ea.data, 6) # <<<<<<<<<<<<<< - * + * * def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST, */ __Pyx_XDECREF(__pyx_r); @@ -7108,7 +7108,7 @@ static PyObject *__pyx_pf_4dnet_4eth_aton(CYTHON_UNUSED PyObject *__pyx_self, Py /* "dnet.pyx":156 * return __eth_ntoa(&ea) - * + * * def eth_aton(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from a printable string to a * packed binary string ('\\x00\\xde\\xad\\xbe\\xef\\x00').""" @@ -7127,7 +7127,7 @@ static PyObject *__pyx_pf_4dnet_4eth_aton(CYTHON_UNUSED PyObject *__pyx_self, Py /* "dnet.pyx":164 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST, # <<<<<<<<<<<<<< * etype=ETH_TYPE_IP): * """Return a packed binary string representing an Ethernet header. @@ -7179,7 +7179,7 @@ static PyObject *__pyx_pf_4dnet_38__defaults__(CYTHON_UNUSED PyObject *__pyx_sel } /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_7eth_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_7eth_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7188,7 +7188,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_6eth_pack_hdr, "Return a packed binary string representing an Ethernet header.\n\t\n Keyword arguments:\n dst -- destination address\t\t\t(6-byte binary string)\n src -- source address\t\t\t(6-byte binary string)\n etype -- Ethernet payload type (ETH_TYPE_*)\t(16-bit integer)\n "); static PyMethodDef __pyx_mdef_4dnet_7eth_pack_hdr = {"eth_pack_hdr", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_7eth_pack_hdr, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_6eth_pack_hdr}; -static PyObject *__pyx_pw_4dnet_7eth_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_7eth_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7347,7 +7347,7 @@ static PyObject *__pyx_pf_4dnet_6eth_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self * __memcpy(d.data, dst, 6) * __eth_pack_hdr(hdr, d, s, etype) # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(hdr, 14) - * + * */ __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_etype); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 177, __pyx_L1_error) eth_pack_hdr(__pyx_v_hdr, __pyx_v_d, __pyx_v_s, __pyx_t_2); @@ -7356,7 +7356,7 @@ static PyObject *__pyx_pf_4dnet_6eth_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self * __memcpy(d.data, dst, 6) * __eth_pack_hdr(hdr, d, s, etype) * return PyBytes_FromStringAndSize(hdr, 14) # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -7368,7 +7368,7 @@ static PyObject *__pyx_pf_4dnet_6eth_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self /* "dnet.pyx":164 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST, # <<<<<<<<<<<<<< * etype=ETH_TYPE_IP): * """Return a packed binary string representing an Ethernet header. @@ -7387,7 +7387,7 @@ static PyObject *__pyx_pf_4dnet_6eth_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self /* "dnet.pyx":249 * cdef ip_t *ip - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.ip = ip_open() * if not self.ip: @@ -7428,7 +7428,7 @@ static int __pyx_pf_4dnet_2ip___init__(struct __pyx_obj_4dnet_ip *__pyx_v_self) __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":250 - * + * * def __init__(self): * self.ip = ip_open() # <<<<<<<<<<<<<< * if not self.ip: @@ -7441,7 +7441,7 @@ static int __pyx_pf_4dnet_2ip___init__(struct __pyx_obj_4dnet_ip *__pyx_v_self) * self.ip = ip_open() * if not self.ip: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_1 = (!(__pyx_v_self->ip != 0)); if (unlikely(__pyx_t_1)) { @@ -7450,7 +7450,7 @@ static int __pyx_pf_4dnet_2ip___init__(struct __pyx_obj_4dnet_ip *__pyx_v_self) * self.ip = ip_open() * if not self.ip: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def send(self, pkt): */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error) @@ -7464,13 +7464,13 @@ static int __pyx_pf_4dnet_2ip___init__(struct __pyx_obj_4dnet_ip *__pyx_v_self) * self.ip = ip_open() * if not self.ip: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":249 * cdef ip_t *ip - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.ip = ip_open() * if not self.ip: @@ -7490,14 +7490,14 @@ static int __pyx_pf_4dnet_2ip___init__(struct __pyx_obj_4dnet_ip *__pyx_v_self) /* "dnet.pyx":254 * raise OSError, __oserror() - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2ip_3send(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2ip_3send(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7506,7 +7506,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_2ip_2send, "Send an IP packet, returning the number of bytes sent\n or -1 on failure.\n\n Arguments:\n pkt -- binary string representing an IP packet\n "); static PyMethodDef __pyx_mdef_4dnet_2ip_3send = {"send", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2ip_3send, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_2ip_2send}; -static PyObject *__pyx_pw_4dnet_2ip_3send(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2ip_3send(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7607,7 +7607,7 @@ static PyObject *__pyx_pf_4dnet_2ip_2send(struct __pyx_obj_4dnet_ip *__pyx_v_sel * pkt -- binary string representing an IP packet * """ * return ip_send(self.ip, pkt, PyBytes_Size(pkt)) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ __Pyx_XDECREF(__pyx_r); @@ -7620,7 +7620,7 @@ static PyObject *__pyx_pf_4dnet_2ip_2send(struct __pyx_obj_4dnet_ip *__pyx_v_sel /* "dnet.pyx":254 * raise OSError, __oserror() - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. @@ -7639,7 +7639,7 @@ static PyObject *__pyx_pf_4dnet_2ip_2send(struct __pyx_obj_4dnet_ip *__pyx_v_sel /* "dnet.pyx":263 * return ip_send(self.ip, pkt, PyBytes_Size(pkt)) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.ip: * ip_close(self.ip) @@ -7662,11 +7662,11 @@ static void __pyx_pf_4dnet_2ip_4__dealloc__(struct __pyx_obj_4dnet_ip *__pyx_v_s int __pyx_t_1; /* "dnet.pyx":264 - * + * * def __dealloc__(self): * if self.ip: # <<<<<<<<<<<<<< * ip_close(self.ip) - * + * */ __pyx_t_1 = (__pyx_v_self->ip != 0); if (__pyx_t_1) { @@ -7675,23 +7675,23 @@ static void __pyx_pf_4dnet_2ip_4__dealloc__(struct __pyx_obj_4dnet_ip *__pyx_v_s * def __dealloc__(self): * if self.ip: * ip_close(self.ip) # <<<<<<<<<<<<<< - * + * * def ip_ntoa(buf): */ (void)(ip_close(__pyx_v_self->ip)); /* "dnet.pyx":264 - * + * * def __dealloc__(self): * if self.ip: # <<<<<<<<<<<<<< * ip_close(self.ip) - * + * */ } /* "dnet.pyx":263 * return ip_send(self.ip, pkt, PyBytes_Size(pkt)) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.ip: * ip_close(self.ip) @@ -7707,7 +7707,7 @@ static void __pyx_pf_4dnet_2ip_4__dealloc__(struct __pyx_obj_4dnet_ip *__pyx_v_s */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2ip_7__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2ip_7__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7715,7 +7715,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_2ip_7__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2ip_7__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_2ip_7__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2ip_7__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7787,7 +7787,7 @@ static PyObject *__pyx_pf_4dnet_2ip_6__reduce_cython__(CYTHON_UNUSED struct __py */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2ip_9__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2ip_9__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7795,7 +7795,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_2ip_9__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2ip_9__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_2ip_9__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2ip_9__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7916,14 +7916,14 @@ static PyObject *__pyx_pf_4dnet_2ip_8__setstate_cython__(CYTHON_UNUSED struct __ /* "dnet.pyx":267 * ip_close(self.ip) - * + * * def ip_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a 4-byte packed binary string or * integer to a printable string ('10.0.0.1').""" */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_9ip_ntoa(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_9ip_ntoa(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -7932,7 +7932,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_8ip_ntoa, "Convert an IP address from a 4-byte packed binary string or\n integer to a printable string ('10.0.0.1')."); static PyMethodDef __pyx_mdef_4dnet_9ip_ntoa = {"ip_ntoa", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_9ip_ntoa, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_8ip_ntoa}; -static PyObject *__pyx_pw_4dnet_9ip_ntoa(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_9ip_ntoa(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8035,7 +8035,7 @@ static PyObject *__pyx_pf_4dnet_8ip_ntoa(CYTHON_UNUSED PyObject *__pyx_self, PyO /* "dnet.pyx":273 * cdef unsigned int i - * + * * if PyLong_Check(buf) or PyLong_Check(buf): # <<<<<<<<<<<<<< * i = ntohl(buf) * memcpy(&ia, &i, 4) @@ -8052,7 +8052,7 @@ static PyObject *__pyx_pf_4dnet_8ip_ntoa(CYTHON_UNUSED PyObject *__pyx_self, PyO if (__pyx_t_1) { /* "dnet.pyx":274 - * + * * if PyLong_Check(buf) or PyLong_Check(buf): * i = ntohl(buf) # <<<<<<<<<<<<<< * memcpy(&ia, &i, 4) @@ -8072,7 +8072,7 @@ static PyObject *__pyx_pf_4dnet_8ip_ntoa(CYTHON_UNUSED PyObject *__pyx_self, PyO /* "dnet.pyx":273 * cdef unsigned int i - * + * * if PyLong_Check(buf) or PyLong_Check(buf): # <<<<<<<<<<<<<< * i = ntohl(buf) * memcpy(&ia, &i, 4) @@ -8085,7 +8085,7 @@ static PyObject *__pyx_pf_4dnet_8ip_ntoa(CYTHON_UNUSED PyObject *__pyx_self, PyO * else: * __memcpy(&ia, buf, 4) # <<<<<<<<<<<<<< * return __ip_ntoa(&ia) - * + * */ /*else*/ { __pyx_t_4 = __pyx_f_4dnet___memcpy(((char *)(&__pyx_v_ia)), __pyx_v_buf, 4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 277, __pyx_L1_error) @@ -8098,7 +8098,7 @@ static PyObject *__pyx_pf_4dnet_8ip_ntoa(CYTHON_UNUSED PyObject *__pyx_self, PyO * else: * __memcpy(&ia, buf, 4) * return __ip_ntoa(&ia) # <<<<<<<<<<<<<< - * + * * def ip_aton(buf): */ __Pyx_XDECREF(__pyx_r); @@ -8110,7 +8110,7 @@ static PyObject *__pyx_pf_4dnet_8ip_ntoa(CYTHON_UNUSED PyObject *__pyx_self, PyO /* "dnet.pyx":267 * ip_close(self.ip) - * + * * def ip_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a 4-byte packed binary string or * integer to a printable string ('10.0.0.1').""" @@ -8129,14 +8129,14 @@ static PyObject *__pyx_pf_4dnet_8ip_ntoa(CYTHON_UNUSED PyObject *__pyx_self, PyO /* "dnet.pyx":280 * return __ip_ntoa(&ia) - * + * * def ip_aton(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_11ip_aton(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_11ip_aton(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8145,7 +8145,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_10ip_aton, "Convert an IP address from a printable string to a\n packed binary string ('\\x0a\\x00\\x00\\x01')."); static PyMethodDef __pyx_mdef_4dnet_11ip_aton = {"ip_aton", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_11ip_aton, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_10ip_aton}; -static PyObject *__pyx_pw_4dnet_11ip_aton(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_11ip_aton(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8260,7 +8260,7 @@ static PyObject *__pyx_pf_4dnet_10ip_aton(CYTHON_UNUSED PyObject *__pyx_self, Py * if __ip_aton(buf, &ia) < 0: * raise ValueError, "invalid IP address" # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(&ia, 4) - * + * */ __Pyx_Raise(__pyx_builtin_ValueError, __pyx_kp_u_invalid_IP_address, 0, 0); __PYX_ERR(0, 285, __pyx_L1_error) @@ -8278,7 +8278,7 @@ static PyObject *__pyx_pf_4dnet_10ip_aton(CYTHON_UNUSED PyObject *__pyx_self, Py * if __ip_aton(buf, &ia) < 0: * raise ValueError, "invalid IP address" * return PyBytes_FromStringAndSize(&ia, 4) # <<<<<<<<<<<<<< - * + * * def ip_checksum(pkt): */ __Pyx_XDECREF(__pyx_r); @@ -8290,7 +8290,7 @@ static PyObject *__pyx_pf_4dnet_10ip_aton(CYTHON_UNUSED PyObject *__pyx_self, Py /* "dnet.pyx":280 * return __ip_ntoa(&ia) - * + * * def ip_aton(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" @@ -8309,14 +8309,14 @@ static PyObject *__pyx_pf_4dnet_10ip_aton(CYTHON_UNUSED PyObject *__pyx_self, Py /* "dnet.pyx":288 * return PyBytes_FromStringAndSize(&ia, 4) - * + * * def ip_checksum(pkt): # <<<<<<<<<<<<<< * """Return packed binary string representing an IP packet * with the IP and transport-layer checksums set. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_13ip_checksum(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_13ip_checksum(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8325,7 +8325,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_12ip_checksum, "Return packed binary string representing an IP packet \n with the IP and transport-layer checksums set.\n \n Arguments:\n pkt -- binary string representing an IP packet\n "); static PyMethodDef __pyx_mdef_4dnet_13ip_checksum = {"ip_checksum", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_13ip_checksum, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_12ip_checksum}; -static PyObject *__pyx_pw_4dnet_13ip_checksum(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_13ip_checksum(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8542,7 +8542,7 @@ static PyObject *__pyx_pf_4dnet_12ip_checksum(CYTHON_UNUSED PyObject *__pyx_self * free(p) * return s # <<<<<<<<<<<<<< * raise TypeError - * + * */ __Pyx_XDECREF(__pyx_r); __Pyx_INCREF(__pyx_v_s); @@ -8562,7 +8562,7 @@ static PyObject *__pyx_pf_4dnet_12ip_checksum(CYTHON_UNUSED PyObject *__pyx_self * free(p) * return s * raise TypeError # <<<<<<<<<<<<<< - * + * * def ip_cksum_add(buf, int sum): */ __Pyx_Raise(__pyx_builtin_TypeError, 0, 0, 0); @@ -8570,7 +8570,7 @@ static PyObject *__pyx_pf_4dnet_12ip_checksum(CYTHON_UNUSED PyObject *__pyx_self /* "dnet.pyx":288 * return PyBytes_FromStringAndSize(&ia, 4) - * + * * def ip_checksum(pkt): # <<<<<<<<<<<<<< * """Return packed binary string representing an IP packet * with the IP and transport-layer checksums set. @@ -8590,14 +8590,14 @@ static PyObject *__pyx_pf_4dnet_12ip_checksum(CYTHON_UNUSED PyObject *__pyx_self /* "dnet.pyx":311 * raise TypeError - * + * * def ip_cksum_add(buf, int sum): # <<<<<<<<<<<<<< * cdef char *p * cdef int n */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_15ip_cksum_add(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_15ip_cksum_add(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8605,7 +8605,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_15ip_cksum_add = {"ip_cksum_add", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_15ip_cksum_add, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_15ip_cksum_add(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_15ip_cksum_add(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8756,7 +8756,7 @@ static PyObject *__pyx_pf_4dnet_14ip_cksum_add(CYTHON_UNUSED PyObject *__pyx_sel * return __ip_cksum_add(p, n, sum) * else: * raise TypeError # <<<<<<<<<<<<<< - * + * * def ip_cksum_carry(int sum): */ /*else*/ { @@ -8766,7 +8766,7 @@ static PyObject *__pyx_pf_4dnet_14ip_cksum_add(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":311 * raise TypeError - * + * * def ip_cksum_add(buf, int sum): # <<<<<<<<<<<<<< * cdef char *p * cdef int n @@ -8785,14 +8785,14 @@ static PyObject *__pyx_pf_4dnet_14ip_cksum_add(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":319 * raise TypeError - * + * * def ip_cksum_carry(int sum): # <<<<<<<<<<<<<< * return __ip_cksum_carry(sum) - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_17ip_cksum_carry(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_17ip_cksum_carry(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8800,7 +8800,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_17ip_cksum_carry = {"ip_cksum_carry", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_17ip_cksum_carry, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_17ip_cksum_carry(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_17ip_cksum_carry(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -8897,10 +8897,10 @@ static PyObject *__pyx_pf_4dnet_16ip_cksum_carry(CYTHON_UNUSED PyObject *__pyx_s __Pyx_RefNannySetupContext("ip_cksum_carry", 1); /* "dnet.pyx":320 - * + * * def ip_cksum_carry(int sum): * return __ip_cksum_carry(sum) # <<<<<<<<<<<<<< - * + * * def ip_pack_hdr(tos=IP_TOS_DEFAULT, len=IP_HDR_LEN, id=0, off=0, */ __Pyx_XDECREF(__pyx_r); @@ -8912,10 +8912,10 @@ static PyObject *__pyx_pf_4dnet_16ip_cksum_carry(CYTHON_UNUSED PyObject *__pyx_s /* "dnet.pyx":319 * raise TypeError - * + * * def ip_cksum_carry(int sum): # <<<<<<<<<<<<<< * return __ip_cksum_carry(sum) - * + * */ /* function exit code */ @@ -8931,7 +8931,7 @@ static PyObject *__pyx_pf_4dnet_16ip_cksum_carry(CYTHON_UNUSED PyObject *__pyx_s /* "dnet.pyx":322 * return __ip_cksum_carry(sum) - * + * * def ip_pack_hdr(tos=IP_TOS_DEFAULT, len=IP_HDR_LEN, id=0, off=0, # <<<<<<<<<<<<<< * ttl=IP_TTL_DEFAULT, p=IP_PROTO_IP, * src=IP_ADDR_ANY, dst=IP_ADDR_ANY): @@ -8998,7 +8998,7 @@ static PyObject *__pyx_pf_4dnet_40__defaults__(CYTHON_UNUSED PyObject *__pyx_sel } /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_19ip_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_19ip_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9007,7 +9007,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_18ip_pack_hdr, "Return a packed binary string representing an IP header.\n \n Keyword arguments:\n tos -- type of service\t\t\t(8-bit integer)\n len -- length (IP_HDR_LEN + payload)\t(16-bit integer)\n id -- packet ID\t\t\t\t(16-bit integer)\n off -- fragmentation offset\t\t(16-bit integer)\n ttl -- time-to-live\t\t\t(8-bit integer)\n p -- protocol (IP_PROTO_*)\t\t(8-bit integer)\n src -- source address\t\t\t(4-byte binary string)\n dst -- destination address\t\t\t(4-byte binary string)\n "); static PyMethodDef __pyx_mdef_4dnet_19ip_pack_hdr = {"ip_pack_hdr", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_19ip_pack_hdr, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_18ip_pack_hdr}; -static PyObject *__pyx_pw_4dnet_19ip_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_19ip_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9241,7 +9241,7 @@ static PyObject *__pyx_pf_4dnet_18ip_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self * __memcpy(&d, dst, 4) * __ip_pack_hdr(hdr, tos, len, id, off, ttl, p, s, d) # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(hdr, 20) - * + * */ __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_tos); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 341, __pyx_L1_error) __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_v_len); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 341, __pyx_L1_error) @@ -9255,7 +9255,7 @@ static PyObject *__pyx_pf_4dnet_18ip_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self * __memcpy(&d, dst, 4) * __ip_pack_hdr(hdr, tos, len, id, off, ttl, p, s, d) * return PyBytes_FromStringAndSize(hdr, 20) # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -9267,7 +9267,7 @@ static PyObject *__pyx_pf_4dnet_18ip_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self /* "dnet.pyx":322 * return __ip_cksum_carry(sum) - * + * * def ip_pack_hdr(tos=IP_TOS_DEFAULT, len=IP_HDR_LEN, id=0, off=0, # <<<<<<<<<<<<<< * ttl=IP_TTL_DEFAULT, p=IP_PROTO_IP, * src=IP_ADDR_ANY, dst=IP_ADDR_ANY): @@ -9286,14 +9286,14 @@ static PyObject *__pyx_pf_4dnet_18ip_pack_hdr(CYTHON_UNUSED PyObject *__pyx_self /* "dnet.pyx":372 * IP6_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16) - * + * * def ip6_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a 16-byte packed binary string to a * printable string ('10.0.0.1').""" */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_21ip6_ntoa(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_21ip6_ntoa(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9302,7 +9302,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_20ip6_ntoa, "Convert an IPv6 address from a 16-byte packed binary string to a\n printable string ('10.0.0.1')."); static PyMethodDef __pyx_mdef_4dnet_21ip6_ntoa = {"ip6_ntoa", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_21ip6_ntoa, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_20ip6_ntoa}; -static PyObject *__pyx_pw_4dnet_21ip6_ntoa(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_21ip6_ntoa(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9404,7 +9404,7 @@ static PyObject *__pyx_pf_4dnet_20ip6_ntoa(CYTHON_UNUSED PyObject *__pyx_self, P * cdef ip6_addr_t ia * __memcpy(&ia, buf, 16) # <<<<<<<<<<<<<< * return __ip6_ntoa(&ia) - * + * */ __pyx_t_1 = __pyx_f_4dnet___memcpy(((char *)(&__pyx_v_ia)), __pyx_v_buf, 16); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -9414,7 +9414,7 @@ static PyObject *__pyx_pf_4dnet_20ip6_ntoa(CYTHON_UNUSED PyObject *__pyx_self, P * cdef ip6_addr_t ia * __memcpy(&ia, buf, 16) * return __ip6_ntoa(&ia) # <<<<<<<<<<<<<< - * + * * def ip6_aton(buf): */ __Pyx_XDECREF(__pyx_r); @@ -9426,7 +9426,7 @@ static PyObject *__pyx_pf_4dnet_20ip6_ntoa(CYTHON_UNUSED PyObject *__pyx_self, P /* "dnet.pyx":372 * IP6_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16) - * + * * def ip6_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a 16-byte packed binary string to a * printable string ('10.0.0.1').""" @@ -9445,14 +9445,14 @@ static PyObject *__pyx_pf_4dnet_20ip6_ntoa(CYTHON_UNUSED PyObject *__pyx_self, P /* "dnet.pyx":379 * return __ip6_ntoa(&ia) - * + * * def ip6_aton(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_23ip6_aton(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_23ip6_aton(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9461,7 +9461,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_22ip6_aton, "Convert an IPv6 address from a printable string to a\n packed binary string ('\\x0a\\x00\\x00\\x01')."); static PyMethodDef __pyx_mdef_4dnet_23ip6_aton = {"ip6_aton", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_23ip6_aton, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_22ip6_aton}; -static PyObject *__pyx_pw_4dnet_23ip6_aton(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_23ip6_aton(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9576,7 +9576,7 @@ static PyObject *__pyx_pf_4dnet_22ip6_aton(CYTHON_UNUSED PyObject *__pyx_self, P * if __ip6_aton(buf, &ia) < 0: * raise ValueError, "invalid IPv6 address" # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(&ia, 16) - * + * */ __Pyx_Raise(__pyx_builtin_ValueError, __pyx_kp_u_invalid_IPv6_address, 0, 0); __PYX_ERR(0, 384, __pyx_L1_error) @@ -9594,7 +9594,7 @@ static PyObject *__pyx_pf_4dnet_22ip6_aton(CYTHON_UNUSED PyObject *__pyx_self, P * if __ip6_aton(buf, &ia) < 0: * raise ValueError, "invalid IPv6 address" * return PyBytes_FromStringAndSize(&ia, 16) # <<<<<<<<<<<<<< - * + * * def ip6_checksum(buf): */ __Pyx_XDECREF(__pyx_r); @@ -9606,7 +9606,7 @@ static PyObject *__pyx_pf_4dnet_22ip6_aton(CYTHON_UNUSED PyObject *__pyx_self, P /* "dnet.pyx":379 * return __ip6_ntoa(&ia) - * + * * def ip6_aton(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" @@ -9625,14 +9625,14 @@ static PyObject *__pyx_pf_4dnet_22ip6_aton(CYTHON_UNUSED PyObject *__pyx_self, P /* "dnet.pyx":387 * return PyBytes_FromStringAndSize(&ia, 16) - * + * * def ip6_checksum(buf): # <<<<<<<<<<<<<< * """Return a packed binary string representing an IPv6 packet * with the IPv6 and transport-layer checksums set. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_25ip6_checksum(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_25ip6_checksum(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9641,7 +9641,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_24ip6_checksum, "Return a packed binary string representing an IPv6 packet \n with the IPv6 and transport-layer checksums set.\n\n Arguments:\n pkt -- binary string representing an IPv6 packet\n "); static PyMethodDef __pyx_mdef_4dnet_25ip6_checksum = {"ip6_checksum", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_25ip6_checksum, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_24ip6_checksum}; -static PyObject *__pyx_pw_4dnet_25ip6_checksum(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_25ip6_checksum(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9742,7 +9742,7 @@ static PyObject *__pyx_pf_4dnet_24ip6_checksum(CYTHON_UNUSED PyObject *__pyx_sel * """ * __ip6_checksum(buf, PyBytes_Size(buf)) # <<<<<<<<<<<<<< * return buf - * + * */ __pyx_t_1 = __Pyx_PyObject_AsWritableString(__pyx_v_buf); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 394, __pyx_L1_error) ip6_checksum(__pyx_t_1, PyBytes_Size(__pyx_v_buf)); @@ -9751,7 +9751,7 @@ static PyObject *__pyx_pf_4dnet_24ip6_checksum(CYTHON_UNUSED PyObject *__pyx_sel * """ * __ip6_checksum(buf, PyBytes_Size(buf)) * return buf # <<<<<<<<<<<<<< - * + * * def ip6_pack_hdr(fc=0, fl=0, plen=0, nxt=IP_PROTO_IPV6, hlim=IP6_HLIM_DEFAULT, */ __Pyx_XDECREF(__pyx_r); @@ -9761,7 +9761,7 @@ static PyObject *__pyx_pf_4dnet_24ip6_checksum(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":387 * return PyBytes_FromStringAndSize(&ia, 16) - * + * * def ip6_checksum(buf): # <<<<<<<<<<<<<< * """Return a packed binary string representing an IPv6 packet * with the IPv6 and transport-layer checksums set. @@ -9779,7 +9779,7 @@ static PyObject *__pyx_pf_4dnet_24ip6_checksum(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":397 * return buf - * + * * def ip6_pack_hdr(fc=0, fl=0, plen=0, nxt=IP_PROTO_IPV6, hlim=IP6_HLIM_DEFAULT, # <<<<<<<<<<<<<< * src=IP6_ADDR_UNSPEC, dst=IP6_ADDR_UNSPEC): * """Return a packed binary string representing an IPv6 header. @@ -9843,7 +9843,7 @@ static PyObject *__pyx_pf_4dnet_42__defaults__(CYTHON_UNUSED PyObject *__pyx_sel } /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_27ip6_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_27ip6_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -9852,7 +9852,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_26ip6_pack_hdr, "Return a packed binary string representing an IPv6 header.\n \n Keyword arguments:\n fc -- flow class\t\t\t(8-bit integer)\n fl -- flow label\t\t\t(20-bit integer)\n plen -- payload length\t\t(16-bit integer)\n nxt -- next header (IP_PROTO_*)\t(8-bit integer)\n hlim -- hop limit\t\t\t(8-bit integer)\n src -- source address\t\t(16-byte binary string)\n dst -- destination address\t\t(16-byte binary string)\n "); static PyMethodDef __pyx_mdef_4dnet_27ip6_pack_hdr = {"ip6_pack_hdr", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_27ip6_pack_hdr, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_26ip6_pack_hdr}; -static PyObject *__pyx_pw_4dnet_27ip6_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_27ip6_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -10071,7 +10071,7 @@ static PyObject *__pyx_pf_4dnet_26ip6_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel * __memcpy(&d, dst, 16) * __ip6_pack_hdr(hdr, fc, fl, plen, nxt, hlim, s, d) # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(hdr, 40) - * + * */ __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_fc); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 414, __pyx_L1_error) __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_v_fl); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 414, __pyx_L1_error) @@ -10084,7 +10084,7 @@ static PyObject *__pyx_pf_4dnet_26ip6_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel * __memcpy(&d, dst, 16) * __ip6_pack_hdr(hdr, fc, fl, plen, nxt, hlim, s, d) * return PyBytes_FromStringAndSize(hdr, 40) # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -10096,7 +10096,7 @@ static PyObject *__pyx_pf_4dnet_26ip6_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":397 * return buf - * + * * def ip6_pack_hdr(fc=0, fl=0, plen=0, nxt=IP_PROTO_IPV6, hlim=IP6_HLIM_DEFAULT, # <<<<<<<<<<<<<< * src=IP6_ADDR_UNSPEC, dst=IP6_ADDR_UNSPEC): * """Return a packed binary string representing an IPv6 header. @@ -10115,7 +10115,7 @@ static PyObject *__pyx_pf_4dnet_26ip6_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":446 * cdef addr_t _addr - * + * * def __init__(self, addrtxt=None, addrtype=ADDR_TYPE_NONE): # <<<<<<<<<<<<<< * if addrtxt != None and addr_aton(addrtxt, &self._addr) < 0: * if PyBytes_Size(addrtxt) == 4: @@ -10231,7 +10231,7 @@ static int __pyx_pf_4dnet_4addr___init__(struct __pyx_obj_4dnet_addr *__pyx_v_se __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":447 - * + * * def __init__(self, addrtxt=None, addrtype=ADDR_TYPE_NONE): * if addrtxt != None and addr_aton(addrtxt, &self._addr) < 0: # <<<<<<<<<<<<<< * if PyBytes_Size(addrtxt) == 4: @@ -10310,7 +10310,7 @@ static int __pyx_pf_4dnet_4addr___init__(struct __pyx_obj_4dnet_addr *__pyx_v_se * self.ip = addrtxt * else: * raise ValueError, "invalid network address" # <<<<<<<<<<<<<< - * + * * property addrtype: */ /*else*/ { @@ -10320,7 +10320,7 @@ static int __pyx_pf_4dnet_4addr___init__(struct __pyx_obj_4dnet_addr *__pyx_v_se __pyx_L6:; /* "dnet.pyx":447 - * + * * def __init__(self, addrtxt=None, addrtype=ADDR_TYPE_NONE): * if addrtxt != None and addr_aton(addrtxt, &self._addr) < 0: # <<<<<<<<<<<<<< * if PyBytes_Size(addrtxt) == 4: @@ -10330,7 +10330,7 @@ static int __pyx_pf_4dnet_4addr___init__(struct __pyx_obj_4dnet_addr *__pyx_v_se /* "dnet.pyx":446 * cdef addr_t _addr - * + * * def __init__(self, addrtxt=None, addrtype=ADDR_TYPE_NONE): # <<<<<<<<<<<<<< * if addrtxt != None and addr_aton(addrtxt, &self._addr) < 0: * if PyBytes_Size(addrtxt) == 4: @@ -10461,7 +10461,7 @@ static int __pyx_pf_4dnet_4addr_8addrtype_2__set__(struct __pyx_obj_4dnet_addr * * def __set__(self, unsigned int value): * if value > 0xffff: raise OverflowError # <<<<<<<<<<<<<< * self._addr.addr_type = value - * + * */ __pyx_t_1 = (__pyx_v_value > 0xffff); if (unlikely(__pyx_t_1)) { @@ -10473,7 +10473,7 @@ static int __pyx_pf_4dnet_4addr_8addrtype_2__set__(struct __pyx_obj_4dnet_addr * * def __set__(self, unsigned int value): * if value > 0xffff: raise OverflowError * self._addr.addr_type = value # <<<<<<<<<<<<<< - * + * * property bits: */ __pyx_v_self->_addr.addr_type = __pyx_v_value; @@ -10609,7 +10609,7 @@ static int __pyx_pf_4dnet_4addr_4bits_2__set__(struct __pyx_obj_4dnet_addr *__py * def __set__(self, unsigned int value): * if value > 0xffff: raise OverflowError # <<<<<<<<<<<<<< * self._addr.addr_bits = value - * + * */ __pyx_t_1 = (__pyx_v_value > 0xffff); if (unlikely(__pyx_t_1)) { @@ -10621,7 +10621,7 @@ static int __pyx_pf_4dnet_4addr_4bits_2__set__(struct __pyx_obj_4dnet_addr *__py * def __set__(self, unsigned int value): * if value > 0xffff: raise OverflowError * self._addr.addr_bits = value # <<<<<<<<<<<<<< - * + * * property data: */ __pyx_v_self->_addr.addr_bits = __pyx_v_value; @@ -10806,7 +10806,7 @@ static PyObject *__pyx_pf_4dnet_4addr_4data___get__(struct __pyx_obj_4dnet_addr * return self.ip6 * else: * raise ValueError, "invalid network address" # <<<<<<<<<<<<<< - * + * * property eth: */ /*else*/ { @@ -10893,7 +10893,7 @@ static PyObject *__pyx_pf_4dnet_4addr_3eth___get__(struct __pyx_obj_4dnet_addr * * if self._addr.addr_type != ADDR_TYPE_ETH: * raise ValueError, "non-Ethernet address" # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(self._addr.addr_data8, 6) - * + * */ __Pyx_Raise(__pyx_builtin_ValueError, __pyx_kp_u_non_Ethernet_address, 0, 0); __PYX_ERR(0, 487, __pyx_L1_error) @@ -10911,7 +10911,7 @@ static PyObject *__pyx_pf_4dnet_4addr_3eth___get__(struct __pyx_obj_4dnet_addr * * if self._addr.addr_type != ADDR_TYPE_ETH: * raise ValueError, "non-Ethernet address" * return PyBytes_FromStringAndSize(self._addr.addr_data8, 6) # <<<<<<<<<<<<<< - * + * * def __set__(self, value): */ __Pyx_XDECREF(__pyx_r); @@ -10944,7 +10944,7 @@ static PyObject *__pyx_pf_4dnet_4addr_3eth___get__(struct __pyx_obj_4dnet_addr * /* "dnet.pyx":490 * return PyBytes_FromStringAndSize(self._addr.addr_data8, 6) - * + * * def __set__(self, value): # <<<<<<<<<<<<<< * if PyBytes_Size(value) != ETH_ADDR_LEN: * raise ValueError, "not a 6-byte string" @@ -10979,7 +10979,7 @@ static int __pyx_pf_4dnet_4addr_3eth_2__set__(struct __pyx_obj_4dnet_addr *__pyx __Pyx_RefNannySetupContext("__set__", 1); /* "dnet.pyx":491 - * + * * def __set__(self, value): * if PyBytes_Size(value) != ETH_ADDR_LEN: # <<<<<<<<<<<<<< * raise ValueError, "not a 6-byte string" @@ -11007,7 +11007,7 @@ static int __pyx_pf_4dnet_4addr_3eth_2__set__(struct __pyx_obj_4dnet_addr *__pyx __PYX_ERR(0, 492, __pyx_L1_error) /* "dnet.pyx":491 - * + * * def __set__(self, value): * if PyBytes_Size(value) != ETH_ADDR_LEN: # <<<<<<<<<<<<<< * raise ValueError, "not a 6-byte string" @@ -11031,7 +11031,7 @@ static int __pyx_pf_4dnet_4addr_3eth_2__set__(struct __pyx_obj_4dnet_addr *__pyx * __memcpy(self._addr.addr_data8, value, 6) * self._addr.addr_type = ADDR_TYPE_ETH # <<<<<<<<<<<<<< * self._addr.addr_bits = ETH_ADDR_BITS - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_ADDR_TYPE_ETH); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 494, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -11043,7 +11043,7 @@ static int __pyx_pf_4dnet_4addr_3eth_2__set__(struct __pyx_obj_4dnet_addr *__pyx * __memcpy(self._addr.addr_data8, value, 6) * self._addr.addr_type = ADDR_TYPE_ETH * self._addr.addr_bits = ETH_ADDR_BITS # <<<<<<<<<<<<<< - * + * * property ip: */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_ETH_ADDR_BITS); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 495, __pyx_L1_error) @@ -11054,7 +11054,7 @@ static int __pyx_pf_4dnet_4addr_3eth_2__set__(struct __pyx_obj_4dnet_addr *__pyx /* "dnet.pyx":490 * return PyBytes_FromStringAndSize(self._addr.addr_data8, 6) - * + * * def __set__(self, value): # <<<<<<<<<<<<<< * if PyBytes_Size(value) != ETH_ADDR_LEN: * raise ValueError, "not a 6-byte string" @@ -11132,7 +11132,7 @@ static PyObject *__pyx_pf_4dnet_4addr_2ip___get__(struct __pyx_obj_4dnet_addr *_ * if self._addr.addr_type != ADDR_TYPE_IP: * raise ValueError, "non-IP address" # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(self._addr.addr_data8, 4) - * + * */ __Pyx_Raise(__pyx_builtin_ValueError, __pyx_kp_u_non_IP_address, 0, 0); __PYX_ERR(0, 501, __pyx_L1_error) @@ -11150,7 +11150,7 @@ static PyObject *__pyx_pf_4dnet_4addr_2ip___get__(struct __pyx_obj_4dnet_addr *_ * if self._addr.addr_type != ADDR_TYPE_IP: * raise ValueError, "non-IP address" * return PyBytes_FromStringAndSize(self._addr.addr_data8, 4) # <<<<<<<<<<<<<< - * + * * def __set__(self, value): */ __Pyx_XDECREF(__pyx_r); @@ -11183,7 +11183,7 @@ static PyObject *__pyx_pf_4dnet_4addr_2ip___get__(struct __pyx_obj_4dnet_addr *_ /* "dnet.pyx":504 * return PyBytes_FromStringAndSize(self._addr.addr_data8, 4) - * + * * def __set__(self, value): # <<<<<<<<<<<<<< * # XXX - handle < 2.3, or else we'd use PyLong_AsUnsignedLongMask() * if PyLong_Check(value): @@ -11331,7 +11331,7 @@ static int __pyx_pf_4dnet_4addr_2ip_2__set__(struct __pyx_obj_4dnet_addr *__pyx_ * __memcpy(self._addr.addr_data8, value, 4) * self._addr.addr_type = ADDR_TYPE_IP # <<<<<<<<<<<<<< * self._addr.addr_bits = IP_ADDR_BITS - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_ADDR_TYPE_IP); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 514, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -11343,7 +11343,7 @@ static int __pyx_pf_4dnet_4addr_2ip_2__set__(struct __pyx_obj_4dnet_addr *__pyx_ * __memcpy(self._addr.addr_data8, value, 4) * self._addr.addr_type = ADDR_TYPE_IP * self._addr.addr_bits = IP_ADDR_BITS # <<<<<<<<<<<<<< - * + * * property ip6: */ __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_IP_ADDR_BITS); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 515, __pyx_L1_error) @@ -11354,7 +11354,7 @@ static int __pyx_pf_4dnet_4addr_2ip_2__set__(struct __pyx_obj_4dnet_addr *__pyx_ /* "dnet.pyx":504 * return PyBytes_FromStringAndSize(self._addr.addr_data8, 4) - * + * * def __set__(self, value): # <<<<<<<<<<<<<< * # XXX - handle < 2.3, or else we'd use PyLong_AsUnsignedLongMask() * if PyLong_Check(value): @@ -11432,7 +11432,7 @@ static PyObject *__pyx_pf_4dnet_4addr_3ip6___get__(struct __pyx_obj_4dnet_addr * * if self._addr.addr_type != ADDR_TYPE_IP6: * raise ValueError, "non-IPv6 address" # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(self._addr.addr_data8, 16) - * + * */ __Pyx_Raise(__pyx_builtin_ValueError, __pyx_kp_u_non_IPv6_address, 0, 0); __PYX_ERR(0, 521, __pyx_L1_error) @@ -11450,7 +11450,7 @@ static PyObject *__pyx_pf_4dnet_4addr_3ip6___get__(struct __pyx_obj_4dnet_addr * * if self._addr.addr_type != ADDR_TYPE_IP6: * raise ValueError, "non-IPv6 address" * return PyBytes_FromStringAndSize(self._addr.addr_data8, 16) # <<<<<<<<<<<<<< - * + * * def __set__(self, value): */ __Pyx_XDECREF(__pyx_r); @@ -11483,7 +11483,7 @@ static PyObject *__pyx_pf_4dnet_4addr_3ip6___get__(struct __pyx_obj_4dnet_addr * /* "dnet.pyx":524 * return PyBytes_FromStringAndSize(self._addr.addr_data8, 16) - * + * * def __set__(self, value): # <<<<<<<<<<<<<< * if PyBytes_Size(value) != IP6_ADDR_LEN: * raise ValueError, "not a 16-byte string" @@ -11518,7 +11518,7 @@ static int __pyx_pf_4dnet_4addr_3ip6_2__set__(struct __pyx_obj_4dnet_addr *__pyx __Pyx_RefNannySetupContext("__set__", 1); /* "dnet.pyx":525 - * + * * def __set__(self, value): * if PyBytes_Size(value) != IP6_ADDR_LEN: # <<<<<<<<<<<<<< * raise ValueError, "not a 16-byte string" @@ -11546,7 +11546,7 @@ static int __pyx_pf_4dnet_4addr_3ip6_2__set__(struct __pyx_obj_4dnet_addr *__pyx __PYX_ERR(0, 526, __pyx_L1_error) /* "dnet.pyx":525 - * + * * def __set__(self, value): * if PyBytes_Size(value) != IP6_ADDR_LEN: # <<<<<<<<<<<<<< * raise ValueError, "not a 16-byte string" @@ -11570,7 +11570,7 @@ static int __pyx_pf_4dnet_4addr_3ip6_2__set__(struct __pyx_obj_4dnet_addr *__pyx * __memcpy(self._addr.addr_data8, value, 16) * self._addr.addr_type = ADDR_TYPE_IP6 # <<<<<<<<<<<<<< * self._addr.addr_bits = IP6_ADDR_BITS - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_ADDR_TYPE_IP6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 528, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -11582,7 +11582,7 @@ static int __pyx_pf_4dnet_4addr_3ip6_2__set__(struct __pyx_obj_4dnet_addr *__pyx * __memcpy(self._addr.addr_data8, value, 16) * self._addr.addr_type = ADDR_TYPE_IP6 * self._addr.addr_bits = IP6_ADDR_BITS # <<<<<<<<<<<<<< - * + * * def bcast(self): */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_IP6_ADDR_BITS); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 529, __pyx_L1_error) @@ -11593,7 +11593,7 @@ static int __pyx_pf_4dnet_4addr_3ip6_2__set__(struct __pyx_obj_4dnet_addr *__pyx /* "dnet.pyx":524 * return PyBytes_FromStringAndSize(self._addr.addr_data8, 16) - * + * * def __set__(self, value): # <<<<<<<<<<<<<< * if PyBytes_Size(value) != IP6_ADDR_LEN: * raise ValueError, "not a 16-byte string" @@ -11615,14 +11615,14 @@ static int __pyx_pf_4dnet_4addr_3ip6_2__set__(struct __pyx_obj_4dnet_addr *__pyx /* "dnet.pyx":531 * self._addr.addr_bits = IP6_ADDR_BITS - * + * * def bcast(self): # <<<<<<<<<<<<<< * """Return an addr object for our broadcast address.""" * bcast = addr() */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4addr_3bcast(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_3bcast(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -11631,7 +11631,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4addr_2bcast, "Return an addr object for our broadcast address."); static PyMethodDef __pyx_mdef_4dnet_4addr_3bcast = {"bcast", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4addr_3bcast, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4addr_2bcast}; -static PyObject *__pyx_pw_4dnet_4addr_3bcast(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_3bcast(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -11690,7 +11690,7 @@ static PyObject *__pyx_pf_4dnet_4addr_2bcast(struct __pyx_obj_4dnet_addr *__pyx_ * bcast = addr() * addr_bcast(&self._addr, &(bcast)._addr) # <<<<<<<<<<<<<< * return bcast - * + * */ (void)(addr_bcast((&__pyx_v_self->_addr), (&__pyx_v_bcast->_addr))); @@ -11698,7 +11698,7 @@ static PyObject *__pyx_pf_4dnet_4addr_2bcast(struct __pyx_obj_4dnet_addr *__pyx_ * bcast = addr() * addr_bcast(&self._addr, &(bcast)._addr) * return bcast # <<<<<<<<<<<<<< - * + * * def net(self): */ __Pyx_XDECREF(__pyx_r); @@ -11708,7 +11708,7 @@ static PyObject *__pyx_pf_4dnet_4addr_2bcast(struct __pyx_obj_4dnet_addr *__pyx_ /* "dnet.pyx":531 * self._addr.addr_bits = IP6_ADDR_BITS - * + * * def bcast(self): # <<<<<<<<<<<<<< * """Return an addr object for our broadcast address.""" * bcast = addr() @@ -11728,14 +11728,14 @@ static PyObject *__pyx_pf_4dnet_4addr_2bcast(struct __pyx_obj_4dnet_addr *__pyx_ /* "dnet.pyx":537 * return bcast - * + * * def net(self): # <<<<<<<<<<<<<< * """Return an addr object for our network address.""" * net = addr() */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4addr_5net(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_5net(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -11744,7 +11744,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4addr_4net, "Return an addr object for our network address."); static PyMethodDef __pyx_mdef_4dnet_4addr_5net = {"net", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4addr_5net, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4addr_4net}; -static PyObject *__pyx_pw_4dnet_4addr_5net(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_5net(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -11803,7 +11803,7 @@ static PyObject *__pyx_pf_4dnet_4addr_4net(struct __pyx_obj_4dnet_addr *__pyx_v_ * net = addr() * addr_net(&self._addr, &(net)._addr) # <<<<<<<<<<<<<< * return net - * + * */ (void)(addr_net((&__pyx_v_self->_addr), (&__pyx_v_net->_addr))); @@ -11811,7 +11811,7 @@ static PyObject *__pyx_pf_4dnet_4addr_4net(struct __pyx_obj_4dnet_addr *__pyx_v_ * net = addr() * addr_net(&self._addr, &(net)._addr) * return net # <<<<<<<<<<<<<< - * + * * def __add__(self, other): */ __Pyx_XDECREF(__pyx_r); @@ -11821,7 +11821,7 @@ static PyObject *__pyx_pf_4dnet_4addr_4net(struct __pyx_obj_4dnet_addr *__pyx_v_ /* "dnet.pyx":537 * return bcast - * + * * def net(self): # <<<<<<<<<<<<<< * """Return an addr object for our network address.""" * net = addr() @@ -11841,7 +11841,7 @@ static PyObject *__pyx_pf_4dnet_4addr_4net(struct __pyx_obj_4dnet_addr *__pyx_v_ /* "dnet.pyx":543 * return net - * + * * def __add__(self, other): # <<<<<<<<<<<<<< * # XXX - only handle IP for now... * if PyLong_Check(self): @@ -12003,7 +12003,7 @@ static PyObject *__pyx_pf_4dnet_4addr_6__add__(struct __pyx_obj_4dnet_addr *__py * z = x.__copy__() * (z)._addr.addr_ip = htonl(ntohl((x)._addr.addr_ip) + y) # <<<<<<<<<<<<<< * return z - * + * */ __pyx_t_2 = __Pyx_PyInt_From_unsigned_long(ntohl(((struct __pyx_obj_4dnet_addr *)__pyx_v_x)->_addr.addr_ip)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 552, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -12018,7 +12018,7 @@ static PyObject *__pyx_pf_4dnet_4addr_6__add__(struct __pyx_obj_4dnet_addr *__py * z = x.__copy__() * (z)._addr.addr_ip = htonl(ntohl((x)._addr.addr_ip) + y) * return z # <<<<<<<<<<<<<< - * + * * def __copy__(self): */ __Pyx_XDECREF(__pyx_r); @@ -12028,7 +12028,7 @@ static PyObject *__pyx_pf_4dnet_4addr_6__add__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":543 * return net - * + * * def __add__(self, other): # <<<<<<<<<<<<<< * # XXX - only handle IP for now... * if PyLong_Check(self): @@ -12052,14 +12052,14 @@ static PyObject *__pyx_pf_4dnet_4addr_6__add__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":555 * return z - * + * * def __copy__(self): # <<<<<<<<<<<<<< * a = addr() * (a)._addr = self._addr */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4addr_9__copy__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_9__copy__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -12067,7 +12067,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_4addr_9__copy__ = {"__copy__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4addr_9__copy__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_4addr_9__copy__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_9__copy__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -12111,7 +12111,7 @@ static PyObject *__pyx_pf_4dnet_4addr_8__copy__(struct __pyx_obj_4dnet_addr *__p __Pyx_RefNannySetupContext("__copy__", 1); /* "dnet.pyx":556 - * + * * def __copy__(self): * a = addr() # <<<<<<<<<<<<<< * (a)._addr = self._addr @@ -12127,7 +12127,7 @@ static PyObject *__pyx_pf_4dnet_4addr_8__copy__(struct __pyx_obj_4dnet_addr *__p * a = addr() * (a)._addr = self._addr # <<<<<<<<<<<<<< * return a - * + * */ __pyx_t_2 = __pyx_v_self->_addr; __pyx_v_a->_addr = __pyx_t_2; @@ -12136,7 +12136,7 @@ static PyObject *__pyx_pf_4dnet_4addr_8__copy__(struct __pyx_obj_4dnet_addr *__p * a = addr() * (a)._addr = self._addr * return a # <<<<<<<<<<<<<< - * + * * def __eq__(addr x, addr y): */ __Pyx_XDECREF(__pyx_r); @@ -12146,7 +12146,7 @@ static PyObject *__pyx_pf_4dnet_4addr_8__copy__(struct __pyx_obj_4dnet_addr *__p /* "dnet.pyx":555 * return z - * + * * def __copy__(self): # <<<<<<<<<<<<<< * a = addr() * (a)._addr = self._addr @@ -12166,10 +12166,10 @@ static PyObject *__pyx_pf_4dnet_4addr_8__copy__(struct __pyx_obj_4dnet_addr *__p /* "dnet.pyx":560 * return a - * + * * def __eq__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) == 0 - * + * */ /* Python wrapper */ @@ -12205,10 +12205,10 @@ static PyObject *__pyx_pf_4dnet_4addr_10__eq__(struct __pyx_obj_4dnet_addr *__py __Pyx_RefNannySetupContext("__eq__", 1); /* "dnet.pyx":561 - * + * * def __eq__(addr x, addr y): * return addr_cmp(&x._addr, &y._addr) == 0 # <<<<<<<<<<<<<< - * + * * def __ne__(addr x, addr y): */ __Pyx_XDECREF(__pyx_r); @@ -12220,10 +12220,10 @@ static PyObject *__pyx_pf_4dnet_4addr_10__eq__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":560 * return a - * + * * def __eq__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) == 0 - * + * */ /* function exit code */ @@ -12239,10 +12239,10 @@ static PyObject *__pyx_pf_4dnet_4addr_10__eq__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":563 * return addr_cmp(&x._addr, &y._addr) == 0 - * + * * def __ne__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) != 0 - * + * */ /* Python wrapper */ @@ -12278,10 +12278,10 @@ static PyObject *__pyx_pf_4dnet_4addr_12__ne__(struct __pyx_obj_4dnet_addr *__py __Pyx_RefNannySetupContext("__ne__", 1); /* "dnet.pyx":564 - * + * * def __ne__(addr x, addr y): * return addr_cmp(&x._addr, &y._addr) != 0 # <<<<<<<<<<<<<< - * + * * def __lt__(addr x, addr y): */ __Pyx_XDECREF(__pyx_r); @@ -12293,10 +12293,10 @@ static PyObject *__pyx_pf_4dnet_4addr_12__ne__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":563 * return addr_cmp(&x._addr, &y._addr) == 0 - * + * * def __ne__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) != 0 - * + * */ /* function exit code */ @@ -12312,10 +12312,10 @@ static PyObject *__pyx_pf_4dnet_4addr_12__ne__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":566 * return addr_cmp(&x._addr, &y._addr) != 0 - * + * * def __lt__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) == -1 - * + * */ /* Python wrapper */ @@ -12351,10 +12351,10 @@ static PyObject *__pyx_pf_4dnet_4addr_14__lt__(struct __pyx_obj_4dnet_addr *__py __Pyx_RefNannySetupContext("__lt__", 1); /* "dnet.pyx":567 - * + * * def __lt__(addr x, addr y): * return addr_cmp(&x._addr, &y._addr) == -1 # <<<<<<<<<<<<<< - * + * * def __gt__(addr x, addr y): */ __Pyx_XDECREF(__pyx_r); @@ -12366,10 +12366,10 @@ static PyObject *__pyx_pf_4dnet_4addr_14__lt__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":566 * return addr_cmp(&x._addr, &y._addr) != 0 - * + * * def __lt__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) == -1 - * + * */ /* function exit code */ @@ -12385,10 +12385,10 @@ static PyObject *__pyx_pf_4dnet_4addr_14__lt__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":569 * return addr_cmp(&x._addr, &y._addr) == -1 - * + * * def __gt__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) == 1 - * + * */ /* Python wrapper */ @@ -12424,10 +12424,10 @@ static PyObject *__pyx_pf_4dnet_4addr_16__gt__(struct __pyx_obj_4dnet_addr *__py __Pyx_RefNannySetupContext("__gt__", 1); /* "dnet.pyx":570 - * + * * def __gt__(addr x, addr y): * return addr_cmp(&x._addr, &y._addr) == 1 # <<<<<<<<<<<<<< - * + * * def __le__(addr x, addr y): */ __Pyx_XDECREF(__pyx_r); @@ -12439,10 +12439,10 @@ static PyObject *__pyx_pf_4dnet_4addr_16__gt__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":569 * return addr_cmp(&x._addr, &y._addr) == -1 - * + * * def __gt__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) == 1 - * + * */ /* function exit code */ @@ -12458,10 +12458,10 @@ static PyObject *__pyx_pf_4dnet_4addr_16__gt__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":572 * return addr_cmp(&x._addr, &y._addr) == 1 - * + * * def __le__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) != 1 - * + * */ /* Python wrapper */ @@ -12497,10 +12497,10 @@ static PyObject *__pyx_pf_4dnet_4addr_18__le__(struct __pyx_obj_4dnet_addr *__py __Pyx_RefNannySetupContext("__le__", 1); /* "dnet.pyx":573 - * + * * def __le__(addr x, addr y): * return addr_cmp(&x._addr, &y._addr) != 1 # <<<<<<<<<<<<<< - * + * * def __ge__(addr x, addr y): */ __Pyx_XDECREF(__pyx_r); @@ -12512,10 +12512,10 @@ static PyObject *__pyx_pf_4dnet_4addr_18__le__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":572 * return addr_cmp(&x._addr, &y._addr) == 1 - * + * * def __le__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) != 1 - * + * */ /* function exit code */ @@ -12531,10 +12531,10 @@ static PyObject *__pyx_pf_4dnet_4addr_18__le__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":575 * return addr_cmp(&x._addr, &y._addr) != 1 - * + * * def __ge__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) != -1 - * + * */ /* Python wrapper */ @@ -12570,10 +12570,10 @@ static PyObject *__pyx_pf_4dnet_4addr_20__ge__(struct __pyx_obj_4dnet_addr *__py __Pyx_RefNannySetupContext("__ge__", 1); /* "dnet.pyx":576 - * + * * def __ge__(addr x, addr y): * return addr_cmp(&x._addr, &y._addr) != -1 # <<<<<<<<<<<<<< - * + * * def __contains__(self, addr other): */ __Pyx_XDECREF(__pyx_r); @@ -12585,10 +12585,10 @@ static PyObject *__pyx_pf_4dnet_4addr_20__ge__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":575 * return addr_cmp(&x._addr, &y._addr) != 1 - * + * * def __ge__(addr x, addr y): # <<<<<<<<<<<<<< * return addr_cmp(&x._addr, &y._addr) != -1 - * + * */ /* function exit code */ @@ -12604,7 +12604,7 @@ static PyObject *__pyx_pf_4dnet_4addr_20__ge__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":578 * return addr_cmp(&x._addr, &y._addr) != -1 - * + * * def __contains__(self, addr other): # <<<<<<<<<<<<<< * cdef addr_t s1, s2, o1, o2 * if addr_net(&self._addr, &s1) != 0 or \ @@ -12710,7 +12710,7 @@ static int __pyx_pf_4dnet_4addr_22__contains__(struct __pyx_obj_4dnet_addr *__py * addr_bcast(&other._addr, &o2) != 0: * return 0 # <<<<<<<<<<<<<< * return addr_cmp(&o1, &s1) >= 0 and addr_cmp(&o2, &s2) <= 0 - * + * */ __pyx_r = 0; goto __pyx_L0; @@ -12728,7 +12728,7 @@ static int __pyx_pf_4dnet_4addr_22__contains__(struct __pyx_obj_4dnet_addr *__py * addr_bcast(&other._addr, &o2) != 0: * return 0 * return addr_cmp(&o1, &s1) >= 0 and addr_cmp(&o2, &s2) <= 0 # <<<<<<<<<<<<<< - * + * * def __hash__(self): */ __pyx_t_1 = (addr_cmp((&__pyx_v_o1), (&__pyx_v_s1)) >= 0); @@ -12745,7 +12745,7 @@ static int __pyx_pf_4dnet_4addr_22__contains__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":578 * return addr_cmp(&x._addr, &y._addr) != -1 - * + * * def __contains__(self, addr other): # <<<<<<<<<<<<<< * cdef addr_t s1, s2, o1, o2 * if addr_net(&self._addr, &s1) != 0 or \ @@ -12758,7 +12758,7 @@ static int __pyx_pf_4dnet_4addr_22__contains__(struct __pyx_obj_4dnet_addr *__py /* "dnet.pyx":587 * return addr_cmp(&o1, &s1) >= 0 and addr_cmp(&o2, &s2) <= 0 - * + * * def __hash__(self): # <<<<<<<<<<<<<< * cdef long x, y, size * if self._addr.addr_type == ADDR_TYPE_ETH: size = 6 @@ -12950,7 +12950,7 @@ static Py_hash_t __pyx_pf_4dnet_4addr_24__hash__(struct __pyx_obj_4dnet_addr *__ * x = x ^ y * if x == -1: x = -2 # <<<<<<<<<<<<<< * return x - * + * */ __pyx_t_4 = (__pyx_v_x == -1L); if (__pyx_t_4) { @@ -12961,7 +12961,7 @@ static Py_hash_t __pyx_pf_4dnet_4addr_24__hash__(struct __pyx_obj_4dnet_addr *__ * x = x ^ y * if x == -1: x = -2 * return x # <<<<<<<<<<<<<< - * + * * def __int__(self): */ __pyx_r = __pyx_v_x; @@ -12969,7 +12969,7 @@ static Py_hash_t __pyx_pf_4dnet_4addr_24__hash__(struct __pyx_obj_4dnet_addr *__ /* "dnet.pyx":587 * return addr_cmp(&o1, &s1) >= 0 and addr_cmp(&o2, &s2) <= 0 - * + * * def __hash__(self): # <<<<<<<<<<<<<< * cdef long x, y, size * if self._addr.addr_type == ADDR_TYPE_ETH: size = 6 @@ -12990,7 +12990,7 @@ static Py_hash_t __pyx_pf_4dnet_4addr_24__hash__(struct __pyx_obj_4dnet_addr *__ /* "dnet.pyx":604 * return x - * + * * def __int__(self): # <<<<<<<<<<<<<< * if self._addr.addr_type != ADDR_TYPE_IP: * raise NotImplementedError @@ -13024,7 +13024,7 @@ static PyObject *__pyx_pf_4dnet_4addr_26__int__(struct __pyx_obj_4dnet_addr *__p __Pyx_RefNannySetupContext("__int__", 1); /* "dnet.pyx":605 - * + * * def __int__(self): * if self._addr.addr_type != ADDR_TYPE_IP: # <<<<<<<<<<<<<< * raise NotImplementedError @@ -13046,13 +13046,13 @@ static PyObject *__pyx_pf_4dnet_4addr_26__int__(struct __pyx_obj_4dnet_addr *__p * if self._addr.addr_type != ADDR_TYPE_IP: * raise NotImplementedError # <<<<<<<<<<<<<< * return ntohl(self._addr.addr_ip) - * + * */ __Pyx_Raise(__pyx_builtin_NotImplementedError, 0, 0, 0); __PYX_ERR(0, 606, __pyx_L1_error) /* "dnet.pyx":605 - * + * * def __int__(self): * if self._addr.addr_type != ADDR_TYPE_IP: # <<<<<<<<<<<<<< * raise NotImplementedError @@ -13064,7 +13064,7 @@ static PyObject *__pyx_pf_4dnet_4addr_26__int__(struct __pyx_obj_4dnet_addr *__p * if self._addr.addr_type != ADDR_TYPE_IP: * raise NotImplementedError * return ntohl(self._addr.addr_ip) # <<<<<<<<<<<<<< - * + * * def __long__(self): */ __Pyx_XDECREF(__pyx_r); @@ -13076,7 +13076,7 @@ static PyObject *__pyx_pf_4dnet_4addr_26__int__(struct __pyx_obj_4dnet_addr *__p /* "dnet.pyx":604 * return x - * + * * def __int__(self): # <<<<<<<<<<<<<< * if self._addr.addr_type != ADDR_TYPE_IP: * raise NotImplementedError @@ -13097,10 +13097,10 @@ static PyObject *__pyx_pf_4dnet_4addr_26__int__(struct __pyx_obj_4dnet_addr *__p /* "dnet.pyx":609 * return ntohl(self._addr.addr_ip) - * + * * def __long__(self): # <<<<<<<<<<<<<< * return self.__int__() - * + * */ /* Python wrapper */ @@ -13134,10 +13134,10 @@ static PyObject *__pyx_pf_4dnet_4addr_28__long__(struct __pyx_obj_4dnet_addr *__ __Pyx_RefNannySetupContext("__long__", 1); /* "dnet.pyx":610 - * + * * def __long__(self): * return self.__int__() # <<<<<<<<<<<<<< - * + * * def __iter__(self): */ __Pyx_XDECREF(__pyx_r); @@ -13171,10 +13171,10 @@ static PyObject *__pyx_pf_4dnet_4addr_28__long__(struct __pyx_obj_4dnet_addr *__ /* "dnet.pyx":609 * return ntohl(self._addr.addr_ip) - * + * * def __long__(self): # <<<<<<<<<<<<<< * return self.__int__() - * + * */ /* function exit code */ @@ -13193,7 +13193,7 @@ static PyObject *__pyx_pf_4dnet_4addr_28__long__(struct __pyx_obj_4dnet_addr *__ /* "dnet.pyx":612 * return self.__int__() - * + * * def __iter__(self): # <<<<<<<<<<<<<< * cdef addr_t a, b * if self._addr.addr_type != ADDR_TYPE_IP or \ @@ -13308,7 +13308,7 @@ static PyObject *__pyx_pf_4dnet_4addr_30__iter__(struct __pyx_obj_4dnet_addr *__ * yield next * """ * return __addr_ip4_iter(a.addr_ip, b.addr_ip) # <<<<<<<<<<<<<< - * + * * def __repr__(self): */ __Pyx_XDECREF(__pyx_r); @@ -13333,7 +13333,7 @@ static PyObject *__pyx_pf_4dnet_4addr_30__iter__(struct __pyx_obj_4dnet_addr *__ /* "dnet.pyx":612 * return self.__int__() - * + * * def __iter__(self): # <<<<<<<<<<<<<< * cdef addr_t a, b * if self._addr.addr_type != ADDR_TYPE_IP or \ @@ -13354,7 +13354,7 @@ static PyObject *__pyx_pf_4dnet_4addr_30__iter__(struct __pyx_obj_4dnet_addr *__ /* "dnet.pyx":628 * return __addr_ip4_iter(a.addr_ip, b.addr_ip) - * + * * def __repr__(self): # <<<<<<<<<<<<<< * cdef char *p * p = addr_ntoa(&self._addr) @@ -13410,7 +13410,7 @@ static PyObject *__pyx_pf_4dnet_4addr_32__repr__(struct __pyx_obj_4dnet_addr *__ * if not p: * return '' # <<<<<<<<<<<<<< * return p - * + * */ __Pyx_XDECREF(__pyx_r); __Pyx_INCREF(__pyx_kp_u_invalid_network_address_2); @@ -13430,7 +13430,7 @@ static PyObject *__pyx_pf_4dnet_4addr_32__repr__(struct __pyx_obj_4dnet_addr *__ * if not p: * return '' * return p # <<<<<<<<<<<<<< - * + * * cdef class __addr_ip4_iter: */ __Pyx_XDECREF(__pyx_r); @@ -13442,7 +13442,7 @@ static PyObject *__pyx_pf_4dnet_4addr_32__repr__(struct __pyx_obj_4dnet_addr *__ /* "dnet.pyx":628 * return __addr_ip4_iter(a.addr_ip, b.addr_ip) - * + * * def __repr__(self): # <<<<<<<<<<<<<< * cdef char *p * p = addr_ntoa(&self._addr) @@ -13466,7 +13466,7 @@ static PyObject *__pyx_pf_4dnet_4addr_32__repr__(struct __pyx_obj_4dnet_addr *__ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4addr_35__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_35__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -13474,7 +13474,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_4addr_35__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4addr_35__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_4addr_35__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_35__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -13546,7 +13546,7 @@ static PyObject *__pyx_pf_4dnet_4addr_34__reduce_cython__(CYTHON_UNUSED struct _ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4addr_37__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_37__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -13554,7 +13554,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_4addr_37__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4addr_37__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_4addr_37__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4addr_37__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -13675,7 +13675,7 @@ static PyObject *__pyx_pf_4dnet_4addr_36__setstate_cython__(CYTHON_UNUSED struct /* "dnet.pyx":639 * cdef unsigned long max # XXX - HBO - * + * * def __init__(self, cur, max): # <<<<<<<<<<<<<< * self.cur = ntohl(cur) * self.max = ntohl(max) @@ -13783,11 +13783,11 @@ static int __pyx_pf_4dnet_15__addr_ip4_iter___init__(struct __pyx_obj_4dnet___ad int __pyx_clineno = 0; /* "dnet.pyx":640 - * + * * def __init__(self, cur, max): * self.cur = ntohl(cur) # <<<<<<<<<<<<<< * self.max = ntohl(max) - * + * */ __pyx_t_1 = __Pyx_PyInt_As_unsigned_long(__pyx_v_cur); if (unlikely((__pyx_t_1 == (unsigned long)-1) && PyErr_Occurred())) __PYX_ERR(0, 640, __pyx_L1_error) __pyx_v_self->cur = ntohl(__pyx_t_1); @@ -13796,7 +13796,7 @@ static int __pyx_pf_4dnet_15__addr_ip4_iter___init__(struct __pyx_obj_4dnet___ad * def __init__(self, cur, max): * self.cur = ntohl(cur) * self.max = ntohl(max) # <<<<<<<<<<<<<< - * + * * def __next__(self): */ __pyx_t_1 = __Pyx_PyInt_As_unsigned_long(__pyx_v_max); if (unlikely((__pyx_t_1 == (unsigned long)-1) && PyErr_Occurred())) __PYX_ERR(0, 641, __pyx_L1_error) @@ -13804,7 +13804,7 @@ static int __pyx_pf_4dnet_15__addr_ip4_iter___init__(struct __pyx_obj_4dnet___ad /* "dnet.pyx":639 * cdef unsigned long max # XXX - HBO - * + * * def __init__(self, cur, max): # <<<<<<<<<<<<<< * self.cur = ntohl(cur) * self.max = ntohl(max) @@ -13822,7 +13822,7 @@ static int __pyx_pf_4dnet_15__addr_ip4_iter___init__(struct __pyx_obj_4dnet___ad /* "dnet.pyx":643 * self.max = ntohl(max) - * + * * def __next__(self): # <<<<<<<<<<<<<< * cdef addr next * if (self.cur <= self.max): @@ -13947,7 +13947,7 @@ static PyObject *__pyx_pf_4dnet_15__addr_ip4_iter_2__next__(struct __pyx_obj_4dn * return next * else: * raise StopIteration # <<<<<<<<<<<<<< - * + * * # */ /*else*/ { @@ -13957,7 +13957,7 @@ static PyObject *__pyx_pf_4dnet_15__addr_ip4_iter_2__next__(struct __pyx_obj_4dn /* "dnet.pyx":643 * self.max = ntohl(max) - * + * * def __next__(self): # <<<<<<<<<<<<<< * cdef addr next * if (self.cur <= self.max): @@ -13984,7 +13984,7 @@ static PyObject *__pyx_pf_4dnet_15__addr_ip4_iter_2__next__(struct __pyx_obj_4dn */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_5__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_5__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -13992,7 +13992,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_15__addr_ip4_iter_5__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_15__addr_ip4_iter_5__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_5__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_5__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -14250,7 +14250,7 @@ static PyObject *__pyx_pf_4dnet_15__addr_ip4_iter_4__reduce_cython__(struct __py */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_7__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_7__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -14258,7 +14258,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_15__addr_ip4_iter_7__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_15__addr_ip4_iter_7__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_7__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_15__addr_ip4_iter_7__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -14386,7 +14386,7 @@ static PyObject *__pyx_pf_4dnet_15__addr_ip4_iter_6__setstate_cython__(struct __ /* "dnet.pyx":690 * ARP_OP_REVREPLY = 4 # /[inserted by cython to avoid comment start]* response giving protocol address *[inserted by cython to avoid comment closer]/ - * + * * cdef int __arp_callback(arp_entry *entry, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * pa, ha = addr(), addr() @@ -14415,7 +14415,7 @@ static int __pyx_f_4dnet___arp_callback(struct arp_entry *__pyx_v_entry, void *_ __Pyx_RefNannySetupContext("__arp_callback", 1); /* "dnet.pyx":691 - * + * * cdef int __arp_callback(arp_entry *entry, void *arg) except -1: * f, a = arg # <<<<<<<<<<<<<< * pa, ha = addr(), addr() @@ -14433,11 +14433,11 @@ static int __pyx_f_4dnet___arp_callback(struct arp_entry *__pyx_v_entry, void *_ } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { - __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); - __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); + __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); + __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); } else { - __pyx_t_2 = PyList_GET_ITEM(sequence, 0); - __pyx_t_3 = PyList_GET_ITEM(sequence, 1); + __pyx_t_2 = PyList_GET_ITEM(sequence, 0); + __pyx_t_3 = PyList_GET_ITEM(sequence, 1); } __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(__pyx_t_3); @@ -14568,7 +14568,7 @@ static int __pyx_f_4dnet___arp_callback(struct arp_entry *__pyx_v_entry, void *_ * if not ret: * ret = 0 # <<<<<<<<<<<<<< * return ret - * + * */ __Pyx_INCREF(__pyx_int_0); __Pyx_DECREF_SET(__pyx_v_ret, __pyx_int_0); @@ -14586,7 +14586,7 @@ static int __pyx_f_4dnet___arp_callback(struct arp_entry *__pyx_v_entry, void *_ * if not ret: * ret = 0 * return ret # <<<<<<<<<<<<<< - * + * * cdef class arp: */ __pyx_t_7 = __Pyx_PyInt_As_int(__pyx_v_ret); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 698, __pyx_L1_error) @@ -14595,7 +14595,7 @@ static int __pyx_f_4dnet___arp_callback(struct arp_entry *__pyx_v_entry, void *_ /* "dnet.pyx":690 * ARP_OP_REVREPLY = 4 # /[inserted by cython to avoid comment start]* response giving protocol address *[inserted by cython to avoid comment closer]/ - * + * * cdef int __arp_callback(arp_entry *entry, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * pa, ha = addr(), addr() @@ -14621,7 +14621,7 @@ static int __pyx_f_4dnet___arp_callback(struct arp_entry *__pyx_v_entry, void *_ /* "dnet.pyx":707 * cdef arp_t *arp - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.arp = arp_open() * if not self.arp: @@ -14662,7 +14662,7 @@ static int __pyx_pf_4dnet_3arp___init__(struct __pyx_obj_4dnet_arp *__pyx_v_self __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":708 - * + * * def __init__(self): * self.arp = arp_open() # <<<<<<<<<<<<<< * if not self.arp: @@ -14675,7 +14675,7 @@ static int __pyx_pf_4dnet_3arp___init__(struct __pyx_obj_4dnet_arp *__pyx_v_self * self.arp = arp_open() * if not self.arp: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_1 = (!(__pyx_v_self->arp != 0)); if (unlikely(__pyx_t_1)) { @@ -14684,7 +14684,7 @@ static int __pyx_pf_4dnet_3arp___init__(struct __pyx_obj_4dnet_arp *__pyx_v_self * self.arp = arp_open() * if not self.arp: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def add(self, addr pa, addr ha): */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 710, __pyx_L1_error) @@ -14698,13 +14698,13 @@ static int __pyx_pf_4dnet_3arp___init__(struct __pyx_obj_4dnet_arp *__pyx_v_self * self.arp = arp_open() * if not self.arp: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":707 * cdef arp_t *arp - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.arp = arp_open() * if not self.arp: @@ -14724,14 +14724,14 @@ static int __pyx_pf_4dnet_3arp___init__(struct __pyx_obj_4dnet_arp *__pyx_v_self /* "dnet.pyx":712 * raise OSError, __oserror() - * + * * def add(self, addr pa, addr ha): # <<<<<<<<<<<<<< * """Add an entry to the system ARP table. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3arp_3add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_3add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -14740,7 +14740,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3arp_2add, "Add an entry to the system ARP table.\n\n Arguments:\n pa -- ADDR_TYPE_IP network address object\n ha -- ADDR_TYPE_ETH network address object\n "); static PyMethodDef __pyx_mdef_4dnet_3arp_3add = {"add", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3arp_3add, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3arp_2add}; -static PyObject *__pyx_pw_4dnet_3arp_3add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_3add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -14885,7 +14885,7 @@ static PyObject *__pyx_pf_4dnet_3arp_2add(struct __pyx_obj_4dnet_arp *__pyx_v_se * entry.arp_ha = ha._addr * if arp_add(self.arp, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (arp_add(__pyx_v_self->arp, (&__pyx_v_entry)) < 0); if (unlikely(__pyx_t_2)) { @@ -14894,7 +14894,7 @@ static PyObject *__pyx_pf_4dnet_3arp_2add(struct __pyx_obj_4dnet_arp *__pyx_v_se * entry.arp_ha = ha._addr * if arp_add(self.arp, &entry) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def delete(self, addr pa): */ __pyx_t_3 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 723, __pyx_L1_error) @@ -14908,16 +14908,16 @@ static PyObject *__pyx_pf_4dnet_3arp_2add(struct __pyx_obj_4dnet_arp *__pyx_v_se * entry.arp_ha = ha._addr * if arp_add(self.arp, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":712 * raise OSError, __oserror() - * + * * def add(self, addr pa, addr ha): # <<<<<<<<<<<<<< * """Add an entry to the system ARP table. - * + * */ /* function exit code */ @@ -14935,14 +14935,14 @@ static PyObject *__pyx_pf_4dnet_3arp_2add(struct __pyx_obj_4dnet_arp *__pyx_v_se /* "dnet.pyx":725 * raise OSError, __oserror() - * + * * def delete(self, addr pa): # <<<<<<<<<<<<<< * """Delete an entry from the system ARP table. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3arp_5delete(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_5delete(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -14951,7 +14951,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3arp_4delete, "Delete an entry from the system ARP table.\n\n Arguments:\n pa -- ADDR_TYPE_IP network address object\n "); static PyMethodDef __pyx_mdef_4dnet_3arp_5delete = {"delete", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3arp_5delete, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3arp_4delete}; -static PyObject *__pyx_pw_4dnet_3arp_5delete(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_5delete(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15070,7 +15070,7 @@ static PyObject *__pyx_pf_4dnet_3arp_4delete(struct __pyx_obj_4dnet_arp *__pyx_v * entry.arp_pa = pa._addr * if arp_delete(self.arp, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (arp_delete(__pyx_v_self->arp, (&__pyx_v_entry)) < 0); if (unlikely(__pyx_t_2)) { @@ -15079,7 +15079,7 @@ static PyObject *__pyx_pf_4dnet_3arp_4delete(struct __pyx_obj_4dnet_arp *__pyx_v * entry.arp_pa = pa._addr * if arp_delete(self.arp, &entry) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def get(self, addr pa): */ __pyx_t_3 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 734, __pyx_L1_error) @@ -15093,16 +15093,16 @@ static PyObject *__pyx_pf_4dnet_3arp_4delete(struct __pyx_obj_4dnet_arp *__pyx_v * entry.arp_pa = pa._addr * if arp_delete(self.arp, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":725 * raise OSError, __oserror() - * + * * def delete(self, addr pa): # <<<<<<<<<<<<<< * """Delete an entry from the system ARP table. - * + * */ /* function exit code */ @@ -15120,14 +15120,14 @@ static PyObject *__pyx_pf_4dnet_3arp_4delete(struct __pyx_obj_4dnet_arp *__pyx_v /* "dnet.pyx":736 * raise OSError, __oserror() - * + * * def get(self, addr pa): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system ARP table. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3arp_7get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_7get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15136,7 +15136,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3arp_6get, "Return the hardware address for a given protocol address\n in the system ARP table.\n\n Arguments:\n pa -- ADDR_TYPE_IP network address object\n "); static PyMethodDef __pyx_mdef_4dnet_3arp_7get = {"get", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3arp_7get, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3arp_6get}; -static PyObject *__pyx_pw_4dnet_3arp_7get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_7get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15266,7 +15266,7 @@ static PyObject *__pyx_pf_4dnet_3arp_6get(struct __pyx_obj_4dnet_arp *__pyx_v_se * if arp_get(self.arp, &entry) == 0: * return addr(addr_ntoa(&entry.arp_ha)) # <<<<<<<<<<<<<< * return None - * + * */ __Pyx_XDECREF(__pyx_r); __pyx_t_3 = __Pyx_PyStr_FromString(addr_ntoa((&__pyx_v_entry.arp_ha))); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 746, __pyx_L1_error) @@ -15291,7 +15291,7 @@ static PyObject *__pyx_pf_4dnet_3arp_6get(struct __pyx_obj_4dnet_arp *__pyx_v_se * if arp_get(self.arp, &entry) == 0: * return addr(addr_ntoa(&entry.arp_ha)) * return None # <<<<<<<<<<<<<< - * + * * def loop(self, callback, arg=None): */ __Pyx_XDECREF(__pyx_r); @@ -15300,7 +15300,7 @@ static PyObject *__pyx_pf_4dnet_3arp_6get(struct __pyx_obj_4dnet_arp *__pyx_v_se /* "dnet.pyx":736 * raise OSError, __oserror() - * + * * def get(self, addr pa): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system ARP table. @@ -15320,14 +15320,14 @@ static PyObject *__pyx_pf_4dnet_3arp_6get(struct __pyx_obj_4dnet_arp *__pyx_v_se /* "dnet.pyx":749 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system ARP table, invoking a user callback * with each entry, returning the status of the callback routine. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3arp_9loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_9loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15336,7 +15336,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3arp_8loop, "Iterate over the system ARP table, invoking a user callback\n with each entry, returning the status of the callback routine.\n\n Keyword arguments:\n callback -- callback function with ((pa, ha), arg) prototype.\n If this function returns a non-zero value, the loop\n will break early.\n arg -- optional callback argument\n "); static PyMethodDef __pyx_mdef_4dnet_3arp_9loop = {"loop", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3arp_9loop, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3arp_8loop}; -static PyObject *__pyx_pw_4dnet_3arp_9loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_9loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15454,7 +15454,7 @@ static PyObject *__pyx_pf_4dnet_3arp_8loop(struct __pyx_obj_4dnet_arp *__pyx_v_s * """ * _arg = (callback, arg) # <<<<<<<<<<<<<< * return arp_loop(self.arp, __arp_callback, _arg) - * + * */ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 759, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -15471,7 +15471,7 @@ static PyObject *__pyx_pf_4dnet_3arp_8loop(struct __pyx_obj_4dnet_arp *__pyx_v_s * """ * _arg = (callback, arg) * return arp_loop(self.arp, __arp_callback, _arg) # <<<<<<<<<<<<<< - * + * * def __iter__(self): */ __Pyx_XDECREF(__pyx_r); @@ -15483,7 +15483,7 @@ static PyObject *__pyx_pf_4dnet_3arp_8loop(struct __pyx_obj_4dnet_arp *__pyx_v_s /* "dnet.pyx":749 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system ARP table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -15503,7 +15503,7 @@ static PyObject *__pyx_pf_4dnet_3arp_8loop(struct __pyx_obj_4dnet_arp *__pyx_v_s /* "dnet.pyx":762 * return arp_loop(self.arp, __arp_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -15539,7 +15539,7 @@ static PyObject *__pyx_pf_4dnet_3arp_10__iter__(struct __pyx_obj_4dnet_arp *__py __Pyx_RefNannySetupContext("__iter__", 1); /* "dnet.pyx":763 - * + * * def __iter__(self): * l = [] # <<<<<<<<<<<<<< * self.loop(__iter_append, l) @@ -15555,7 +15555,7 @@ static PyObject *__pyx_pf_4dnet_3arp_10__iter__(struct __pyx_obj_4dnet_arp *__py * l = [] * self.loop(__iter_append, l) # <<<<<<<<<<<<<< * return iter(l) - * + * */ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_loop); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 764, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -15590,7 +15590,7 @@ static PyObject *__pyx_pf_4dnet_3arp_10__iter__(struct __pyx_obj_4dnet_arp *__py * l = [] * self.loop(__iter_append, l) * return iter(l) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ __Pyx_XDECREF(__pyx_r); @@ -15602,7 +15602,7 @@ static PyObject *__pyx_pf_4dnet_3arp_10__iter__(struct __pyx_obj_4dnet_arp *__py /* "dnet.pyx":762 * return arp_loop(self.arp, __arp_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -15625,7 +15625,7 @@ static PyObject *__pyx_pf_4dnet_3arp_10__iter__(struct __pyx_obj_4dnet_arp *__py /* "dnet.pyx":767 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.arp: * arp_close(self.arp) @@ -15648,11 +15648,11 @@ static void __pyx_pf_4dnet_3arp_12__dealloc__(struct __pyx_obj_4dnet_arp *__pyx_ int __pyx_t_1; /* "dnet.pyx":768 - * + * * def __dealloc__(self): * if self.arp: # <<<<<<<<<<<<<< * arp_close(self.arp) - * + * */ __pyx_t_1 = (__pyx_v_self->arp != 0); if (__pyx_t_1) { @@ -15661,23 +15661,23 @@ static void __pyx_pf_4dnet_3arp_12__dealloc__(struct __pyx_obj_4dnet_arp *__pyx_ * def __dealloc__(self): * if self.arp: * arp_close(self.arp) # <<<<<<<<<<<<<< - * + * * def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, */ (void)(arp_close(__pyx_v_self->arp)); /* "dnet.pyx":768 - * + * * def __dealloc__(self): * if self.arp: # <<<<<<<<<<<<<< * arp_close(self.arp) - * + * */ } /* "dnet.pyx":767 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.arp: * arp_close(self.arp) @@ -15693,7 +15693,7 @@ static void __pyx_pf_4dnet_3arp_12__dealloc__(struct __pyx_obj_4dnet_arp *__pyx_ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3arp_15__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_15__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15701,7 +15701,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_3arp_15__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3arp_15__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_3arp_15__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_15__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15773,7 +15773,7 @@ static PyObject *__pyx_pf_4dnet_3arp_14__reduce_cython__(CYTHON_UNUSED struct __ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3arp_17__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_17__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15781,7 +15781,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_3arp_17__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3arp_17__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_3arp_17__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3arp_17__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15902,7 +15902,7 @@ static PyObject *__pyx_pf_4dnet_3arp_16__setstate_cython__(CYTHON_UNUSED struct /* "dnet.pyx":771 * arp_close(self.arp) - * + * * def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, # <<<<<<<<<<<<<< * sha=ETH_ADDR_UNSPEC, spa=IP_ADDR_ANY, * dha=ETH_ADDR_UNSPEC, dpa=IP_ADDR_ANY): @@ -15960,7 +15960,7 @@ static PyObject *__pyx_pf_4dnet_44__defaults__(CYTHON_UNUSED PyObject *__pyx_sel } /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_29arp_pack_hdr_ethip(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_29arp_pack_hdr_ethip(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -15969,7 +15969,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_28arp_pack_hdr_ethip, "Return a packed binary string representing an Ethernet/IP ARP message.\n \n Keyword arguments:\n op -- operation (ARP_OP_*)\t\t\t(16-bit integer)\n sha -- sender Ethernet address\t\t(6-byte binary string)\n spa -- sender IP address\t\t\t(4-byte binary string)\n dha -- destination Ethernet address\t\t(6-byte binary string)\n dpa -- destination IP address\t\t(4-byte binary string)\n "); static PyMethodDef __pyx_mdef_4dnet_29arp_pack_hdr_ethip = {"arp_pack_hdr_ethip", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_29arp_pack_hdr_ethip, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_28arp_pack_hdr_ethip}; -static PyObject *__pyx_pw_4dnet_29arp_pack_hdr_ethip(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_29arp_pack_hdr_ethip(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -16180,7 +16180,7 @@ static PyObject *__pyx_pf_4dnet_28arp_pack_hdr_ethip(CYTHON_UNUSED PyObject *__p * __memcpy(&dp, dpa, 4) * __arp_pack_hdr_ethip(buf, op, sh, sp, dh, dp) # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(buf, 28) - * + * */ __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_op); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 790, __pyx_L1_error) arp_pack_hdr_ethip(__pyx_v_buf, __pyx_t_2, __pyx_v_sh, __pyx_v_sp, __pyx_v_dh, __pyx_v_dp); @@ -16189,7 +16189,7 @@ static PyObject *__pyx_pf_4dnet_28arp_pack_hdr_ethip(CYTHON_UNUSED PyObject *__p * __memcpy(&dp, dpa, 4) * __arp_pack_hdr_ethip(buf, op, sh, sp, dh, dp) * return PyBytes_FromStringAndSize(buf, 28) # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -16201,7 +16201,7 @@ static PyObject *__pyx_pf_4dnet_28arp_pack_hdr_ethip(CYTHON_UNUSED PyObject *__p /* "dnet.pyx":771 * arp_close(self.arp) - * + * * def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, # <<<<<<<<<<<<<< * sha=ETH_ADDR_UNSPEC, spa=IP_ADDR_ANY, * dha=ETH_ADDR_UNSPEC, dpa=IP_ADDR_ANY): @@ -16220,14 +16220,14 @@ static PyObject *__pyx_pf_4dnet_28arp_pack_hdr_ethip(CYTHON_UNUSED PyObject *__p /* "dnet.pyx":799 * void __icmp_pack_hdr "icmp_pack_hdr" (char *hdr, int type, int code) - * + * * def icmp_pack_hdr(itype, code): # <<<<<<<<<<<<<< * """Return a packed binary string representing an ICMP header. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_31icmp_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_31icmp_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -16236,7 +16236,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_30icmp_pack_hdr, "Return a packed binary string representing an ICMP header.\n\n Keyword arguments:\n itype -- ICMP type\t\t(8-bit integer)\n code -- ICMP code\t\t(8-bit integer)\n "); static PyMethodDef __pyx_mdef_4dnet_31icmp_pack_hdr = {"icmp_pack_hdr", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_31icmp_pack_hdr, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_30icmp_pack_hdr}; -static PyObject *__pyx_pw_4dnet_31icmp_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_31icmp_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -16355,7 +16355,7 @@ static PyObject *__pyx_pf_4dnet_30icmp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_se * cdef char buf[4] * __icmp_pack_hdr(buf, itype, code) # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(buf, sizeof(buf)) - * + * */ __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_itype); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 807, __pyx_L1_error) __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_code); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 807, __pyx_L1_error) @@ -16365,7 +16365,7 @@ static PyObject *__pyx_pf_4dnet_30icmp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_se * cdef char buf[4] * __icmp_pack_hdr(buf, itype, code) * return PyBytes_FromStringAndSize(buf, sizeof(buf)) # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -16377,10 +16377,10 @@ static PyObject *__pyx_pf_4dnet_30icmp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_se /* "dnet.pyx":799 * void __icmp_pack_hdr "icmp_pack_hdr" (char *hdr, int type, int code) - * + * * def icmp_pack_hdr(itype, code): # <<<<<<<<<<<<<< * """Return a packed binary string representing an ICMP header. - * + * */ /* function exit code */ @@ -16396,7 +16396,7 @@ static PyObject *__pyx_pf_4dnet_30icmp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_se /* "dnet.pyx":859 * TCP_OPT_MAX = 27 - * + * * def tcp_pack_hdr(sport, dport, seq=1, ack=0, flags=TH_SYN, # <<<<<<<<<<<<<< * win=TCP_WIN_MAX, urp=0): * """Return a packed binary string representing a TCP header. @@ -16454,7 +16454,7 @@ static PyObject *__pyx_pf_4dnet_46__defaults__(CYTHON_UNUSED PyObject *__pyx_sel } /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_33tcp_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_33tcp_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -16463,7 +16463,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_32tcp_pack_hdr, "Return a packed binary string representing a TCP header.\n\n Keyword arguments:\n sport -- source port\t\t(16-bit integer)\n dport -- destination port\t\t(16-bit integer)\n seq -- sequence number\t\t(32-bit integer)\n ack -- acknowledgment number\t(32-bit integer)\n flags -- control flags (TH_*)\t(8-bit integer bitmask)\n win -- window size\t\t(16-bit integer)\n urp -- urgent pointer\t\t(16-bit integer)\n "); static PyMethodDef __pyx_mdef_4dnet_33tcp_pack_hdr = {"tcp_pack_hdr", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_33tcp_pack_hdr, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_32tcp_pack_hdr}; -static PyObject *__pyx_pw_4dnet_33tcp_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_33tcp_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -16660,7 +16660,7 @@ static PyObject *__pyx_pf_4dnet_32tcp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel * cdef char buf[20] * __tcp_pack_hdr(buf, sport, dport, seq, ack, flags, win, urp) # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(buf, sizeof(buf)) - * + * */ __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_sport); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 873, __pyx_L1_error) __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_dport); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 873, __pyx_L1_error) @@ -16675,7 +16675,7 @@ static PyObject *__pyx_pf_4dnet_32tcp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel * cdef char buf[20] * __tcp_pack_hdr(buf, sport, dport, seq, ack, flags, win, urp) * return PyBytes_FromStringAndSize(buf, sizeof(buf)) # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -16687,7 +16687,7 @@ static PyObject *__pyx_pf_4dnet_32tcp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":859 * TCP_OPT_MAX = 27 - * + * * def tcp_pack_hdr(sport, dport, seq=1, ack=0, flags=TH_SYN, # <<<<<<<<<<<<<< * win=TCP_WIN_MAX, urp=0): * """Return a packed binary string representing a TCP header. @@ -16706,10 +16706,10 @@ static PyObject *__pyx_pf_4dnet_32tcp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":885 * UDP_PORT_MAX = 65535 - * + * * def udp_pack_hdr(sport, dport, ulen=UDP_HDR_LEN): # <<<<<<<<<<<<<< * """Return a packed binary string representing a UDP header. - * + * */ static PyObject *__pyx_pf_4dnet_48__defaults__(CYTHON_UNUSED PyObject *__pyx_self) { @@ -16752,7 +16752,7 @@ static PyObject *__pyx_pf_4dnet_48__defaults__(CYTHON_UNUSED PyObject *__pyx_sel } /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_35udp_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_35udp_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -16761,7 +16761,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_34udp_pack_hdr, "Return a packed binary string representing a UDP header.\n\n Keyword arguments:\n sport -- source port\t\t(16-bit integer)\n dport -- destination port\t\t(16-bit integer)\n ulen -- UDP header + data length\t(16-bit integer)\n "); static PyMethodDef __pyx_mdef_4dnet_35udp_pack_hdr = {"udp_pack_hdr", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_35udp_pack_hdr, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_34udp_pack_hdr}; -static PyObject *__pyx_pw_4dnet_35udp_pack_hdr(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_35udp_pack_hdr(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -16898,7 +16898,7 @@ static PyObject *__pyx_pf_4dnet_34udp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel * cdef char buf[8] * __udp_pack_hdr(buf, sport, dport, ulen) # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(buf, sizeof(buf)) - * + * */ __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_sport); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 894, __pyx_L1_error) __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_dport); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 894, __pyx_L1_error) @@ -16909,7 +16909,7 @@ static PyObject *__pyx_pf_4dnet_34udp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel * cdef char buf[8] * __udp_pack_hdr(buf, sport, dport, ulen) * return PyBytes_FromStringAndSize(buf, sizeof(buf)) # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -16921,10 +16921,10 @@ static PyObject *__pyx_pf_4dnet_34udp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":885 * UDP_PORT_MAX = 65535 - * + * * def udp_pack_hdr(sport, dport, ulen=UDP_HDR_LEN): # <<<<<<<<<<<<<< * """Return a packed binary string representing a UDP header. - * + * */ /* function exit code */ @@ -16940,7 +16940,7 @@ static PyObject *__pyx_pf_4dnet_34udp_pack_hdr(CYTHON_UNUSED PyObject *__pyx_sel /* "dnet.pyx":936 * INTF_FLAG_MULTICAST = 0x20 # /[inserted by cython to avoid comment start]* supports multicast (r/o) *[inserted by cython to avoid comment closer]/ - * + * * cdef object ifent_to_dict(intf_entry *entry): # <<<<<<<<<<<<<< * d = {} * d['name'] = entry.intf_name @@ -16964,7 +16964,7 @@ static PyObject *__pyx_f_4dnet_ifent_to_dict(struct intf_entry *__pyx_v_entry) { __Pyx_RefNannySetupContext("ifent_to_dict", 1); /* "dnet.pyx":937 - * + * * cdef object ifent_to_dict(intf_entry *entry): * d = {} # <<<<<<<<<<<<<< * d['name'] = entry.intf_name @@ -17202,7 +17202,7 @@ static PyObject *__pyx_f_4dnet_ifent_to_dict(struct intf_entry *__pyx_v_entry) { * l.append(addr(addr_ntoa(&entry.intf_alias_addrs[i]))) * d['alias_addrs'] = l # <<<<<<<<<<<<<< * return d - * + * */ if (unlikely((PyDict_SetItem(__pyx_v_d, __pyx_n_u_alias_addrs, __pyx_v_l) < 0))) __PYX_ERR(0, 952, __pyx_L1_error) @@ -17219,7 +17219,7 @@ static PyObject *__pyx_f_4dnet_ifent_to_dict(struct intf_entry *__pyx_v_entry) { * l.append(addr(addr_ntoa(&entry.intf_alias_addrs[i]))) * d['alias_addrs'] = l * return d # <<<<<<<<<<<<<< - * + * * cdef dict_to_ifent(object d, intf_entry *entry): */ __Pyx_XDECREF(__pyx_r); @@ -17229,7 +17229,7 @@ static PyObject *__pyx_f_4dnet_ifent_to_dict(struct intf_entry *__pyx_v_entry) { /* "dnet.pyx":936 * INTF_FLAG_MULTICAST = 0x20 # /[inserted by cython to avoid comment start]* supports multicast (r/o) *[inserted by cython to avoid comment closer]/ - * + * * cdef object ifent_to_dict(intf_entry *entry): # <<<<<<<<<<<<<< * d = {} * d['name'] = entry.intf_name @@ -17252,7 +17252,7 @@ static PyObject *__pyx_f_4dnet_ifent_to_dict(struct intf_entry *__pyx_v_entry) { /* "dnet.pyx":955 * return d - * + * * cdef dict_to_ifent(object d, intf_entry *entry): # <<<<<<<<<<<<<< * s = d['name'] * strlcpy(entry.intf_name, s, 16) @@ -17277,7 +17277,7 @@ static PyObject *__pyx_f_4dnet_dict_to_ifent(PyObject *__pyx_v_d, struct intf_en __Pyx_RefNannySetupContext("dict_to_ifent", 1); /* "dnet.pyx":956 - * + * * cdef dict_to_ifent(object d, intf_entry *entry): * s = d['name'] # <<<<<<<<<<<<<< * strlcpy(entry.intf_name, s, 16) @@ -17486,7 +17486,7 @@ static PyObject *__pyx_f_4dnet_dict_to_ifent(PyObject *__pyx_v_d, struct intf_en * entry.intf_alias_num = len(d['alias_addrs']) * for i from 0 <= i < entry.intf_alias_num: # <<<<<<<<<<<<<< * entry.intf_alias_addrs[i] = (d['alias_addrs'][i])._addr - * + * */ __pyx_t_5 = __pyx_v_entry->intf_alias_num; for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) { @@ -17495,7 +17495,7 @@ static PyObject *__pyx_f_4dnet_dict_to_ifent(PyObject *__pyx_v_d, struct intf_en * entry.intf_alias_num = len(d['alias_addrs']) * for i from 0 <= i < entry.intf_alias_num: * entry.intf_alias_addrs[i] = (d['alias_addrs'][i])._addr # <<<<<<<<<<<<<< - * + * * cdef int __intf_callback(intf_entry *entry, void *arg) except -1: */ __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_v_d, __pyx_n_u_alias_addrs); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 971, __pyx_L1_error) @@ -17519,7 +17519,7 @@ static PyObject *__pyx_f_4dnet_dict_to_ifent(PyObject *__pyx_v_d, struct intf_en /* "dnet.pyx":955 * return d - * + * * cdef dict_to_ifent(object d, intf_entry *entry): # <<<<<<<<<<<<<< * s = d['name'] * strlcpy(entry.intf_name, s, 16) @@ -17542,7 +17542,7 @@ static PyObject *__pyx_f_4dnet_dict_to_ifent(PyObject *__pyx_v_d, struct intf_en /* "dnet.pyx":973 * entry.intf_alias_addrs[i] = (d['alias_addrs'][i])._addr - * + * * cdef int __intf_callback(intf_entry *entry, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * ret = f(ifent_to_dict(entry), a) @@ -17568,7 +17568,7 @@ static int __pyx_f_4dnet___intf_callback(struct intf_entry *__pyx_v_entry, void __Pyx_RefNannySetupContext("__intf_callback", 1); /* "dnet.pyx":974 - * + * * cdef int __intf_callback(intf_entry *entry, void *arg) except -1: * f, a = arg # <<<<<<<<<<<<<< * ret = f(ifent_to_dict(entry), a) @@ -17586,11 +17586,11 @@ static int __pyx_f_4dnet___intf_callback(struct intf_entry *__pyx_v_entry, void } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { - __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); - __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); + __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); + __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); } else { - __pyx_t_2 = PyList_GET_ITEM(sequence, 0); - __pyx_t_3 = PyList_GET_ITEM(sequence, 1); + __pyx_t_2 = PyList_GET_ITEM(sequence, 0); + __pyx_t_3 = PyList_GET_ITEM(sequence, 1); } __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(__pyx_t_3); @@ -17679,7 +17679,7 @@ static int __pyx_f_4dnet___intf_callback(struct intf_entry *__pyx_v_entry, void * if not ret: * ret = 0 # <<<<<<<<<<<<<< * return ret - * + * */ __Pyx_INCREF(__pyx_int_0); __Pyx_DECREF_SET(__pyx_v_ret, __pyx_int_0); @@ -17697,7 +17697,7 @@ static int __pyx_f_4dnet___intf_callback(struct intf_entry *__pyx_v_entry, void * if not ret: * ret = 0 * return ret # <<<<<<<<<<<<<< - * + * * cdef class intf: */ __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_v_ret); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 978, __pyx_L1_error) @@ -17706,7 +17706,7 @@ static int __pyx_f_4dnet___intf_callback(struct intf_entry *__pyx_v_entry, void /* "dnet.pyx":973 * entry.intf_alias_addrs[i] = (d['alias_addrs'][i])._addr - * + * * cdef int __intf_callback(intf_entry *entry, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * ret = f(ifent_to_dict(entry), a) @@ -17730,7 +17730,7 @@ static int __pyx_f_4dnet___intf_callback(struct intf_entry *__pyx_v_entry, void /* "dnet.pyx":987 * cdef intf_t *intf - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.intf = intf_open() * if not self.intf: @@ -17771,7 +17771,7 @@ static int __pyx_pf_4dnet_4intf___init__(struct __pyx_obj_4dnet_intf *__pyx_v_se __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":988 - * + * * def __init__(self): * self.intf = intf_open() # <<<<<<<<<<<<<< * if not self.intf: @@ -17784,7 +17784,7 @@ static int __pyx_pf_4dnet_4intf___init__(struct __pyx_obj_4dnet_intf *__pyx_v_se * self.intf = intf_open() * if not self.intf: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_1 = (!(__pyx_v_self->intf != 0)); if (unlikely(__pyx_t_1)) { @@ -17793,7 +17793,7 @@ static int __pyx_pf_4dnet_4intf___init__(struct __pyx_obj_4dnet_intf *__pyx_v_se * self.intf = intf_open() * if not self.intf: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def get(self, name): */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 990, __pyx_L1_error) @@ -17807,13 +17807,13 @@ static int __pyx_pf_4dnet_4intf___init__(struct __pyx_obj_4dnet_intf *__pyx_v_se * self.intf = intf_open() * if not self.intf: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":987 * cdef intf_t *intf - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.intf = intf_open() * if not self.intf: @@ -17833,14 +17833,14 @@ static int __pyx_pf_4dnet_4intf___init__(struct __pyx_obj_4dnet_intf *__pyx_v_se /* "dnet.pyx":992 * raise OSError, __oserror() - * + * * def get(self, name): # <<<<<<<<<<<<<< * """Return the configuration for a network interface as a dict. * """ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4intf_3get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_3get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -17849,7 +17849,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4intf_2get, "Return the configuration for a network interface as a dict.\n "); static PyMethodDef __pyx_mdef_4dnet_4intf_3get = {"get", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4intf_3get, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4intf_2get}; -static PyObject *__pyx_pw_4dnet_4intf_3get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_3get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -17992,7 +17992,7 @@ static PyObject *__pyx_pf_4dnet_4intf_2get(struct __pyx_obj_4dnet_intf *__pyx_v_ * if intf_get(self.intf, ifent) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< * return ifent_to_dict(ifent) - * + * */ __pyx_t_3 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1001, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -18013,7 +18013,7 @@ static PyObject *__pyx_pf_4dnet_4intf_2get(struct __pyx_obj_4dnet_intf *__pyx_v_ * if intf_get(self.intf, ifent) < 0: * raise OSError, __oserror() * return ifent_to_dict(ifent) # <<<<<<<<<<<<<< - * + * * def get_src(self, addr src): */ __Pyx_XDECREF(__pyx_r); @@ -18025,7 +18025,7 @@ static PyObject *__pyx_pf_4dnet_4intf_2get(struct __pyx_obj_4dnet_intf *__pyx_v_ /* "dnet.pyx":992 * raise OSError, __oserror() - * + * * def get(self, name): # <<<<<<<<<<<<<< * """Return the configuration for a network interface as a dict. * """ @@ -18044,14 +18044,14 @@ static PyObject *__pyx_pf_4dnet_4intf_2get(struct __pyx_obj_4dnet_intf *__pyx_v_ /* "dnet.pyx":1004 * return ifent_to_dict(ifent) - * + * * def get_src(self, addr src): # <<<<<<<<<<<<<< * """Return the configuration for the interface whose primary address * matches the specified source address. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4intf_5get_src(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_5get_src(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18060,7 +18060,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4intf_4get_src, "Return the configuration for the interface whose primary address\n matches the specified source address.\n "); static PyMethodDef __pyx_mdef_4dnet_4intf_5get_src = {"get_src", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4intf_5get_src, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4intf_4get_src}; -static PyObject *__pyx_pw_4dnet_4intf_5get_src(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_5get_src(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18197,7 +18197,7 @@ static PyObject *__pyx_pf_4dnet_4intf_4get_src(struct __pyx_obj_4dnet_intf *__py * if intf_get_src(self.intf, ifent, &src._addr) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< * return ifent_to_dict(ifent) - * + * */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1013, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -18218,7 +18218,7 @@ static PyObject *__pyx_pf_4dnet_4intf_4get_src(struct __pyx_obj_4dnet_intf *__py * if intf_get_src(self.intf, ifent, &src._addr) < 0: * raise OSError, __oserror() * return ifent_to_dict(ifent) # <<<<<<<<<<<<<< - * + * * def get_dst(self, addr dst): */ __Pyx_XDECREF(__pyx_r); @@ -18230,7 +18230,7 @@ static PyObject *__pyx_pf_4dnet_4intf_4get_src(struct __pyx_obj_4dnet_intf *__py /* "dnet.pyx":1004 * return ifent_to_dict(ifent) - * + * * def get_src(self, addr src): # <<<<<<<<<<<<<< * """Return the configuration for the interface whose primary address * matches the specified source address. @@ -18249,14 +18249,14 @@ static PyObject *__pyx_pf_4dnet_4intf_4get_src(struct __pyx_obj_4dnet_intf *__py /* "dnet.pyx":1016 * return ifent_to_dict(ifent) - * + * * def get_dst(self, addr dst): # <<<<<<<<<<<<<< * """Return the configuration for the best interface with which to * reach the specified dst address. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4intf_7get_dst(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_7get_dst(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18265,7 +18265,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4intf_6get_dst, "Return the configuration for the best interface with which to\n reach the specified dst address.\n "); static PyMethodDef __pyx_mdef_4dnet_4intf_7get_dst = {"get_dst", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4intf_7get_dst, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4intf_6get_dst}; -static PyObject *__pyx_pw_4dnet_4intf_7get_dst(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_7get_dst(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18402,7 +18402,7 @@ static PyObject *__pyx_pf_4dnet_4intf_6get_dst(struct __pyx_obj_4dnet_intf *__py * if intf_get_dst(self.intf, ifent, &dst._addr) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< * return ifent_to_dict(ifent) - * + * */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1025, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -18423,7 +18423,7 @@ static PyObject *__pyx_pf_4dnet_4intf_6get_dst(struct __pyx_obj_4dnet_intf *__py * if intf_get_dst(self.intf, ifent, &dst._addr) < 0: * raise OSError, __oserror() * return ifent_to_dict(ifent) # <<<<<<<<<<<<<< - * + * * def set(self, d): */ __Pyx_XDECREF(__pyx_r); @@ -18435,7 +18435,7 @@ static PyObject *__pyx_pf_4dnet_4intf_6get_dst(struct __pyx_obj_4dnet_intf *__py /* "dnet.pyx":1016 * return ifent_to_dict(ifent) - * + * * def get_dst(self, addr dst): # <<<<<<<<<<<<<< * """Return the configuration for the best interface with which to * reach the specified dst address. @@ -18454,14 +18454,14 @@ static PyObject *__pyx_pf_4dnet_4intf_6get_dst(struct __pyx_obj_4dnet_intf *__py /* "dnet.pyx":1028 * return ifent_to_dict(ifent) - * + * * def set(self, d): # <<<<<<<<<<<<<< * """Set the configuration for an interface from a dict. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4intf_9set(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_9set(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18470,7 +18470,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4intf_8set, "Set the configuration for an interface from a dict.\n\n Dict values:\n name -- name of interface to set\t\t(string)\n flags -- interface flags (INTF_FLAG_*)\t(integer bitmask)\n mtu -- interface MTU\t\t\t(integer)\n addr -- primary network address\t\t(addr object)\n dst_addr -- point-to-point dst address\t(addr object)\n link_addr -- link-layer address\t\t(addr object)\n alias_addrs -- additional network addresses\t(list of addr objects)\n "); static PyMethodDef __pyx_mdef_4dnet_4intf_9set = {"set", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4intf_9set, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4intf_8set}; -static PyObject *__pyx_pw_4dnet_4intf_9set(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_9set(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18612,7 +18612,7 @@ static PyObject *__pyx_pf_4dnet_4intf_8set(struct __pyx_obj_4dnet_intf *__pyx_v_ * dict_to_ifent(d, ifent) * if intf_set(self.intf, ifent) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (intf_set(__pyx_v_self->intf, __pyx_v_ifent) < 0); if (unlikely(__pyx_t_2)) { @@ -18621,7 +18621,7 @@ static PyObject *__pyx_pf_4dnet_4intf_8set(struct __pyx_obj_4dnet_intf *__pyx_v_ * dict_to_ifent(d, ifent) * if intf_set(self.intf, ifent) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def loop(self, callback, arg=None): */ __pyx_t_1 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1047, __pyx_L1_error) @@ -18635,16 +18635,16 @@ static PyObject *__pyx_pf_4dnet_4intf_8set(struct __pyx_obj_4dnet_intf *__pyx_v_ * dict_to_ifent(d, ifent) * if intf_set(self.intf, ifent) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1028 * return ifent_to_dict(ifent) - * + * * def set(self, d): # <<<<<<<<<<<<<< * """Set the configuration for an interface from a dict. - * + * */ /* function exit code */ @@ -18662,14 +18662,14 @@ static PyObject *__pyx_pf_4dnet_4intf_8set(struct __pyx_obj_4dnet_intf *__pyx_v_ /* "dnet.pyx":1049 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system interface table, invoking a user callback * with each entry, returning the status of the callback routine. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4intf_11loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_11loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18678,7 +18678,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4intf_10loop, "Iterate over the system interface table, invoking a user callback\n with each entry, returning the status of the callback routine.\n\n Keyword arguments:\n callback -- callback function with (dict, arg) prototype.\n If this function returns a non-zero value, the loop\n will break early.\n arg -- optional callback argument\n "); static PyMethodDef __pyx_mdef_4dnet_4intf_11loop = {"loop", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4intf_11loop, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4intf_10loop}; -static PyObject *__pyx_pw_4dnet_4intf_11loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_11loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -18796,7 +18796,7 @@ static PyObject *__pyx_pf_4dnet_4intf_10loop(struct __pyx_obj_4dnet_intf *__pyx_ * """ * _arg = (callback, arg) # <<<<<<<<<<<<<< * return intf_loop(self.intf, __intf_callback, _arg) - * + * */ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1059, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -18813,7 +18813,7 @@ static PyObject *__pyx_pf_4dnet_4intf_10loop(struct __pyx_obj_4dnet_intf *__pyx_ * """ * _arg = (callback, arg) * return intf_loop(self.intf, __intf_callback, _arg) # <<<<<<<<<<<<<< - * + * * def __iter__(self): */ __Pyx_XDECREF(__pyx_r); @@ -18825,7 +18825,7 @@ static PyObject *__pyx_pf_4dnet_4intf_10loop(struct __pyx_obj_4dnet_intf *__pyx_ /* "dnet.pyx":1049 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system interface table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -18845,7 +18845,7 @@ static PyObject *__pyx_pf_4dnet_4intf_10loop(struct __pyx_obj_4dnet_intf *__pyx_ /* "dnet.pyx":1062 * return intf_loop(self.intf, __intf_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -18881,7 +18881,7 @@ static PyObject *__pyx_pf_4dnet_4intf_12__iter__(struct __pyx_obj_4dnet_intf *__ __Pyx_RefNannySetupContext("__iter__", 1); /* "dnet.pyx":1063 - * + * * def __iter__(self): * l = [] # <<<<<<<<<<<<<< * self.loop(__iter_append, l) @@ -18897,7 +18897,7 @@ static PyObject *__pyx_pf_4dnet_4intf_12__iter__(struct __pyx_obj_4dnet_intf *__ * l = [] * self.loop(__iter_append, l) # <<<<<<<<<<<<<< * return iter(l) - * + * */ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_loop); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1064, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -18932,7 +18932,7 @@ static PyObject *__pyx_pf_4dnet_4intf_12__iter__(struct __pyx_obj_4dnet_intf *__ * l = [] * self.loop(__iter_append, l) * return iter(l) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ __Pyx_XDECREF(__pyx_r); @@ -18944,7 +18944,7 @@ static PyObject *__pyx_pf_4dnet_4intf_12__iter__(struct __pyx_obj_4dnet_intf *__ /* "dnet.pyx":1062 * return intf_loop(self.intf, __intf_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -18967,7 +18967,7 @@ static PyObject *__pyx_pf_4dnet_4intf_12__iter__(struct __pyx_obj_4dnet_intf *__ /* "dnet.pyx":1067 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.intf: * intf_close(self.intf) @@ -18990,11 +18990,11 @@ static void __pyx_pf_4dnet_4intf_14__dealloc__(struct __pyx_obj_4dnet_intf *__py int __pyx_t_1; /* "dnet.pyx":1068 - * + * * def __dealloc__(self): * if self.intf: # <<<<<<<<<<<<<< * intf_close(self.intf) - * + * */ __pyx_t_1 = (__pyx_v_self->intf != 0); if (__pyx_t_1) { @@ -19003,23 +19003,23 @@ static void __pyx_pf_4dnet_4intf_14__dealloc__(struct __pyx_obj_4dnet_intf *__py * def __dealloc__(self): * if self.intf: * intf_close(self.intf) # <<<<<<<<<<<<<< - * + * * # */ (void)(intf_close(__pyx_v_self->intf)); /* "dnet.pyx":1068 - * + * * def __dealloc__(self): * if self.intf: # <<<<<<<<<<<<<< * intf_close(self.intf) - * + * */ } /* "dnet.pyx":1067 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.intf: * intf_close(self.intf) @@ -19035,7 +19035,7 @@ static void __pyx_pf_4dnet_4intf_14__dealloc__(struct __pyx_obj_4dnet_intf *__py */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4intf_17__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_17__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19043,7 +19043,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_4intf_17__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4intf_17__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_4intf_17__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_17__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19115,7 +19115,7 @@ static PyObject *__pyx_pf_4dnet_4intf_16__reduce_cython__(CYTHON_UNUSED struct _ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4intf_19__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_19__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19123,7 +19123,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_4intf_19__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4intf_19__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_4intf_19__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4intf_19__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19244,7 +19244,7 @@ static PyObject *__pyx_pf_4dnet_4intf_18__setstate_cython__(CYTHON_UNUSED struct /* "dnet.pyx":1089 * route_t *route_close(route_t *route) - * + * * cdef int __route_callback(route_entry *entry, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * dst, gw = addr(), addr() @@ -19273,7 +19273,7 @@ static int __pyx_f_4dnet___route_callback(struct route_entry *__pyx_v_entry, voi __Pyx_RefNannySetupContext("__route_callback", 1); /* "dnet.pyx":1090 - * + * * cdef int __route_callback(route_entry *entry, void *arg) except -1: * f, a = arg # <<<<<<<<<<<<<< * dst, gw = addr(), addr() @@ -19291,11 +19291,11 @@ static int __pyx_f_4dnet___route_callback(struct route_entry *__pyx_v_entry, voi } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { - __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); - __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); + __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); + __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); } else { - __pyx_t_2 = PyList_GET_ITEM(sequence, 0); - __pyx_t_3 = PyList_GET_ITEM(sequence, 1); + __pyx_t_2 = PyList_GET_ITEM(sequence, 0); + __pyx_t_3 = PyList_GET_ITEM(sequence, 1); } __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(__pyx_t_3); @@ -19426,7 +19426,7 @@ static int __pyx_f_4dnet___route_callback(struct route_entry *__pyx_v_entry, voi * if not ret: * ret = 0 # <<<<<<<<<<<<<< * return ret - * + * */ __Pyx_INCREF(__pyx_int_0); __Pyx_DECREF_SET(__pyx_v_ret, __pyx_int_0); @@ -19444,7 +19444,7 @@ static int __pyx_f_4dnet___route_callback(struct route_entry *__pyx_v_entry, voi * if not ret: * ret = 0 * return ret # <<<<<<<<<<<<<< - * + * * cdef class route: */ __pyx_t_7 = __Pyx_PyInt_As_int(__pyx_v_ret); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1097, __pyx_L1_error) @@ -19453,7 +19453,7 @@ static int __pyx_f_4dnet___route_callback(struct route_entry *__pyx_v_entry, voi /* "dnet.pyx":1089 * route_t *route_close(route_t *route) - * + * * cdef int __route_callback(route_entry *entry, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * dst, gw = addr(), addr() @@ -19479,7 +19479,7 @@ static int __pyx_f_4dnet___route_callback(struct route_entry *__pyx_v_entry, voi /* "dnet.pyx":1106 * cdef route_t *route - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.route = route_open() * if not self.route: @@ -19520,7 +19520,7 @@ static int __pyx_pf_4dnet_5route___init__(struct __pyx_obj_4dnet_route *__pyx_v_ __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":1107 - * + * * def __init__(self): * self.route = route_open() # <<<<<<<<<<<<<< * if not self.route: @@ -19533,7 +19533,7 @@ static int __pyx_pf_4dnet_5route___init__(struct __pyx_obj_4dnet_route *__pyx_v_ * self.route = route_open() * if not self.route: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_1 = (!(__pyx_v_self->route != 0)); if (unlikely(__pyx_t_1)) { @@ -19542,7 +19542,7 @@ static int __pyx_pf_4dnet_5route___init__(struct __pyx_obj_4dnet_route *__pyx_v_ * self.route = route_open() * if not self.route: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def add(self, addr dst, addr gw): */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1109, __pyx_L1_error) @@ -19556,13 +19556,13 @@ static int __pyx_pf_4dnet_5route___init__(struct __pyx_obj_4dnet_route *__pyx_v_ * self.route = route_open() * if not self.route: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1106 * cdef route_t *route - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.route = route_open() * if not self.route: @@ -19582,14 +19582,14 @@ static int __pyx_pf_4dnet_5route___init__(struct __pyx_obj_4dnet_route *__pyx_v_ /* "dnet.pyx":1111 * raise OSError, __oserror() - * + * * def add(self, addr dst, addr gw): # <<<<<<<<<<<<<< * """Add an entry to the system routing table. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_5route_3add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_3add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19598,7 +19598,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_5route_2add, "Add an entry to the system routing table.\n\n Arguments:\n dst -- ADDR_TYPE_IP network address object\n gw -- ADDR_TYPE_IP network address object\n "); static PyMethodDef __pyx_mdef_4dnet_5route_3add = {"add", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_5route_3add, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_5route_2add}; -static PyObject *__pyx_pw_4dnet_5route_3add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_3add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19743,7 +19743,7 @@ static PyObject *__pyx_pf_4dnet_5route_2add(struct __pyx_obj_4dnet_route *__pyx_ * entry.route_gw = gw._addr * if route_add(self.route, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (route_add(__pyx_v_self->route, (&__pyx_v_entry)) < 0); if (unlikely(__pyx_t_2)) { @@ -19752,7 +19752,7 @@ static PyObject *__pyx_pf_4dnet_5route_2add(struct __pyx_obj_4dnet_route *__pyx_ * entry.route_gw = gw._addr * if route_add(self.route, &entry) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def delete(self, addr dst): */ __pyx_t_3 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1122, __pyx_L1_error) @@ -19766,16 +19766,16 @@ static PyObject *__pyx_pf_4dnet_5route_2add(struct __pyx_obj_4dnet_route *__pyx_ * entry.route_gw = gw._addr * if route_add(self.route, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1111 * raise OSError, __oserror() - * + * * def add(self, addr dst, addr gw): # <<<<<<<<<<<<<< * """Add an entry to the system routing table. - * + * */ /* function exit code */ @@ -19793,14 +19793,14 @@ static PyObject *__pyx_pf_4dnet_5route_2add(struct __pyx_obj_4dnet_route *__pyx_ /* "dnet.pyx":1124 * raise OSError, __oserror() - * + * * def delete(self, addr dst): # <<<<<<<<<<<<<< * """Delete an entry from the system routing table. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_5route_5delete(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_5delete(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19809,7 +19809,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_5route_4delete, "Delete an entry from the system routing table.\n\n Arguments:\n dst -- ADDR_TYPE_IP network address object\n "); static PyMethodDef __pyx_mdef_4dnet_5route_5delete = {"delete", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_5route_5delete, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_5route_4delete}; -static PyObject *__pyx_pw_4dnet_5route_5delete(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_5delete(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19928,7 +19928,7 @@ static PyObject *__pyx_pf_4dnet_5route_4delete(struct __pyx_obj_4dnet_route *__p * entry.route_dst = dst._addr * if route_delete(self.route, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (route_delete(__pyx_v_self->route, (&__pyx_v_entry)) < 0); if (unlikely(__pyx_t_2)) { @@ -19937,7 +19937,7 @@ static PyObject *__pyx_pf_4dnet_5route_4delete(struct __pyx_obj_4dnet_route *__p * entry.route_dst = dst._addr * if route_delete(self.route, &entry) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def get(self, addr dst): */ __pyx_t_3 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1133, __pyx_L1_error) @@ -19951,16 +19951,16 @@ static PyObject *__pyx_pf_4dnet_5route_4delete(struct __pyx_obj_4dnet_route *__p * entry.route_dst = dst._addr * if route_delete(self.route, &entry) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1124 * raise OSError, __oserror() - * + * * def delete(self, addr dst): # <<<<<<<<<<<<<< * """Delete an entry from the system routing table. - * + * */ /* function exit code */ @@ -19978,14 +19978,14 @@ static PyObject *__pyx_pf_4dnet_5route_4delete(struct __pyx_obj_4dnet_route *__p /* "dnet.pyx":1135 * raise OSError, __oserror() - * + * * def get(self, addr dst): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system routing table. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_5route_7get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_7get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -19994,7 +19994,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_5route_6get, "Return the hardware address for a given protocol address\n in the system routing table.\n\n Arguments:\n dst -- ADDR_TYPE_IP network address object\n "); static PyMethodDef __pyx_mdef_4dnet_5route_7get = {"get", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_5route_7get, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_5route_6get}; -static PyObject *__pyx_pw_4dnet_5route_7get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_7get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -20124,7 +20124,7 @@ static PyObject *__pyx_pf_4dnet_5route_6get(struct __pyx_obj_4dnet_route *__pyx_ * if route_get(self.route, &entry) == 0: * return addr(addr_ntoa(&entry.route_gw)) # <<<<<<<<<<<<<< * return None - * + * */ __Pyx_XDECREF(__pyx_r); __pyx_t_3 = __Pyx_PyStr_FromString(addr_ntoa((&__pyx_v_entry.route_gw))); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1145, __pyx_L1_error) @@ -20149,7 +20149,7 @@ static PyObject *__pyx_pf_4dnet_5route_6get(struct __pyx_obj_4dnet_route *__pyx_ * if route_get(self.route, &entry) == 0: * return addr(addr_ntoa(&entry.route_gw)) * return None # <<<<<<<<<<<<<< - * + * * def loop(self, callback, arg=None): */ __Pyx_XDECREF(__pyx_r); @@ -20158,7 +20158,7 @@ static PyObject *__pyx_pf_4dnet_5route_6get(struct __pyx_obj_4dnet_route *__pyx_ /* "dnet.pyx":1135 * raise OSError, __oserror() - * + * * def get(self, addr dst): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system routing table. @@ -20178,14 +20178,14 @@ static PyObject *__pyx_pf_4dnet_5route_6get(struct __pyx_obj_4dnet_route *__pyx_ /* "dnet.pyx":1148 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system routing table, invoking a user callback * with each entry, returning the status of the callback routine. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_5route_9loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_9loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -20194,7 +20194,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_5route_8loop, "Iterate over the system routing table, invoking a user callback\n with each entry, returning the status of the callback routine.\n\n Keyword arguments:\n callback -- callback function with ((dst, gw), arg) prototype.\n If this function returns a non-zero value, the loop\n will break early.\n arg -- optional callback argument\n "); static PyMethodDef __pyx_mdef_4dnet_5route_9loop = {"loop", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_5route_9loop, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_5route_8loop}; -static PyObject *__pyx_pw_4dnet_5route_9loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_9loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -20312,7 +20312,7 @@ static PyObject *__pyx_pf_4dnet_5route_8loop(struct __pyx_obj_4dnet_route *__pyx * """ * _arg = (callback, arg) # <<<<<<<<<<<<<< * return route_loop(self.route, __route_callback, _arg) - * + * */ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1158, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -20329,7 +20329,7 @@ static PyObject *__pyx_pf_4dnet_5route_8loop(struct __pyx_obj_4dnet_route *__pyx * """ * _arg = (callback, arg) * return route_loop(self.route, __route_callback, _arg) # <<<<<<<<<<<<<< - * + * * def __iter__(self): */ __Pyx_XDECREF(__pyx_r); @@ -20341,7 +20341,7 @@ static PyObject *__pyx_pf_4dnet_5route_8loop(struct __pyx_obj_4dnet_route *__pyx /* "dnet.pyx":1148 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system routing table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -20361,7 +20361,7 @@ static PyObject *__pyx_pf_4dnet_5route_8loop(struct __pyx_obj_4dnet_route *__pyx /* "dnet.pyx":1161 * return route_loop(self.route, __route_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -20397,7 +20397,7 @@ static PyObject *__pyx_pf_4dnet_5route_10__iter__(struct __pyx_obj_4dnet_route * __Pyx_RefNannySetupContext("__iter__", 1); /* "dnet.pyx":1162 - * + * * def __iter__(self): * l = [] # <<<<<<<<<<<<<< * self.loop(__iter_append, l) @@ -20413,7 +20413,7 @@ static PyObject *__pyx_pf_4dnet_5route_10__iter__(struct __pyx_obj_4dnet_route * * l = [] * self.loop(__iter_append, l) # <<<<<<<<<<<<<< * return iter(l) - * + * */ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_loop); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1163, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -20448,7 +20448,7 @@ static PyObject *__pyx_pf_4dnet_5route_10__iter__(struct __pyx_obj_4dnet_route * * l = [] * self.loop(__iter_append, l) * return iter(l) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ __Pyx_XDECREF(__pyx_r); @@ -20460,7 +20460,7 @@ static PyObject *__pyx_pf_4dnet_5route_10__iter__(struct __pyx_obj_4dnet_route * /* "dnet.pyx":1161 * return route_loop(self.route, __route_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -20483,7 +20483,7 @@ static PyObject *__pyx_pf_4dnet_5route_10__iter__(struct __pyx_obj_4dnet_route * /* "dnet.pyx":1166 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.route: * route_close(self.route) @@ -20506,11 +20506,11 @@ static void __pyx_pf_4dnet_5route_12__dealloc__(struct __pyx_obj_4dnet_route *__ int __pyx_t_1; /* "dnet.pyx":1167 - * + * * def __dealloc__(self): * if self.route: # <<<<<<<<<<<<<< * route_close(self.route) - * + * */ __pyx_t_1 = (__pyx_v_self->route != 0); if (__pyx_t_1) { @@ -20519,23 +20519,23 @@ static void __pyx_pf_4dnet_5route_12__dealloc__(struct __pyx_obj_4dnet_route *__ * def __dealloc__(self): * if self.route: * route_close(self.route) # <<<<<<<<<<<<<< - * + * * # */ (void)(route_close(__pyx_v_self->route)); /* "dnet.pyx":1167 - * + * * def __dealloc__(self): * if self.route: # <<<<<<<<<<<<<< * route_close(self.route) - * + * */ } /* "dnet.pyx":1166 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.route: * route_close(self.route) @@ -20551,7 +20551,7 @@ static void __pyx_pf_4dnet_5route_12__dealloc__(struct __pyx_obj_4dnet_route *__ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_5route_15__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_15__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -20559,7 +20559,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_5route_15__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_5route_15__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_5route_15__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_15__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -20631,7 +20631,7 @@ static PyObject *__pyx_pf_4dnet_5route_14__reduce_cython__(CYTHON_UNUSED struct */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_5route_17__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_17__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -20639,7 +20639,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_5route_17__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_5route_17__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_5route_17__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_5route_17__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -20760,7 +20760,7 @@ static PyObject *__pyx_pf_4dnet_5route_16__setstate_cython__(CYTHON_UNUSED struc /* "dnet.pyx":1200 * FW_DIR_OUT = 2 - * + * * cdef object rule_to_dict(fw_rule *rule): # <<<<<<<<<<<<<< * d = {} * d['device'] = rule.fw_device @@ -20781,7 +20781,7 @@ static PyObject *__pyx_f_4dnet_rule_to_dict(struct fw_rule *__pyx_v_rule) { __Pyx_RefNannySetupContext("rule_to_dict", 1); /* "dnet.pyx":1201 - * + * * cdef object rule_to_dict(fw_rule *rule): * d = {} # <<<<<<<<<<<<<< * d['device'] = rule.fw_device @@ -21017,7 +21017,7 @@ static PyObject *__pyx_f_4dnet_rule_to_dict(struct fw_rule *__pyx_v_rule) { * if not (rule.fw_dport[0] == 0 and rule.fw_dport[1] == 0): * d['dport'] = [ rule.fw_dport[0], rule.fw_dport[1] ] # <<<<<<<<<<<<<< * return d - * + * */ __pyx_t_3 = __Pyx_PyInt_From_int((__pyx_v_rule->fw_dport[0])); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1214, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -21047,7 +21047,7 @@ static PyObject *__pyx_f_4dnet_rule_to_dict(struct fw_rule *__pyx_v_rule) { * if not (rule.fw_dport[0] == 0 and rule.fw_dport[1] == 0): * d['dport'] = [ rule.fw_dport[0], rule.fw_dport[1] ] * return d # <<<<<<<<<<<<<< - * + * * cdef dict_to_rule(object d, fw_rule *rule): */ __Pyx_XDECREF(__pyx_r); @@ -21057,7 +21057,7 @@ static PyObject *__pyx_f_4dnet_rule_to_dict(struct fw_rule *__pyx_v_rule) { /* "dnet.pyx":1200 * FW_DIR_OUT = 2 - * + * * cdef object rule_to_dict(fw_rule *rule): # <<<<<<<<<<<<<< * d = {} * d['device'] = rule.fw_device @@ -21079,7 +21079,7 @@ static PyObject *__pyx_f_4dnet_rule_to_dict(struct fw_rule *__pyx_v_rule) { /* "dnet.pyx":1217 * return d - * + * * cdef dict_to_rule(object d, fw_rule *rule): # <<<<<<<<<<<<<< * s = d['device'] * strlcpy(rule.fw_device, s, 16) @@ -21103,7 +21103,7 @@ static PyObject *__pyx_f_4dnet_dict_to_rule(PyObject *__pyx_v_d, struct fw_rule __Pyx_RefNannySetupContext("dict_to_rule", 1); /* "dnet.pyx":1218 - * + * * cdef dict_to_rule(object d, fw_rule *rule): * s = d['device'] # <<<<<<<<<<<<<< * strlcpy(rule.fw_device, s, 16) @@ -21373,7 +21373,7 @@ static PyObject *__pyx_f_4dnet_dict_to_rule(PyObject *__pyx_v_d, struct fw_rule * if 'dport' in d: * rule.fw_dport[0] = d['dport'][0] # <<<<<<<<<<<<<< * rule.fw_dport[1] = d['dport'][1] - * + * */ __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_v_d, __pyx_n_u_dport); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1235, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -21388,7 +21388,7 @@ static PyObject *__pyx_f_4dnet_dict_to_rule(PyObject *__pyx_v_d, struct fw_rule * if 'dport' in d: * rule.fw_dport[0] = d['dport'][0] * rule.fw_dport[1] = d['dport'][1] # <<<<<<<<<<<<<< - * + * * cdef int __fw_callback(fw_rule *rule, void *arg) except -1: */ __pyx_t_5 = __Pyx_PyObject_Dict_GetItem(__pyx_v_d, __pyx_n_u_dport); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1236, __pyx_L1_error) @@ -21411,7 +21411,7 @@ static PyObject *__pyx_f_4dnet_dict_to_rule(PyObject *__pyx_v_d, struct fw_rule /* "dnet.pyx":1217 * return d - * + * * cdef dict_to_rule(object d, fw_rule *rule): # <<<<<<<<<<<<<< * s = d['device'] * strlcpy(rule.fw_device, s, 16) @@ -21435,7 +21435,7 @@ static PyObject *__pyx_f_4dnet_dict_to_rule(PyObject *__pyx_v_d, struct fw_rule /* "dnet.pyx":1238 * rule.fw_dport[1] = d['dport'][1] - * + * * cdef int __fw_callback(fw_rule *rule, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * ret = f(rule_to_dict(rule), a) @@ -21461,7 +21461,7 @@ static int __pyx_f_4dnet___fw_callback(struct fw_rule *__pyx_v_rule, void *__pyx __Pyx_RefNannySetupContext("__fw_callback", 1); /* "dnet.pyx":1239 - * + * * cdef int __fw_callback(fw_rule *rule, void *arg) except -1: * f, a = arg # <<<<<<<<<<<<<< * ret = f(rule_to_dict(rule), a) @@ -21479,11 +21479,11 @@ static int __pyx_f_4dnet___fw_callback(struct fw_rule *__pyx_v_rule, void *__pyx } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { - __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); - __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); + __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); + __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); } else { - __pyx_t_2 = PyList_GET_ITEM(sequence, 0); - __pyx_t_3 = PyList_GET_ITEM(sequence, 1); + __pyx_t_2 = PyList_GET_ITEM(sequence, 0); + __pyx_t_3 = PyList_GET_ITEM(sequence, 1); } __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(__pyx_t_3); @@ -21572,7 +21572,7 @@ static int __pyx_f_4dnet___fw_callback(struct fw_rule *__pyx_v_rule, void *__pyx * if not ret: * ret = 0 # <<<<<<<<<<<<<< * return ret - * + * */ __Pyx_INCREF(__pyx_int_0); __Pyx_DECREF_SET(__pyx_v_ret, __pyx_int_0); @@ -21590,7 +21590,7 @@ static int __pyx_f_4dnet___fw_callback(struct fw_rule *__pyx_v_rule, void *__pyx * if not ret: * ret = 0 * return ret # <<<<<<<<<<<<<< - * + * * cdef class fw: */ __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_v_ret); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1243, __pyx_L1_error) @@ -21599,7 +21599,7 @@ static int __pyx_f_4dnet___fw_callback(struct fw_rule *__pyx_v_rule, void *__pyx /* "dnet.pyx":1238 * rule.fw_dport[1] = d['dport'][1] - * + * * cdef int __fw_callback(fw_rule *rule, void *arg) except -1: # <<<<<<<<<<<<<< * f, a = arg * ret = f(rule_to_dict(rule), a) @@ -21623,7 +21623,7 @@ static int __pyx_f_4dnet___fw_callback(struct fw_rule *__pyx_v_rule, void *__pyx /* "dnet.pyx":1252 * cdef fw_t *fw - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.fw = fw_open() * if not self.fw: @@ -21664,7 +21664,7 @@ static int __pyx_pf_4dnet_2fw___init__(struct __pyx_obj_4dnet_fw *__pyx_v_self) __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":1253 - * + * * def __init__(self): * self.fw = fw_open() # <<<<<<<<<<<<<< * if not self.fw: @@ -21677,7 +21677,7 @@ static int __pyx_pf_4dnet_2fw___init__(struct __pyx_obj_4dnet_fw *__pyx_v_self) * self.fw = fw_open() * if not self.fw: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_1 = (!(__pyx_v_self->fw != 0)); if (unlikely(__pyx_t_1)) { @@ -21686,7 +21686,7 @@ static int __pyx_pf_4dnet_2fw___init__(struct __pyx_obj_4dnet_fw *__pyx_v_self) * self.fw = fw_open() * if not self.fw: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def add(self, d): */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1255, __pyx_L1_error) @@ -21700,13 +21700,13 @@ static int __pyx_pf_4dnet_2fw___init__(struct __pyx_obj_4dnet_fw *__pyx_v_self) * self.fw = fw_open() * if not self.fw: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1252 * cdef fw_t *fw - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.fw = fw_open() * if not self.fw: @@ -21726,14 +21726,14 @@ static int __pyx_pf_4dnet_2fw___init__(struct __pyx_obj_4dnet_fw *__pyx_v_self) /* "dnet.pyx":1257 * raise OSError, __oserror() - * + * * def add(self, d): # <<<<<<<<<<<<<< * """Add a firewall rule specified as a dict. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2fw_3add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_3add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -21742,7 +21742,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_2fw_2add, "Add a firewall rule specified as a dict.\n\n Dict values:\n device -- interface name\t\t\t(string)\n op -- operation (FW_OP_*)\t\t\t(integer)\n dir -- direction (FW_DIR_*)\t\t\t(integer)\n proto -- IP protocol (IP_PROTO_*)\t\t(integer)\n src -- source address / net\t\t\t(addr object)\n dst -- destination address / net\t\t(addr object)\n sport -- source port range or ICMP type/mask\t(list of 2 integers)\n dport -- dest port range or ICMP code/mask\t(list of 2 integers)\n "); static PyMethodDef __pyx_mdef_4dnet_2fw_3add = {"add", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2fw_3add, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_2fw_2add}; -static PyObject *__pyx_pw_4dnet_2fw_3add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_3add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -21865,7 +21865,7 @@ static PyObject *__pyx_pf_4dnet_2fw_2add(struct __pyx_obj_4dnet_fw *__pyx_v_self * dict_to_rule(d, &rule) * if fw_add(self.fw, &rule) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (fw_add(__pyx_v_self->fw, (&__pyx_v_rule)) < 0); if (unlikely(__pyx_t_2)) { @@ -21874,7 +21874,7 @@ static PyObject *__pyx_pf_4dnet_2fw_2add(struct __pyx_obj_4dnet_fw *__pyx_v_self * dict_to_rule(d, &rule) * if fw_add(self.fw, &rule) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def delete(self, d): */ __pyx_t_1 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1274, __pyx_L1_error) @@ -21888,16 +21888,16 @@ static PyObject *__pyx_pf_4dnet_2fw_2add(struct __pyx_obj_4dnet_fw *__pyx_v_self * dict_to_rule(d, &rule) * if fw_add(self.fw, &rule) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1257 * raise OSError, __oserror() - * + * * def add(self, d): # <<<<<<<<<<<<<< * """Add a firewall rule specified as a dict. - * + * */ /* function exit code */ @@ -21915,14 +21915,14 @@ static PyObject *__pyx_pf_4dnet_2fw_2add(struct __pyx_obj_4dnet_fw *__pyx_v_self /* "dnet.pyx":1276 * raise OSError, __oserror() - * + * * def delete(self, d): # <<<<<<<<<<<<<< * """Delete a firewall rule specified as a dict.""" * cdef fw_rule rule */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2fw_5delete(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_5delete(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -21931,7 +21931,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_2fw_4delete, "Delete a firewall rule specified as a dict."); static PyMethodDef __pyx_mdef_4dnet_2fw_5delete = {"delete", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2fw_5delete, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_2fw_4delete}; -static PyObject *__pyx_pw_4dnet_2fw_5delete(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_5delete(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22054,7 +22054,7 @@ static PyObject *__pyx_pf_4dnet_2fw_4delete(struct __pyx_obj_4dnet_fw *__pyx_v_s * dict_to_rule(d, &rule) * if fw_delete(self.fw, &rule) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_2 = (fw_delete(__pyx_v_self->fw, (&__pyx_v_rule)) < 0); if (unlikely(__pyx_t_2)) { @@ -22063,7 +22063,7 @@ static PyObject *__pyx_pf_4dnet_2fw_4delete(struct __pyx_obj_4dnet_fw *__pyx_v_s * dict_to_rule(d, &rule) * if fw_delete(self.fw, &rule) < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def loop(self, callback, arg=None): */ __pyx_t_1 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1282, __pyx_L1_error) @@ -22077,13 +22077,13 @@ static PyObject *__pyx_pf_4dnet_2fw_4delete(struct __pyx_obj_4dnet_fw *__pyx_v_s * dict_to_rule(d, &rule) * if fw_delete(self.fw, &rule) < 0: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1276 * raise OSError, __oserror() - * + * * def delete(self, d): # <<<<<<<<<<<<<< * """Delete a firewall rule specified as a dict.""" * cdef fw_rule rule @@ -22104,14 +22104,14 @@ static PyObject *__pyx_pf_4dnet_2fw_4delete(struct __pyx_obj_4dnet_fw *__pyx_v_s /* "dnet.pyx":1284 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the local firewall ruleset, invoking a user callback * with each entry, returning the status of the callback routine. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2fw_7loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_7loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22120,7 +22120,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_2fw_6loop, "Iterate over the local firewall ruleset, invoking a user callback\n with each entry, returning the status of the callback routine.\n\n Keyword arguments:\n callback -- callback function with (dict, arg) prototype.\n If this function returns a non-zero value, the loop\n will break early.\n arg -- optional callback argument\n "); static PyMethodDef __pyx_mdef_4dnet_2fw_7loop = {"loop", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2fw_7loop, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_2fw_6loop}; -static PyObject *__pyx_pw_4dnet_2fw_7loop(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_7loop(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22238,7 +22238,7 @@ static PyObject *__pyx_pf_4dnet_2fw_6loop(struct __pyx_obj_4dnet_fw *__pyx_v_sel * """ * _arg = (callback, arg) # <<<<<<<<<<<<<< * return fw_loop(self.fw, __fw_callback, _arg) - * + * */ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1294, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -22255,7 +22255,7 @@ static PyObject *__pyx_pf_4dnet_2fw_6loop(struct __pyx_obj_4dnet_fw *__pyx_v_sel * """ * _arg = (callback, arg) * return fw_loop(self.fw, __fw_callback, _arg) # <<<<<<<<<<<<<< - * + * * def __iter__(self): */ __Pyx_XDECREF(__pyx_r); @@ -22267,7 +22267,7 @@ static PyObject *__pyx_pf_4dnet_2fw_6loop(struct __pyx_obj_4dnet_fw *__pyx_v_sel /* "dnet.pyx":1284 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the local firewall ruleset, invoking a user callback * with each entry, returning the status of the callback routine. @@ -22287,7 +22287,7 @@ static PyObject *__pyx_pf_4dnet_2fw_6loop(struct __pyx_obj_4dnet_fw *__pyx_v_sel /* "dnet.pyx":1297 * return fw_loop(self.fw, __fw_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -22323,7 +22323,7 @@ static PyObject *__pyx_pf_4dnet_2fw_8__iter__(struct __pyx_obj_4dnet_fw *__pyx_v __Pyx_RefNannySetupContext("__iter__", 1); /* "dnet.pyx":1298 - * + * * def __iter__(self): * l = [] # <<<<<<<<<<<<<< * self.loop(__iter_append, l) @@ -22339,7 +22339,7 @@ static PyObject *__pyx_pf_4dnet_2fw_8__iter__(struct __pyx_obj_4dnet_fw *__pyx_v * l = [] * self.loop(__iter_append, l) # <<<<<<<<<<<<<< * return iter(l) - * + * */ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_loop); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1299, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -22374,7 +22374,7 @@ static PyObject *__pyx_pf_4dnet_2fw_8__iter__(struct __pyx_obj_4dnet_fw *__pyx_v * l = [] * self.loop(__iter_append, l) * return iter(l) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ __Pyx_XDECREF(__pyx_r); @@ -22386,7 +22386,7 @@ static PyObject *__pyx_pf_4dnet_2fw_8__iter__(struct __pyx_obj_4dnet_fw *__pyx_v /* "dnet.pyx":1297 * return fw_loop(self.fw, __fw_callback, _arg) - * + * * def __iter__(self): # <<<<<<<<<<<<<< * l = [] * self.loop(__iter_append, l) @@ -22409,7 +22409,7 @@ static PyObject *__pyx_pf_4dnet_2fw_8__iter__(struct __pyx_obj_4dnet_fw *__pyx_v /* "dnet.pyx":1302 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.fw: * fw_close(self.fw) @@ -22432,11 +22432,11 @@ static void __pyx_pf_4dnet_2fw_10__dealloc__(struct __pyx_obj_4dnet_fw *__pyx_v_ int __pyx_t_1; /* "dnet.pyx":1303 - * + * * def __dealloc__(self): * if self.fw: # <<<<<<<<<<<<<< * fw_close(self.fw) - * + * */ __pyx_t_1 = (__pyx_v_self->fw != 0); if (__pyx_t_1) { @@ -22445,23 +22445,23 @@ static void __pyx_pf_4dnet_2fw_10__dealloc__(struct __pyx_obj_4dnet_fw *__pyx_v_ * def __dealloc__(self): * if self.fw: * fw_close(self.fw) # <<<<<<<<<<<<<< - * + * * # */ (void)(fw_close(__pyx_v_self->fw)); /* "dnet.pyx":1303 - * + * * def __dealloc__(self): * if self.fw: # <<<<<<<<<<<<<< * fw_close(self.fw) - * + * */ } /* "dnet.pyx":1302 * return iter(l) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.fw: * fw_close(self.fw) @@ -22477,7 +22477,7 @@ static void __pyx_pf_4dnet_2fw_10__dealloc__(struct __pyx_obj_4dnet_fw *__pyx_v_ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2fw_13__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_13__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22485,7 +22485,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_2fw_13__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2fw_13__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_2fw_13__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_13__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22557,7 +22557,7 @@ static PyObject *__pyx_pf_4dnet_2fw_12__reduce_cython__(CYTHON_UNUSED struct __p */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_2fw_15__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_15__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22565,7 +22565,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_2fw_15__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_2fw_15__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_2fw_15__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_2fw_15__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22686,7 +22686,7 @@ static PyObject *__pyx_pf_4dnet_2fw_14__setstate_cython__(CYTHON_UNUSED struct _ /* "dnet.pyx":1332 * cdef rand_t *rand - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.rand = rand_open() * if not self.rand: @@ -22727,7 +22727,7 @@ static int __pyx_pf_4dnet_4rand___init__(struct __pyx_obj_4dnet_rand *__pyx_v_se __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":1333 - * + * * def __init__(self): * self.rand = rand_open() # <<<<<<<<<<<<<< * if not self.rand: @@ -22740,7 +22740,7 @@ static int __pyx_pf_4dnet_4rand___init__(struct __pyx_obj_4dnet_rand *__pyx_v_se * self.rand = rand_open() * if not self.rand: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ __pyx_t_1 = (!(__pyx_v_self->rand != 0)); if (unlikely(__pyx_t_1)) { @@ -22749,7 +22749,7 @@ static int __pyx_pf_4dnet_4rand___init__(struct __pyx_obj_4dnet_rand *__pyx_v_se * self.rand = rand_open() * if not self.rand: * raise OSError, __oserror() # <<<<<<<<<<<<<< - * + * * def get(self, len): */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1335, __pyx_L1_error) @@ -22763,13 +22763,13 @@ static int __pyx_pf_4dnet_4rand___init__(struct __pyx_obj_4dnet_rand *__pyx_v_se * self.rand = rand_open() * if not self.rand: # <<<<<<<<<<<<<< * raise OSError, __oserror() - * + * */ } /* "dnet.pyx":1332 * cdef rand_t *rand - * + * * def __init__(self): # <<<<<<<<<<<<<< * self.rand = rand_open() * if not self.rand: @@ -22789,14 +22789,14 @@ static int __pyx_pf_4dnet_4rand___init__(struct __pyx_obj_4dnet_rand *__pyx_v_se /* "dnet.pyx":1337 * raise OSError, __oserror() - * + * * def get(self, len): # <<<<<<<<<<<<<< * """Return a string of random bytes. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_3get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_3get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22805,7 +22805,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4rand_2get, "Return a string of random bytes.\n \n Arguments:\n len -- number of random bytes to generate\n "); static PyMethodDef __pyx_mdef_4dnet_4rand_3get = {"get", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_3get, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4rand_2get}; -static PyObject *__pyx_pw_4dnet_4rand_3get(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_3get(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -22990,7 +22990,7 @@ static PyObject *__pyx_pf_4dnet_4rand_2get(struct __pyx_obj_4dnet_rand *__pyx_v_ * s = PyBytes_FromStringAndSize(p, len) * free(p) # <<<<<<<<<<<<<< * return s - * + * */ free(__pyx_v_p); @@ -22998,7 +22998,7 @@ static PyObject *__pyx_pf_4dnet_4rand_2get(struct __pyx_obj_4dnet_rand *__pyx_v_ * s = PyBytes_FromStringAndSize(p, len) * free(p) * return s # <<<<<<<<<<<<<< - * + * * def set(self, buf): */ __Pyx_XDECREF(__pyx_r); @@ -23008,10 +23008,10 @@ static PyObject *__pyx_pf_4dnet_4rand_2get(struct __pyx_obj_4dnet_rand *__pyx_v_ /* "dnet.pyx":1337 * raise OSError, __oserror() - * + * * def get(self, len): # <<<<<<<<<<<<<< * """Return a string of random bytes. - * + * */ /* function exit code */ @@ -23028,14 +23028,14 @@ static PyObject *__pyx_pf_4dnet_4rand_2get(struct __pyx_obj_4dnet_rand *__pyx_v_ /* "dnet.pyx":1354 * return s - * + * * def set(self, buf): # <<<<<<<<<<<<<< * """Initialize the PRNG from a known seed. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_5set(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_5set(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23044,7 +23044,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4rand_4set, "Initialize the PRNG from a known seed.\n \n Arguments:\n string -- binary string seed value\n "); static PyMethodDef __pyx_mdef_4dnet_4rand_5set = {"set", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_5set, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4rand_4set}; -static PyObject *__pyx_pw_4dnet_4rand_5set(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_5set(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23144,7 +23144,7 @@ static PyObject *__pyx_pf_4dnet_4rand_4set(struct __pyx_obj_4dnet_rand *__pyx_v_ * string -- binary string seed value * """ * rand_set(self.rand, buf, PyBytes_Size(buf)) # <<<<<<<<<<<<<< - * + * * def add(self, buf): */ __pyx_t_1 = __Pyx_PyObject_AsWritableString(__pyx_v_buf); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 1360, __pyx_L1_error) @@ -23152,10 +23152,10 @@ static PyObject *__pyx_pf_4dnet_4rand_4set(struct __pyx_obj_4dnet_rand *__pyx_v_ /* "dnet.pyx":1354 * return s - * + * * def set(self, buf): # <<<<<<<<<<<<<< * """Initialize the PRNG from a known seed. - * + * */ /* function exit code */ @@ -23172,14 +23172,14 @@ static PyObject *__pyx_pf_4dnet_4rand_4set(struct __pyx_obj_4dnet_rand *__pyx_v_ /* "dnet.pyx":1362 * rand_set(self.rand, buf, PyBytes_Size(buf)) - * + * * def add(self, buf): # <<<<<<<<<<<<<< * """Add additional entropy into the PRNG mix. - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_7add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_7add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23188,7 +23188,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4rand_6add, "Add additional entropy into the PRNG mix.\n\n Arguments:\n string -- binary string\n "); static PyMethodDef __pyx_mdef_4dnet_4rand_7add = {"add", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_7add, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4rand_6add}; -static PyObject *__pyx_pw_4dnet_4rand_7add(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_7add(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23288,7 +23288,7 @@ static PyObject *__pyx_pf_4dnet_4rand_6add(struct __pyx_obj_4dnet_rand *__pyx_v_ * string -- binary string * """ * rand_add(self.rand, buf, PyBytes_Size(buf)) # <<<<<<<<<<<<<< - * + * * def uint8(self): */ __pyx_t_1 = __Pyx_PyObject_AsWritableString(__pyx_v_buf); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 1368, __pyx_L1_error) @@ -23296,10 +23296,10 @@ static PyObject *__pyx_pf_4dnet_4rand_6add(struct __pyx_obj_4dnet_rand *__pyx_v_ /* "dnet.pyx":1362 * rand_set(self.rand, buf, PyBytes_Size(buf)) - * + * * def add(self, buf): # <<<<<<<<<<<<<< * """Add additional entropy into the PRNG mix. - * + * */ /* function exit code */ @@ -23316,14 +23316,14 @@ static PyObject *__pyx_pf_4dnet_4rand_6add(struct __pyx_obj_4dnet_rand *__pyx_v_ /* "dnet.pyx":1370 * rand_add(self.rand, buf, PyBytes_Size(buf)) - * + * * def uint8(self): # <<<<<<<<<<<<<< * """Return a random 8-bit integer.""" * return rand_uint8(self.rand) */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_9uint8(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_9uint8(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23332,7 +23332,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4rand_8uint8, "Return a random 8-bit integer."); static PyMethodDef __pyx_mdef_4dnet_4rand_9uint8 = {"uint8", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_9uint8, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4rand_8uint8}; -static PyObject *__pyx_pw_4dnet_4rand_9uint8(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_9uint8(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23377,7 +23377,7 @@ static PyObject *__pyx_pf_4dnet_4rand_8uint8(struct __pyx_obj_4dnet_rand *__pyx_ * def uint8(self): * """Return a random 8-bit integer.""" * return rand_uint8(self.rand) # <<<<<<<<<<<<<< - * + * * def uint16(self): */ __Pyx_XDECREF(__pyx_r); @@ -23389,7 +23389,7 @@ static PyObject *__pyx_pf_4dnet_4rand_8uint8(struct __pyx_obj_4dnet_rand *__pyx_ /* "dnet.pyx":1370 * rand_add(self.rand, buf, PyBytes_Size(buf)) - * + * * def uint8(self): # <<<<<<<<<<<<<< * """Return a random 8-bit integer.""" * return rand_uint8(self.rand) @@ -23408,14 +23408,14 @@ static PyObject *__pyx_pf_4dnet_4rand_8uint8(struct __pyx_obj_4dnet_rand *__pyx_ /* "dnet.pyx":1374 * return rand_uint8(self.rand) - * + * * def uint16(self): # <<<<<<<<<<<<<< * """Return a random 16-bit integer.""" * return rand_uint16(self.rand) */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_11uint16(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_11uint16(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23424,7 +23424,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4rand_10uint16, "Return a random 16-bit integer."); static PyMethodDef __pyx_mdef_4dnet_4rand_11uint16 = {"uint16", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_11uint16, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4rand_10uint16}; -static PyObject *__pyx_pw_4dnet_4rand_11uint16(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_11uint16(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23469,7 +23469,7 @@ static PyObject *__pyx_pf_4dnet_4rand_10uint16(struct __pyx_obj_4dnet_rand *__py * def uint16(self): * """Return a random 16-bit integer.""" * return rand_uint16(self.rand) # <<<<<<<<<<<<<< - * + * * def uint32(self): */ __Pyx_XDECREF(__pyx_r); @@ -23481,7 +23481,7 @@ static PyObject *__pyx_pf_4dnet_4rand_10uint16(struct __pyx_obj_4dnet_rand *__py /* "dnet.pyx":1374 * return rand_uint8(self.rand) - * + * * def uint16(self): # <<<<<<<<<<<<<< * """Return a random 16-bit integer.""" * return rand_uint16(self.rand) @@ -23500,14 +23500,14 @@ static PyObject *__pyx_pf_4dnet_4rand_10uint16(struct __pyx_obj_4dnet_rand *__py /* "dnet.pyx":1378 * return rand_uint16(self.rand) - * + * * def uint32(self): # <<<<<<<<<<<<<< * """Return a random 32-bit integer.""" * return rand_uint32(self.rand) */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_13uint32(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_13uint32(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23516,7 +23516,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4rand_12uint32, "Return a random 32-bit integer."); static PyMethodDef __pyx_mdef_4dnet_4rand_13uint32 = {"uint32", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_13uint32, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4rand_12uint32}; -static PyObject *__pyx_pw_4dnet_4rand_13uint32(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_13uint32(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23561,7 +23561,7 @@ static PyObject *__pyx_pf_4dnet_4rand_12uint32(struct __pyx_obj_4dnet_rand *__py * def uint32(self): * """Return a random 32-bit integer.""" * return rand_uint32(self.rand) # <<<<<<<<<<<<<< - * + * * def xrange(self, start, stop=None): */ __Pyx_XDECREF(__pyx_r); @@ -23573,7 +23573,7 @@ static PyObject *__pyx_pf_4dnet_4rand_12uint32(struct __pyx_obj_4dnet_rand *__py /* "dnet.pyx":1378 * return rand_uint16(self.rand) - * + * * def uint32(self): # <<<<<<<<<<<<<< * """Return a random 32-bit integer.""" * return rand_uint32(self.rand) @@ -23592,14 +23592,14 @@ static PyObject *__pyx_pf_4dnet_4rand_12uint32(struct __pyx_obj_4dnet_rand *__py /* "dnet.pyx":1382 * return rand_uint32(self.rand) - * + * * def xrange(self, start, stop=None): # <<<<<<<<<<<<<< * """xrange([start,] stop) -> xrange object - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_15xrange(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_15xrange(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23608,7 +23608,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_4rand_14xrange, "xrange([start,] stop) -> xrange object\n\n Return a random permutation iterator to walk an unsigned integer range,\n like xrange().\n "); static PyMethodDef __pyx_mdef_4dnet_4rand_15xrange = {"xrange", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_15xrange, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_4rand_14xrange}; -static PyObject *__pyx_pw_4dnet_4rand_15xrange(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_15xrange(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23773,7 +23773,7 @@ static PyObject *__pyx_pf_4dnet_4rand_14xrange(struct __pyx_obj_4dnet_rand *__py * return __rand_xrange(self, 0, start) * else: * return __rand_xrange(self, start, stop) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ /*else*/ { @@ -23799,10 +23799,10 @@ static PyObject *__pyx_pf_4dnet_4rand_14xrange(struct __pyx_obj_4dnet_rand *__py /* "dnet.pyx":1382 * return rand_uint32(self.rand) - * + * * def xrange(self, start, stop=None): # <<<<<<<<<<<<<< * """xrange([start,] stop) -> xrange object - * + * */ /* function exit code */ @@ -23819,7 +23819,7 @@ static PyObject *__pyx_pf_4dnet_4rand_14xrange(struct __pyx_obj_4dnet_rand *__py /* "dnet.pyx":1393 * return __rand_xrange(self, start, stop) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.rand: * rand_close(self.rand) @@ -23842,11 +23842,11 @@ static void __pyx_pf_4dnet_4rand_16__dealloc__(struct __pyx_obj_4dnet_rand *__py int __pyx_t_1; /* "dnet.pyx":1394 - * + * * def __dealloc__(self): * if self.rand: # <<<<<<<<<<<<<< * rand_close(self.rand) - * + * */ __pyx_t_1 = (__pyx_v_self->rand != 0); if (__pyx_t_1) { @@ -23855,23 +23855,23 @@ static void __pyx_pf_4dnet_4rand_16__dealloc__(struct __pyx_obj_4dnet_rand *__py * def __dealloc__(self): * if self.rand: * rand_close(self.rand) # <<<<<<<<<<<<<< - * + * * # Modified (variable block length) TEA by Niels Provos */ (void)(rand_close(__pyx_v_self->rand)); /* "dnet.pyx":1394 - * + * * def __dealloc__(self): * if self.rand: # <<<<<<<<<<<<<< * rand_close(self.rand) - * + * */ } /* "dnet.pyx":1393 * return __rand_xrange(self, start, stop) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.rand: * rand_close(self.rand) @@ -23887,7 +23887,7 @@ static void __pyx_pf_4dnet_4rand_16__dealloc__(struct __pyx_obj_4dnet_rand *__py */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_19__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_19__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23895,7 +23895,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_4rand_19__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_19__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_4rand_19__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_19__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23967,7 +23967,7 @@ static PyObject *__pyx_pf_4dnet_4rand_18__reduce_cython__(CYTHON_UNUSED struct _ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_4rand_21__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_21__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -23975,7 +23975,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_4rand_21__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_4rand_21__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_4rand_21__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_4rand_21__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -24096,10 +24096,10 @@ static PyObject *__pyx_pf_4dnet_4rand_20__setstate_cython__(CYTHON_UNUSED struct /* "dnet.pyx":1410 * cdef int left, right, kshift - * + * * def __init__(self, r, start, stop): # <<<<<<<<<<<<<< * cdef unsigned int bits - * + * */ /* Python wrapper */ @@ -24223,7 +24223,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand /* "dnet.pyx":1413 * cdef unsigned int bits - * + * * self.rand = (r).rand # <<<<<<<<<<<<<< * if PyLong_Check(start): * self.start = PyLong_AsLong(start) @@ -24232,7 +24232,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand __pyx_v_self->rand = __pyx_t_1; /* "dnet.pyx":1414 - * + * * self.rand = (r).rand * if PyLong_Check(start): # <<<<<<<<<<<<<< * self.start = PyLong_AsLong(start) @@ -24251,7 +24251,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand __pyx_v_self->start = PyLong_AsLong(__pyx_v_start); /* "dnet.pyx":1414 - * + * * self.rand = (r).rand * if PyLong_Check(start): # <<<<<<<<<<<<<< * self.start = PyLong_AsLong(start) @@ -24293,7 +24293,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand * self.start = PyLong_AsUnsignedLong(start) * else: * raise TypeError, 'start must be an integer' # <<<<<<<<<<<<<< - * + * * if PyLong_Check(start): */ /*else*/ { @@ -24304,7 +24304,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand /* "dnet.pyx":1421 * raise TypeError, 'start must be an integer' - * + * * if PyLong_Check(start): # <<<<<<<<<<<<<< * self.max = PyLong_AsLong(stop) - self.start * elif PyLong_Check(start): @@ -24313,7 +24313,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand if (__pyx_t_2) { /* "dnet.pyx":1422 - * + * * if PyLong_Check(start): * self.max = PyLong_AsLong(stop) - self.start # <<<<<<<<<<<<<< * elif PyLong_Check(start): @@ -24323,7 +24323,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand /* "dnet.pyx":1421 * raise TypeError, 'start must be an integer' - * + * * if PyLong_Check(start): # <<<<<<<<<<<<<< * self.max = PyLong_AsLong(stop) - self.start * elif PyLong_Check(start): @@ -24364,7 +24364,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand * self.max = PyLong_AsUnsignedLong(stop) - self.start * else: * raise TypeError, 'stop must be an integer' # <<<<<<<<<<<<<< - * + * * # XXX - permute range once only! */ /*else*/ { @@ -24374,17 +24374,17 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand __pyx_L4:; /* "dnet.pyx":1429 - * + * * # XXX - permute range once only! * rand_get(self.rand, self.sbox, sizeof(self.sbox)) # <<<<<<<<<<<<<< - * + * * bits = 0 */ (void)(rand_get(__pyx_v_self->rand, ((char *)__pyx_v_self->sbox), (sizeof(__pyx_v_self->sbox)))); /* "dnet.pyx":1431 * rand_get(self.rand, self.sbox, sizeof(self.sbox)) - * + * * bits = 0 # <<<<<<<<<<<<<< * while self.max > (1 << bits): * bits = bits + 1 @@ -24392,11 +24392,11 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand __pyx_v_bits = 0; /* "dnet.pyx":1432 - * + * * bits = 0 * while self.max > (1 << bits): # <<<<<<<<<<<<<< * bits = bits + 1 - * + * */ while (1) { __pyx_t_2 = (__pyx_v_self->max > (1 << __pyx_v_bits)); @@ -24406,7 +24406,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand * bits = 0 * while self.max > (1 << bits): * bits = bits + 1 # <<<<<<<<<<<<<< - * + * * self.left = int(bits / 2) */ __pyx_v_bits = (__pyx_v_bits + 1); @@ -24414,7 +24414,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand /* "dnet.pyx":1435 * bits = bits + 1 - * + * * self.left = int(bits / 2) # <<<<<<<<<<<<<< * self.right = bits - self.left * self.mask = (1 << bits) - 1 @@ -24422,11 +24422,11 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand __pyx_v_self->left = ((int)(((double)__pyx_v_bits) / 2.0)); /* "dnet.pyx":1436 - * + * * self.left = int(bits / 2) * self.right = bits - self.left # <<<<<<<<<<<<<< * self.mask = (1 << bits) - 1 - * + * */ __pyx_v_self->right = (__pyx_v_bits - __pyx_v_self->left); @@ -24434,14 +24434,14 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand * self.left = int(bits / 2) * self.right = bits - self.left * self.mask = (1 << bits) - 1 # <<<<<<<<<<<<<< - * + * * if TEASBOXSIZE < (1 << self.left): */ __pyx_v_self->mask = ((1 << __pyx_v_bits) - 1); /* "dnet.pyx":1439 * self.mask = (1 << bits) - 1 - * + * * if TEASBOXSIZE < (1 << self.left): # <<<<<<<<<<<<<< * self.sboxmask = TEASBOXSIZE - 1 * self.kshift = TEASBOXSHIFT @@ -24450,7 +24450,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand if (__pyx_t_2) { /* "dnet.pyx":1440 - * + * * if TEASBOXSIZE < (1 << self.left): * self.sboxmask = TEASBOXSIZE - 1 # <<<<<<<<<<<<<< * self.kshift = TEASBOXSHIFT @@ -24469,7 +24469,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand /* "dnet.pyx":1439 * self.mask = (1 << bits) - 1 - * + * * if TEASBOXSIZE < (1 << self.left): # <<<<<<<<<<<<<< * self.sboxmask = TEASBOXSIZE - 1 * self.kshift = TEASBOXSHIFT @@ -24482,7 +24482,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand * else: * self.sboxmask = (1 << self.left) - 1 # <<<<<<<<<<<<<< * self.kshift = self.left - * + * */ /*else*/ { __pyx_v_self->sboxmask = ((1 << __pyx_v_self->left) - 1); @@ -24491,7 +24491,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand * else: * self.sboxmask = (1 << self.left) - 1 * self.kshift = self.left # <<<<<<<<<<<<<< - * + * * def __iter__(self): */ __pyx_t_3 = __pyx_v_self->left; @@ -24501,10 +24501,10 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand /* "dnet.pyx":1410 * cdef int left, right, kshift - * + * * def __init__(self, r, start, stop): # <<<<<<<<<<<<<< * cdef unsigned int bits - * + * */ /* function exit code */ @@ -24519,7 +24519,7 @@ static int __pyx_pf_4dnet_13__rand_xrange___init__(struct __pyx_obj_4dnet___rand /* "dnet.pyx":1446 * self.kshift = self.left - * + * * def __iter__(self): # <<<<<<<<<<<<<< * self.cur = self.enc = 0 * # XXX - rewind iterator, but do not permute range again! @@ -24546,7 +24546,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_2__iter__(struct __pyx_obj_4dnet __Pyx_RefNannySetupContext("__iter__", 1); /* "dnet.pyx":1447 - * + * * def __iter__(self): * self.cur = self.enc = 0 # <<<<<<<<<<<<<< * # XXX - rewind iterator, but do not permute range again! @@ -24559,7 +24559,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_2__iter__(struct __pyx_obj_4dnet * self.cur = self.enc = 0 * # XXX - rewind iterator, but do not permute range again! * return self # <<<<<<<<<<<<<< - * + * * def __len__(self): */ __Pyx_XDECREF(__pyx_r); @@ -24569,7 +24569,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_2__iter__(struct __pyx_obj_4dnet /* "dnet.pyx":1446 * self.kshift = self.left - * + * * def __iter__(self): # <<<<<<<<<<<<<< * self.cur = self.enc = 0 * # XXX - rewind iterator, but do not permute range again! @@ -24584,10 +24584,10 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_2__iter__(struct __pyx_obj_4dnet /* "dnet.pyx":1451 * return self - * + * * def __len__(self): # <<<<<<<<<<<<<< * return self.max - * + * */ /* Python wrapper */ @@ -24609,10 +24609,10 @@ static Py_ssize_t __pyx_pf_4dnet_13__rand_xrange_4__len__(struct __pyx_obj_4dnet Py_ssize_t __pyx_r; /* "dnet.pyx":1452 - * + * * def __len__(self): * return self.max # <<<<<<<<<<<<<< - * + * * def __next__(self): */ __pyx_r = __pyx_v_self->max; @@ -24620,10 +24620,10 @@ static Py_ssize_t __pyx_pf_4dnet_13__rand_xrange_4__len__(struct __pyx_obj_4dnet /* "dnet.pyx":1451 * return self - * + * * def __len__(self): # <<<<<<<<<<<<<< * return self.max - * + * */ /* function exit code */ @@ -24633,10 +24633,10 @@ static Py_ssize_t __pyx_pf_4dnet_13__rand_xrange_4__len__(struct __pyx_obj_4dnet /* "dnet.pyx":1454 * return self.max - * + * * def __next__(self): # <<<<<<<<<<<<<< * cdef unsigned long c, sum - * + * */ /* Python wrapper */ @@ -24672,7 +24672,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_6__next__(struct __pyx_obj_4dnet /* "dnet.pyx":1457 * cdef unsigned long c, sum - * + * * if self.cur == self.max: # <<<<<<<<<<<<<< * raise StopIteration * self.cur = self.cur + 1 @@ -24681,7 +24681,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_6__next__(struct __pyx_obj_4dnet if (unlikely(__pyx_t_1)) { /* "dnet.pyx":1458 - * + * * if self.cur == self.max: * raise StopIteration # <<<<<<<<<<<<<< * self.cur = self.cur + 1 @@ -24692,7 +24692,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_6__next__(struct __pyx_obj_4dnet /* "dnet.pyx":1457 * cdef unsigned long c, sum - * + * * if self.cur == self.max: # <<<<<<<<<<<<<< * raise StopIteration * self.cur = self.cur + 1 @@ -24816,7 +24816,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_6__next__(struct __pyx_obj_4dnet * if c < self.max: * break # <<<<<<<<<<<<<< * return self.start + c - * + * */ goto __pyx_L5_break; @@ -24835,7 +24835,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_6__next__(struct __pyx_obj_4dnet * if c < self.max: * break * return self.start + c # <<<<<<<<<<<<<< - * + * * # */ __Pyx_XDECREF(__pyx_r); @@ -24847,10 +24847,10 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_6__next__(struct __pyx_obj_4dnet /* "dnet.pyx":1454 * return self.max - * + * * def __next__(self): # <<<<<<<<<<<<<< * cdef unsigned long c, sum - * + * */ /* function exit code */ @@ -24873,7 +24873,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_6__next__(struct __pyx_obj_4dnet */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_13__rand_xrange_9__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_13__rand_xrange_9__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -24881,7 +24881,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_13__rand_xrange_9__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_13__rand_xrange_9__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_13__rand_xrange_9__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_13__rand_xrange_9__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -24953,7 +24953,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_8__reduce_cython__(CYTHON_UNUSED */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_13__rand_xrange_11__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_13__rand_xrange_11__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -24961,7 +24961,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_13__rand_xrange_11__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_13__rand_xrange_11__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_13__rand_xrange_11__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_13__rand_xrange_11__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25082,7 +25082,7 @@ static PyObject *__pyx_pf_4dnet_13__rand_xrange_10__setstate_cython__(CYTHON_UNU /* "dnet.pyx":1501 * cdef int mtu - * + * * def __init__(self, addr src, addr dst, mtu=1500): # <<<<<<<<<<<<<< * self.tun = tun_open(&src._addr, &dst._addr, mtu) * self.mtu = mtu @@ -25216,7 +25216,7 @@ static int __pyx_pf_4dnet_3tun___init__(struct __pyx_obj_4dnet_tun *__pyx_v_self __Pyx_RefNannySetupContext("__init__", 1); /* "dnet.pyx":1502 - * + * * def __init__(self, addr src, addr dst, mtu=1500): * self.tun = tun_open(&src._addr, &dst._addr, mtu) # <<<<<<<<<<<<<< * self.mtu = mtu @@ -25250,7 +25250,7 @@ static int __pyx_pf_4dnet_3tun___init__(struct __pyx_obj_4dnet_tun *__pyx_v_self * if not self.tun: * raise OSError, __oserror() # <<<<<<<<<<<<<< * self.buf = malloc(mtu) - * + * */ __pyx_t_3 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1505, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -25271,7 +25271,7 @@ static int __pyx_pf_4dnet_3tun___init__(struct __pyx_obj_4dnet_tun *__pyx_v_self * if not self.tun: * raise OSError, __oserror() * self.buf = malloc(mtu) # <<<<<<<<<<<<<< - * + * * property name: */ __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_mtu); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1506, __pyx_L1_error) @@ -25279,7 +25279,7 @@ static int __pyx_pf_4dnet_3tun___init__(struct __pyx_obj_4dnet_tun *__pyx_v_self /* "dnet.pyx":1501 * cdef int mtu - * + * * def __init__(self, addr src, addr dst, mtu=1500): # <<<<<<<<<<<<<< * self.tun = tun_open(&src._addr, &dst._addr, mtu) * self.mtu = mtu @@ -25302,7 +25302,7 @@ static int __pyx_pf_4dnet_3tun___init__(struct __pyx_obj_4dnet_tun *__pyx_v_self * """Tunnel interface name.""" * def __get__(self): # <<<<<<<<<<<<<< * return tun_name(self.tun) - * + * */ /* Python wrapper */ @@ -25333,7 +25333,7 @@ static PyObject *__pyx_pf_4dnet_3tun_4name___get__(struct __pyx_obj_4dnet_tun *_ * """Tunnel interface name.""" * def __get__(self): * return tun_name(self.tun) # <<<<<<<<<<<<<< - * + * * property fd: */ __Pyx_XDECREF(__pyx_r); @@ -25348,7 +25348,7 @@ static PyObject *__pyx_pf_4dnet_3tun_4name___get__(struct __pyx_obj_4dnet_tun *_ * """Tunnel interface name.""" * def __get__(self): # <<<<<<<<<<<<<< * return tun_name(self.tun) - * + * */ /* function exit code */ @@ -25367,7 +25367,7 @@ static PyObject *__pyx_pf_4dnet_3tun_4name___get__(struct __pyx_obj_4dnet_tun *_ * """File descriptor for tunnel handle.""" * def __get__(self): # <<<<<<<<<<<<<< * return tun_fileno(self.tun) - * + * */ /* Python wrapper */ @@ -25398,7 +25398,7 @@ static PyObject *__pyx_pf_4dnet_3tun_2fd___get__(struct __pyx_obj_4dnet_tun *__p * """File descriptor for tunnel handle.""" * def __get__(self): * return tun_fileno(self.tun) # <<<<<<<<<<<<<< - * + * * def fileno(self): */ __Pyx_XDECREF(__pyx_r); @@ -25413,7 +25413,7 @@ static PyObject *__pyx_pf_4dnet_3tun_2fd___get__(struct __pyx_obj_4dnet_tun *__p * """File descriptor for tunnel handle.""" * def __get__(self): # <<<<<<<<<<<<<< * return tun_fileno(self.tun) - * + * */ /* function exit code */ @@ -25429,14 +25429,14 @@ static PyObject *__pyx_pf_4dnet_3tun_2fd___get__(struct __pyx_obj_4dnet_tun *__p /* "dnet.pyx":1518 * return tun_fileno(self.tun) - * + * * def fileno(self): # <<<<<<<<<<<<<< * """Return file descriptor for tunnel handle.""" * return tun_fileno(self.tun) */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3tun_3fileno(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_3fileno(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25445,7 +25445,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3tun_2fileno, "Return file descriptor for tunnel handle."); static PyMethodDef __pyx_mdef_4dnet_3tun_3fileno = {"fileno", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3tun_3fileno, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3tun_2fileno}; -static PyObject *__pyx_pw_4dnet_3tun_3fileno(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_3fileno(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25490,7 +25490,7 @@ static PyObject *__pyx_pf_4dnet_3tun_2fileno(struct __pyx_obj_4dnet_tun *__pyx_v * def fileno(self): * """Return file descriptor for tunnel handle.""" * return tun_fileno(self.tun) # <<<<<<<<<<<<<< - * + * * def send(self, pkt): */ __Pyx_XDECREF(__pyx_r); @@ -25502,7 +25502,7 @@ static PyObject *__pyx_pf_4dnet_3tun_2fileno(struct __pyx_obj_4dnet_tun *__pyx_v /* "dnet.pyx":1518 * return tun_fileno(self.tun) - * + * * def fileno(self): # <<<<<<<<<<<<<< * """Return file descriptor for tunnel handle.""" * return tun_fileno(self.tun) @@ -25521,14 +25521,14 @@ static PyObject *__pyx_pf_4dnet_3tun_2fileno(struct __pyx_obj_4dnet_tun *__pyx_v /* "dnet.pyx":1522 * return tun_fileno(self.tun) - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3tun_5send(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_5send(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25537,7 +25537,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3tun_4send, "Send an IP packet, returning the number of bytes sent\n or -1 on failure.\n\n Arguments:\n pkt -- binary string representing an IP packet\n "); static PyMethodDef __pyx_mdef_4dnet_3tun_5send = {"send", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3tun_5send, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3tun_4send}; -static PyObject *__pyx_pw_4dnet_3tun_5send(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_5send(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25638,7 +25638,7 @@ static PyObject *__pyx_pf_4dnet_3tun_4send(struct __pyx_obj_4dnet_tun *__pyx_v_s * pkt -- binary string representing an IP packet * """ * return tun_send(self.tun, pkt, PyBytes_Size(pkt)) # <<<<<<<<<<<<<< - * + * * def recv(self): */ __Pyx_XDECREF(__pyx_r); @@ -25651,7 +25651,7 @@ static PyObject *__pyx_pf_4dnet_3tun_4send(struct __pyx_obj_4dnet_tun *__pyx_v_s /* "dnet.pyx":1522 * return tun_fileno(self.tun) - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. @@ -25670,14 +25670,14 @@ static PyObject *__pyx_pf_4dnet_3tun_4send(struct __pyx_obj_4dnet_tun *__pyx_v_s /* "dnet.pyx":1531 * return tun_send(self.tun, pkt, PyBytes_Size(pkt)) - * + * * def recv(self): # <<<<<<<<<<<<<< * """Return the next packet delivered to the tunnel interface.""" * cdef int n */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3tun_7recv(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_7recv(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25686,7 +25686,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds ); /*proto*/ PyDoc_STRVAR(__pyx_doc_4dnet_3tun_6recv, "Return the next packet delivered to the tunnel interface."); static PyMethodDef __pyx_mdef_4dnet_3tun_7recv = {"recv", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3tun_7recv, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_4dnet_3tun_6recv}; -static PyObject *__pyx_pw_4dnet_3tun_7recv(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_7recv(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25753,7 +25753,7 @@ static PyObject *__pyx_pf_4dnet_3tun_6recv(struct __pyx_obj_4dnet_tun *__pyx_v_s * if n < 0: * raise OSError, __oserror() # <<<<<<<<<<<<<< * return PyBytes_FromStringAndSize(self.buf, n) - * + * */ __pyx_t_2 = __pyx_f_4dnet___oserror(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1536, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -25774,7 +25774,7 @@ static PyObject *__pyx_pf_4dnet_3tun_6recv(struct __pyx_obj_4dnet_tun *__pyx_v_s * if n < 0: * raise OSError, __oserror() * return PyBytes_FromStringAndSize(self.buf, n) # <<<<<<<<<<<<<< - * + * * def close(self): */ __Pyx_XDECREF(__pyx_r); @@ -25786,7 +25786,7 @@ static PyObject *__pyx_pf_4dnet_3tun_6recv(struct __pyx_obj_4dnet_tun *__pyx_v_s /* "dnet.pyx":1531 * return tun_send(self.tun, pkt, PyBytes_Size(pkt)) - * + * * def recv(self): # <<<<<<<<<<<<<< * """Return the next packet delivered to the tunnel interface.""" * cdef int n @@ -25805,14 +25805,14 @@ static PyObject *__pyx_pf_4dnet_3tun_6recv(struct __pyx_obj_4dnet_tun *__pyx_v_s /* "dnet.pyx":1539 * return PyBytes_FromStringAndSize(self.buf, n) - * + * * def close(self): # <<<<<<<<<<<<<< * self.tun = tun_close(self.tun) - * + * */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3tun_9close(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_9close(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25820,7 +25820,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_3tun_9close = {"close", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3tun_9close, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_3tun_9close(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_9close(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25858,20 +25858,20 @@ static PyObject *__pyx_pf_4dnet_3tun_8close(struct __pyx_obj_4dnet_tun *__pyx_v_ __Pyx_RefNannySetupContext("close", 1); /* "dnet.pyx":1540 - * + * * def close(self): * self.tun = tun_close(self.tun) # <<<<<<<<<<<<<< - * + * * def __dealloc__(self): */ __pyx_v_self->tun = tun_close(__pyx_v_self->tun); /* "dnet.pyx":1539 * return PyBytes_FromStringAndSize(self.buf, n) - * + * * def close(self): # <<<<<<<<<<<<<< * self.tun = tun_close(self.tun) - * + * */ /* function exit code */ @@ -25883,7 +25883,7 @@ static PyObject *__pyx_pf_4dnet_3tun_8close(struct __pyx_obj_4dnet_tun *__pyx_v_ /* "dnet.pyx":1542 * self.tun = tun_close(self.tun) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.buf: * free(self.buf) @@ -25906,7 +25906,7 @@ static void __pyx_pf_4dnet_3tun_10__dealloc__(struct __pyx_obj_4dnet_tun *__pyx_ int __pyx_t_1; /* "dnet.pyx":1543 - * + * * def __dealloc__(self): * if self.buf: # <<<<<<<<<<<<<< * free(self.buf) @@ -25925,7 +25925,7 @@ static void __pyx_pf_4dnet_3tun_10__dealloc__(struct __pyx_obj_4dnet_tun *__pyx_ free(__pyx_v_self->buf); /* "dnet.pyx":1543 - * + * * def __dealloc__(self): * if self.buf: # <<<<<<<<<<<<<< * free(self.buf) @@ -25959,7 +25959,7 @@ static void __pyx_pf_4dnet_3tun_10__dealloc__(struct __pyx_obj_4dnet_tun *__pyx_ /* "dnet.pyx":1542 * self.tun = tun_close(self.tun) - * + * * def __dealloc__(self): # <<<<<<<<<<<<<< * if self.buf: * free(self.buf) @@ -25975,7 +25975,7 @@ static void __pyx_pf_4dnet_3tun_10__dealloc__(struct __pyx_obj_4dnet_tun *__pyx_ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3tun_13__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_13__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -25983,7 +25983,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_3tun_13__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3tun_13__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_3tun_13__reduce_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_13__reduce_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -26055,7 +26055,7 @@ static PyObject *__pyx_pf_4dnet_3tun_12__reduce_cython__(CYTHON_UNUSED struct __ */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_3tun_15__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_15__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -26063,7 +26063,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_3tun_15__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_3tun_15__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_3tun_15__setstate_cython__(PyObject *__pyx_v_self, +static PyObject *__pyx_pw_4dnet_3tun_15__setstate_cython__(PyObject *__pyx_v_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -26189,7 +26189,7 @@ static PyObject *__pyx_pf_4dnet_3tun_14__setstate_cython__(CYTHON_UNUSED struct */ /* Python wrapper */ -static PyObject *__pyx_pw_4dnet_37__pyx_unpickle___addr_ip4_iter(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_37__pyx_unpickle___addr_ip4_iter(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -26197,7 +26197,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds #endif ); /*proto*/ static PyMethodDef __pyx_mdef_4dnet_37__pyx_unpickle___addr_ip4_iter = {"__pyx_unpickle___addr_ip4_iter", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_4dnet_37__pyx_unpickle___addr_ip4_iter, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_4dnet_37__pyx_unpickle___addr_ip4_iter(PyObject *__pyx_self, +static PyObject *__pyx_pw_4dnet_37__pyx_unpickle___addr_ip4_iter(PyObject *__pyx_self, #if CYTHON_METH_FASTCALL PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds #else @@ -28990,10 +28990,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":54 * return strerror(errno) - * + * * def __iter_append(entry, l): # <<<<<<<<<<<<<< * l.append(entry) - * + * */ __pyx_tuple__4 = PyTuple_Pack(2, __pyx_n_s_entry, __pyx_n_s_l); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 54, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__4); @@ -29002,7 +29002,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":116 * raise OSError, __oserror() - * + * * def get(self): # <<<<<<<<<<<<<< * """Return the MAC address associated with the device as a * binary string.""" @@ -29014,7 +29014,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":124 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def set(self, value): # <<<<<<<<<<<<<< * """Set the MAC address for the device, returning 0 on success, * -1 on failure. @@ -29026,7 +29026,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":136 * raise OSError, __oserror() - * + * * def send(self, frame): # <<<<<<<<<<<<<< * """Send an Ethernet frame, returning the number of bytes sent * or -1 on failure. @@ -29059,7 +29059,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":149 * eth_close(self.eth) - * + * * def eth_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from 6-byte packed binary string to * a printable string ('00:de:ad:be:ef:00').""" @@ -29071,7 +29071,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":156 * return __eth_ntoa(&ea) - * + * * def eth_aton(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from a printable string to a * packed binary string ('\\x00\\xde\\xad\\xbe\\xef\\x00').""" @@ -29080,7 +29080,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":164 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST, # <<<<<<<<<<<<<< * etype=ETH_TYPE_IP): * """Return a packed binary string representing an Ethernet header. @@ -29092,7 +29092,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":254 * raise OSError, __oserror() - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. @@ -29119,7 +29119,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":267 * ip_close(self.ip) - * + * * def ip_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a 4-byte packed binary string or * integer to a printable string ('10.0.0.1').""" @@ -29131,7 +29131,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":280 * return __ip_ntoa(&ia) - * + * * def ip_aton(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" @@ -29143,7 +29143,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":288 * return PyBytes_FromStringAndSize(&ia, 4) - * + * * def ip_checksum(pkt): # <<<<<<<<<<<<<< * """Return packed binary string representing an IP packet * with the IP and transport-layer checksums set. @@ -29155,7 +29155,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":311 * raise TypeError - * + * * def ip_cksum_add(buf, int sum): # <<<<<<<<<<<<<< * cdef char *p * cdef int n @@ -29167,10 +29167,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":319 * raise TypeError - * + * * def ip_cksum_carry(int sum): # <<<<<<<<<<<<<< * return __ip_cksum_carry(sum) - * + * */ __pyx_tuple__33 = PyTuple_Pack(1, __pyx_n_s_sum); if (unlikely(!__pyx_tuple__33)) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__33); @@ -29179,7 +29179,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":322 * return __ip_cksum_carry(sum) - * + * * def ip_pack_hdr(tos=IP_TOS_DEFAULT, len=IP_HDR_LEN, id=0, off=0, # <<<<<<<<<<<<<< * ttl=IP_TTL_DEFAULT, p=IP_PROTO_IP, * src=IP_ADDR_ANY, dst=IP_ADDR_ANY): @@ -29191,7 +29191,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":372 * IP6_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16) - * + * * def ip6_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a 16-byte packed binary string to a * printable string ('10.0.0.1').""" @@ -29200,7 +29200,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":379 * return __ip6_ntoa(&ia) - * + * * def ip6_aton(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" @@ -29209,7 +29209,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":387 * return PyBytes_FromStringAndSize(&ia, 16) - * + * * def ip6_checksum(buf): # <<<<<<<<<<<<<< * """Return a packed binary string representing an IPv6 packet * with the IPv6 and transport-layer checksums set. @@ -29221,7 +29221,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":397 * return buf - * + * * def ip6_pack_hdr(fc=0, fl=0, plen=0, nxt=IP_PROTO_IPV6, hlim=IP6_HLIM_DEFAULT, # <<<<<<<<<<<<<< * src=IP6_ADDR_UNSPEC, dst=IP6_ADDR_UNSPEC): * """Return a packed binary string representing an IPv6 header. @@ -29233,7 +29233,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":531 * self._addr.addr_bits = IP6_ADDR_BITS - * + * * def bcast(self): # <<<<<<<<<<<<<< * """Return an addr object for our broadcast address.""" * bcast = addr() @@ -29245,7 +29245,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":537 * return bcast - * + * * def net(self): # <<<<<<<<<<<<<< * """Return an addr object for our network address.""" * net = addr() @@ -29257,7 +29257,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":555 * return z - * + * * def __copy__(self): # <<<<<<<<<<<<<< * a = addr() * (a)._addr = self._addr @@ -29302,10 +29302,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":712 * raise OSError, __oserror() - * + * * def add(self, addr pa, addr ha): # <<<<<<<<<<<<<< * """Add an entry to the system ARP table. - * + * */ __pyx_tuple__54 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_pa, __pyx_n_s_ha, __pyx_n_s_entry); if (unlikely(!__pyx_tuple__54)) __PYX_ERR(0, 712, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__54); @@ -29314,10 +29314,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":725 * raise OSError, __oserror() - * + * * def delete(self, addr pa): # <<<<<<<<<<<<<< * """Delete an entry from the system ARP table. - * + * */ __pyx_tuple__56 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_pa, __pyx_n_s_entry); if (unlikely(!__pyx_tuple__56)) __PYX_ERR(0, 725, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__56); @@ -29326,7 +29326,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":736 * raise OSError, __oserror() - * + * * def get(self, addr pa): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system ARP table. @@ -29335,7 +29335,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":749 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system ARP table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -29365,7 +29365,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":771 * arp_close(self.arp) - * + * * def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, # <<<<<<<<<<<<<< * sha=ETH_ADDR_UNSPEC, spa=IP_ADDR_ANY, * dha=ETH_ADDR_UNSPEC, dpa=IP_ADDR_ANY): @@ -29377,10 +29377,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":799 * void __icmp_pack_hdr "icmp_pack_hdr" (char *hdr, int type, int code) - * + * * def icmp_pack_hdr(itype, code): # <<<<<<<<<<<<<< * """Return a packed binary string representing an ICMP header. - * + * */ __pyx_tuple__66 = PyTuple_Pack(3, __pyx_n_s_itype, __pyx_n_s_code, __pyx_n_s_buf); if (unlikely(!__pyx_tuple__66)) __PYX_ERR(0, 799, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__66); @@ -29389,7 +29389,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":859 * TCP_OPT_MAX = 27 - * + * * def tcp_pack_hdr(sport, dport, seq=1, ack=0, flags=TH_SYN, # <<<<<<<<<<<<<< * win=TCP_WIN_MAX, urp=0): * """Return a packed binary string representing a TCP header. @@ -29401,10 +29401,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":885 * UDP_PORT_MAX = 65535 - * + * * def udp_pack_hdr(sport, dport, ulen=UDP_HDR_LEN): # <<<<<<<<<<<<<< * """Return a packed binary string representing a UDP header. - * + * */ __pyx_tuple__70 = PyTuple_Pack(4, __pyx_n_s_sport, __pyx_n_s_dport, __pyx_n_s_ulen, __pyx_n_s_buf); if (unlikely(!__pyx_tuple__70)) __PYX_ERR(0, 885, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__70); @@ -29413,7 +29413,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":992 * raise OSError, __oserror() - * + * * def get(self, name): # <<<<<<<<<<<<<< * """Return the configuration for a network interface as a dict. * """ @@ -29425,7 +29425,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1004 * return ifent_to_dict(ifent) - * + * * def get_src(self, addr src): # <<<<<<<<<<<<<< * """Return the configuration for the interface whose primary address * matches the specified source address. @@ -29437,7 +29437,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1016 * return ifent_to_dict(ifent) - * + * * def get_dst(self, addr dst): # <<<<<<<<<<<<<< * """Return the configuration for the best interface with which to * reach the specified dst address. @@ -29449,10 +29449,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1028 * return ifent_to_dict(ifent) - * + * * def set(self, d): # <<<<<<<<<<<<<< * """Set the configuration for an interface from a dict. - * + * */ __pyx_tuple__78 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_d, __pyx_n_s_ifent, __pyx_n_s_buf); if (unlikely(!__pyx_tuple__78)) __PYX_ERR(0, 1028, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__78); @@ -29461,7 +29461,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1049 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system interface table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -29485,10 +29485,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1111 * raise OSError, __oserror() - * + * * def add(self, addr dst, addr gw): # <<<<<<<<<<<<<< * """Add an entry to the system routing table. - * + * */ __pyx_tuple__83 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_dst, __pyx_n_s_gw, __pyx_n_s_entry); if (unlikely(!__pyx_tuple__83)) __PYX_ERR(0, 1111, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__83); @@ -29497,10 +29497,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1124 * raise OSError, __oserror() - * + * * def delete(self, addr dst): # <<<<<<<<<<<<<< * """Delete an entry from the system routing table. - * + * */ __pyx_tuple__85 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_dst, __pyx_n_s_entry); if (unlikely(!__pyx_tuple__85)) __PYX_ERR(0, 1124, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__85); @@ -29509,7 +29509,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1135 * raise OSError, __oserror() - * + * * def get(self, addr dst): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system routing table. @@ -29518,7 +29518,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1148 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system routing table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -29542,10 +29542,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1257 * raise OSError, __oserror() - * + * * def add(self, d): # <<<<<<<<<<<<<< * """Add a firewall rule specified as a dict. - * + * */ __pyx_tuple__91 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_d, __pyx_n_s_rule); if (unlikely(!__pyx_tuple__91)) __PYX_ERR(0, 1257, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__91); @@ -29554,7 +29554,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1276 * raise OSError, __oserror() - * + * * def delete(self, d): # <<<<<<<<<<<<<< * """Delete a firewall rule specified as a dict.""" * cdef fw_rule rule @@ -29563,7 +29563,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1284 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the local firewall ruleset, invoking a user callback * with each entry, returning the status of the callback routine. @@ -29587,10 +29587,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1337 * raise OSError, __oserror() - * + * * def get(self, len): # <<<<<<<<<<<<<< * """Return a string of random bytes. - * + * */ __pyx_tuple__97 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_len, __pyx_n_s_buf, __pyx_n_s_p, __pyx_n_s_s); if (unlikely(!__pyx_tuple__97)) __PYX_ERR(0, 1337, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__97); @@ -29599,10 +29599,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1354 * return s - * + * * def set(self, buf): # <<<<<<<<<<<<<< * """Initialize the PRNG from a known seed. - * + * */ __pyx_tuple__99 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_buf); if (unlikely(!__pyx_tuple__99)) __PYX_ERR(0, 1354, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__99); @@ -29611,16 +29611,16 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1362 * rand_set(self.rand, buf, PyBytes_Size(buf)) - * + * * def add(self, buf): # <<<<<<<<<<<<<< * """Add additional entropy into the PRNG mix. - * + * */ __pyx_codeobj__101 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__99, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_dnet_pyx, __pyx_n_s_add, 1362, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__101)) __PYX_ERR(0, 1362, __pyx_L1_error) /* "dnet.pyx":1370 * rand_add(self.rand, buf, PyBytes_Size(buf)) - * + * * def uint8(self): # <<<<<<<<<<<<<< * """Return a random 8-bit integer.""" * return rand_uint8(self.rand) @@ -29629,7 +29629,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1374 * return rand_uint8(self.rand) - * + * * def uint16(self): # <<<<<<<<<<<<<< * """Return a random 16-bit integer.""" * return rand_uint16(self.rand) @@ -29638,7 +29638,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1378 * return rand_uint16(self.rand) - * + * * def uint32(self): # <<<<<<<<<<<<<< * """Return a random 32-bit integer.""" * return rand_uint32(self.rand) @@ -29647,10 +29647,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1382 * return rand_uint32(self.rand) - * + * * def xrange(self, start, stop=None): # <<<<<<<<<<<<<< * """xrange([start,] stop) -> xrange object - * + * */ __pyx_tuple__105 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_start, __pyx_n_s_stop); if (unlikely(!__pyx_tuple__105)) __PYX_ERR(0, 1382, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__105); @@ -29689,7 +29689,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1518 * return tun_fileno(self.tun) - * + * * def fileno(self): # <<<<<<<<<<<<<< * """Return file descriptor for tunnel handle.""" * return tun_fileno(self.tun) @@ -29698,7 +29698,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1522 * return tun_fileno(self.tun) - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. @@ -29707,7 +29707,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1531 * return tun_send(self.tun, pkt, PyBytes_Size(pkt)) - * + * * def recv(self): # <<<<<<<<<<<<<< * """Return the next packet delivered to the tunnel interface.""" * cdef int n @@ -29719,10 +29719,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { /* "dnet.pyx":1539 * return PyBytes_FromStringAndSize(self.buf, n) - * + * * def close(self): # <<<<<<<<<<<<<< * self.tun = tun_close(self.tun) - * + * */ __pyx_codeobj__115 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__12, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_dnet_pyx, __pyx_n_s_close, 1539, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__115)) __PYX_ERR(0, 1539, __pyx_L1_error) @@ -30438,7 +30438,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":15 * """ - * + * * __author__ = 'Oliver Falk ' # <<<<<<<<<<<<<< * __copyright__ = 'Copyright (c) 2023-2024 Oliver Falk' * __license__ = 'BSD' @@ -30446,7 +30446,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_author, __pyx_kp_u_Oliver_Falk_oliver_linux_kernel) < 0) __PYX_ERR(0, 15, __pyx_L1_error) /* "dnet.pyx":16 - * + * * __author__ = 'Oliver Falk ' * __copyright__ = 'Copyright (c) 2023-2024 Oliver Falk' # <<<<<<<<<<<<<< * __license__ = 'BSD' @@ -30468,7 +30468,7 @@ if (!__Pyx_RefNanny) { * __license__ = 'BSD' * __url__ = 'https://github.com/ofalk/libdnet' # <<<<<<<<<<<<<< * __version__ = '1.18.0' - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_url, __pyx_kp_u_https_github_com_ofalk_libdnet) < 0) __PYX_ERR(0, 18, __pyx_L1_error) @@ -30476,17 +30476,17 @@ if (!__Pyx_RefNanny) { * __license__ = 'BSD' * __url__ = 'https://github.com/ofalk/libdnet' * __version__ = '1.18.0' # <<<<<<<<<<<<<< - * - * + * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_version, __pyx_kp_u_1_18_0) < 0) __PYX_ERR(0, 19, __pyx_L1_error) /* "dnet.pyx":54 * return strerror(errno) - * + * * def __iter_append(entry, l): # <<<<<<<<<<<<<< * l.append(entry) - * + * */ __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_1__iter_append, 0, __pyx_n_s_iter_append, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__5)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 54, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -30495,7 +30495,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":77 * eth_addr_t dst, eth_addr_t src, int etype) - * + * * ETH_ADDR_LEN = 6 # <<<<<<<<<<<<<< * ETH_ADDR_BITS = 48 * ETH_TYPE_LEN = 2 @@ -30503,7 +30503,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_ADDR_LEN, __pyx_int_6) < 0) __PYX_ERR(0, 77, __pyx_L1_error) /* "dnet.pyx":78 - * + * * ETH_ADDR_LEN = 6 * ETH_ADDR_BITS = 48 # <<<<<<<<<<<<<< * ETH_TYPE_LEN = 2 @@ -30525,7 +30525,7 @@ if (!__Pyx_RefNanny) { * ETH_TYPE_LEN = 2 * ETH_CRC_LEN = 4 # <<<<<<<<<<<<<< * ETH_HDR_LEN = 14 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_CRC_LEN, __pyx_int_4) < 0) __PYX_ERR(0, 80, __pyx_L1_error) @@ -30533,35 +30533,35 @@ if (!__Pyx_RefNanny) { * ETH_TYPE_LEN = 2 * ETH_CRC_LEN = 4 * ETH_HDR_LEN = 14 # <<<<<<<<<<<<<< - * + * * ETH_LEN_MIN = 64 # /[inserted by cython to avoid comment start]* minimum frame length with CRC *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_HDR_LEN, __pyx_int_14) < 0) __PYX_ERR(0, 81, __pyx_L1_error) /* "dnet.pyx":83 * ETH_HDR_LEN = 14 - * + * * ETH_LEN_MIN = 64 # /[inserted by cython to avoid comment start]* minimum frame length with CRC *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ETH_LEN_MAX = 1518 # /[inserted by cython to avoid comment start]* maximum frame length with CRC *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_LEN_MIN, __pyx_int_64) < 0) __PYX_ERR(0, 83, __pyx_L1_error) /* "dnet.pyx":84 - * + * * ETH_LEN_MIN = 64 # /[inserted by cython to avoid comment start]* minimum frame length with CRC *[inserted by cython to avoid comment closer]/ * ETH_LEN_MAX = 1518 # /[inserted by cython to avoid comment start]* maximum frame length with CRC *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * ETH_MTU = (ETH_LEN_MAX - ETH_HDR_LEN - ETH_CRC_LEN) */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_LEN_MAX, __pyx_int_1518) < 0) __PYX_ERR(0, 84, __pyx_L1_error) /* "dnet.pyx":86 * ETH_LEN_MAX = 1518 # /[inserted by cython to avoid comment start]* maximum frame length with CRC *[inserted by cython to avoid comment closer]/ - * + * * ETH_MTU = (ETH_LEN_MAX - ETH_HDR_LEN - ETH_CRC_LEN) # <<<<<<<<<<<<<< * ETH_MIN = (ETH_LEN_MIN - ETH_HDR_LEN - ETH_CRC_LEN) - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_ETH_LEN_MAX); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 86, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -30581,10 +30581,10 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "dnet.pyx":87 - * + * * ETH_MTU = (ETH_LEN_MAX - ETH_HDR_LEN - ETH_CRC_LEN) * ETH_MIN = (ETH_LEN_MIN - ETH_HDR_LEN - ETH_CRC_LEN) # <<<<<<<<<<<<<< - * + * * ETH_TYPE_PUP = 0x0200 # /[inserted by cython to avoid comment start]* PUP protocol *[inserted by cython to avoid comment closer]/ */ __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_ETH_LEN_MIN); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 87, __pyx_L1_error) @@ -30606,7 +30606,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":89 * ETH_MIN = (ETH_LEN_MIN - ETH_HDR_LEN - ETH_CRC_LEN) - * + * * ETH_TYPE_PUP = 0x0200 # /[inserted by cython to avoid comment start]* PUP protocol *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ETH_TYPE_IP = 0x0800 # /[inserted by cython to avoid comment start]* IP protocol *[inserted by cython to avoid comment closer]/ * ETH_TYPE_ARP = 0x0806 # /[inserted by cython to avoid comment start]* address resolution protocol *[inserted by cython to avoid comment closer]/ @@ -30614,7 +30614,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_TYPE_PUP, __pyx_int_512) < 0) __PYX_ERR(0, 89, __pyx_L1_error) /* "dnet.pyx":90 - * + * * ETH_TYPE_PUP = 0x0200 # /[inserted by cython to avoid comment start]* PUP protocol *[inserted by cython to avoid comment closer]/ * ETH_TYPE_IP = 0x0800 # /[inserted by cython to avoid comment start]* IP protocol *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ETH_TYPE_ARP = 0x0806 # /[inserted by cython to avoid comment start]* address resolution protocol *[inserted by cython to avoid comment closer]/ @@ -30690,7 +30690,7 @@ if (!__Pyx_RefNanny) { * ETH_TYPE_PPPOEDISC = 0x8863 # /[inserted by cython to avoid comment start]* PPP Over Ethernet Discovery Stage *[inserted by cython to avoid comment closer]/ * ETH_TYPE_PPPOE = 0x8864 # /[inserted by cython to avoid comment start]* PPP Over Ethernet Session Stage *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ETH_TYPE_LOOPBACK = 0x9000 # /[inserted by cython to avoid comment start]* used to test interfaces *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_TYPE_PPPOE, __pyx_int_34916) < 0) __PYX_ERR(0, 98, __pyx_L1_error) @@ -30698,17 +30698,17 @@ if (!__Pyx_RefNanny) { * ETH_TYPE_PPPOEDISC = 0x8863 # /[inserted by cython to avoid comment start]* PPP Over Ethernet Discovery Stage *[inserted by cython to avoid comment closer]/ * ETH_TYPE_PPPOE = 0x8864 # /[inserted by cython to avoid comment start]* PPP Over Ethernet Session Stage *[inserted by cython to avoid comment closer]/ * ETH_TYPE_LOOPBACK = 0x9000 # /[inserted by cython to avoid comment start]* used to test interfaces *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * ETH_ADDR_UNSPEC = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00", 6) */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ETH_TYPE_LOOPBACK, __pyx_int_36864) < 0) __PYX_ERR(0, 99, __pyx_L1_error) /* "dnet.pyx":101 * ETH_TYPE_LOOPBACK = 0x9000 # /[inserted by cython to avoid comment start]* used to test interfaces *[inserted by cython to avoid comment closer]/ - * + * * ETH_ADDR_UNSPEC = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00", 6) # <<<<<<<<<<<<<< * ETH_ADDR_BROADCAST = PyBytes_FromStringAndSize("\xff\xff\xff\xff\xff\xff", 6) - * + * */ __pyx_t_2 = PyBytes_FromStringAndSize(((char *)"\000\000\000\000\000\000"), 6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); @@ -30716,10 +30716,10 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "dnet.pyx":102 - * + * * ETH_ADDR_UNSPEC = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00", 6) * ETH_ADDR_BROADCAST = PyBytes_FromStringAndSize("\xff\xff\xff\xff\xff\xff", 6) # <<<<<<<<<<<<<< - * + * * cdef class eth: */ __pyx_t_2 = PyBytes_FromStringAndSize(((char *)"\377\377\377\377\377\377"), 6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error) @@ -30729,7 +30729,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":116 * raise OSError, __oserror() - * + * * def get(self): # <<<<<<<<<<<<<< * """Return the MAC address associated with the device as a * binary string.""" @@ -30742,7 +30742,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":124 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def set(self, value): # <<<<<<<<<<<<<< * """Set the MAC address for the device, returning 0 on success, * -1 on failure. @@ -30755,7 +30755,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":136 * raise OSError, __oserror() - * + * * def send(self, frame): # <<<<<<<<<<<<<< * """Send an Ethernet frame, returning the number of bytes sent * or -1 on failure. @@ -30789,7 +30789,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":149 * eth_close(self.eth) - * + * * def eth_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from 6-byte packed binary string to * a printable string ('00:de:ad:be:ef:00').""" @@ -30801,7 +30801,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":156 * return __eth_ntoa(&ea) - * + * * def eth_aton(buf): # <<<<<<<<<<<<<< * """Convert an Ethernet MAC address from a printable string to a * packed binary string ('\\x00\\xde\\xad\\xbe\\xef\\x00').""" @@ -30813,7 +30813,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":164 * return PyBytes_FromStringAndSize(ea.data, 6) - * + * * def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST, # <<<<<<<<<<<<<< * etype=ETH_TYPE_IP): * """Return a packed binary string representing an Ethernet header. @@ -30833,11 +30833,11 @@ if (!__Pyx_RefNanny) { __pyx_t_3 = 0; /* "dnet.pyx":165 - * + * * def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST, * etype=ETH_TYPE_IP): # <<<<<<<<<<<<<< * """Return a packed binary string representing an Ethernet header. - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_ETH_TYPE_IP); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 165, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -30850,25 +30850,25 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":201 * int off, int ttl, int p, ip_addr_t s, ip_addr_t d) - * + * * IP_ADDR_LEN = 4 # /[inserted by cython to avoid comment start]* IP address length *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_ADDR_BITS = 32 # /[inserted by cython to avoid comment start]* IP address bits *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_ADDR_LEN, __pyx_int_4) < 0) __PYX_ERR(0, 201, __pyx_L1_error) /* "dnet.pyx":202 - * + * * IP_ADDR_LEN = 4 # /[inserted by cython to avoid comment start]* IP address length *[inserted by cython to avoid comment closer]/ * IP_ADDR_BITS = 32 # /[inserted by cython to avoid comment start]* IP address bits *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * IP_HDR_LEN = 20 # /[inserted by cython to avoid comment start]* base IP header length *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_ADDR_BITS, __pyx_int_32) < 0) __PYX_ERR(0, 202, __pyx_L1_error) /* "dnet.pyx":204 * IP_ADDR_BITS = 32 # /[inserted by cython to avoid comment start]* IP address bits *[inserted by cython to avoid comment closer]/ - * + * * IP_HDR_LEN = 20 # /[inserted by cython to avoid comment start]* base IP header length *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_OPT_LEN = 2 # /[inserted by cython to avoid comment start]* base IP option length *[inserted by cython to avoid comment closer]/ * IP_OPT_LEN_MAX =40 @@ -30876,7 +30876,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_HDR_LEN, __pyx_int_20) < 0) __PYX_ERR(0, 204, __pyx_L1_error) /* "dnet.pyx":205 - * + * * IP_HDR_LEN = 20 # /[inserted by cython to avoid comment start]* base IP header length *[inserted by cython to avoid comment closer]/ * IP_OPT_LEN = 2 # /[inserted by cython to avoid comment start]* base IP option length *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_OPT_LEN_MAX =40 @@ -30889,7 +30889,7 @@ if (!__Pyx_RefNanny) { * IP_OPT_LEN = 2 # /[inserted by cython to avoid comment start]* base IP option length *[inserted by cython to avoid comment closer]/ * IP_OPT_LEN_MAX =40 # <<<<<<<<<<<<<< * IP_HDR_LEN_MAX =(IP_HDR_LEN + IP_OPT_LEN_MAX) - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_OPT_LEN_MAX, __pyx_int_40) < 0) __PYX_ERR(0, 206, __pyx_L1_error) @@ -30897,7 +30897,7 @@ if (!__Pyx_RefNanny) { * IP_OPT_LEN = 2 # /[inserted by cython to avoid comment start]* base IP option length *[inserted by cython to avoid comment closer]/ * IP_OPT_LEN_MAX =40 * IP_HDR_LEN_MAX =(IP_HDR_LEN + IP_OPT_LEN_MAX) # <<<<<<<<<<<<<< - * + * * IP_LEN_MAX = 65535 */ __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_IP_HDR_LEN); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 207, __pyx_L1_error) @@ -30913,18 +30913,18 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":209 * IP_HDR_LEN_MAX =(IP_HDR_LEN + IP_OPT_LEN_MAX) - * + * * IP_LEN_MAX = 65535 # <<<<<<<<<<<<<< * IP_LEN_MIN = IP_HDR_LEN - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_LEN_MAX, __pyx_int_65535) < 0) __PYX_ERR(0, 209, __pyx_L1_error) /* "dnet.pyx":210 - * + * * IP_LEN_MAX = 65535 * IP_LEN_MIN = IP_HDR_LEN # <<<<<<<<<<<<<< - * + * * IP_TOS_DEFAULT =0x00 # /[inserted by cython to avoid comment start]* default *[inserted by cython to avoid comment closer]/ */ __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_IP_HDR_LEN); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 210, __pyx_L1_error) @@ -30934,16 +30934,16 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":212 * IP_LEN_MIN = IP_HDR_LEN - * + * * IP_TOS_DEFAULT =0x00 # /[inserted by cython to avoid comment start]* default *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * IP_RF = 0x8000 # /[inserted by cython to avoid comment start]* reserved *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_TOS_DEFAULT, __pyx_int_0) < 0) __PYX_ERR(0, 212, __pyx_L1_error) /* "dnet.pyx":214 * IP_TOS_DEFAULT =0x00 # /[inserted by cython to avoid comment start]* default *[inserted by cython to avoid comment closer]/ - * + * * IP_RF = 0x8000 # /[inserted by cython to avoid comment start]* reserved *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_DF = 0x4000 # /[inserted by cython to avoid comment start]* don't fragment *[inserted by cython to avoid comment closer]/ * IP_MF = 0x2000 # /[inserted by cython to avoid comment start]* more fragments (not last frag) *[inserted by cython to avoid comment closer]/ @@ -30951,7 +30951,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_RF, __pyx_int_32768) < 0) __PYX_ERR(0, 214, __pyx_L1_error) /* "dnet.pyx":215 - * + * * IP_RF = 0x8000 # /[inserted by cython to avoid comment start]* reserved *[inserted by cython to avoid comment closer]/ * IP_DF = 0x4000 # /[inserted by cython to avoid comment start]* don't fragment *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_MF = 0x2000 # /[inserted by cython to avoid comment start]* more fragments (not last frag) *[inserted by cython to avoid comment closer]/ @@ -30964,7 +30964,7 @@ if (!__Pyx_RefNanny) { * IP_DF = 0x4000 # /[inserted by cython to avoid comment start]* don't fragment *[inserted by cython to avoid comment closer]/ * IP_MF = 0x2000 # /[inserted by cython to avoid comment start]* more fragments (not last frag) *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_OFFMASK = 0x1fff # /[inserted by cython to avoid comment start]* mask for fragment offset *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_MF, __pyx_int_8192) < 0) __PYX_ERR(0, 216, __pyx_L1_error) @@ -30972,32 +30972,32 @@ if (!__Pyx_RefNanny) { * IP_DF = 0x4000 # /[inserted by cython to avoid comment start]* don't fragment *[inserted by cython to avoid comment closer]/ * IP_MF = 0x2000 # /[inserted by cython to avoid comment start]* more fragments (not last frag) *[inserted by cython to avoid comment closer]/ * IP_OFFMASK = 0x1fff # /[inserted by cython to avoid comment start]* mask for fragment offset *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * IP_TTL_DEFAULT =64 # /[inserted by cython to avoid comment start]* default ttl, RFC 1122, RFC 1340 *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_OFFMASK, __pyx_int_8191) < 0) __PYX_ERR(0, 217, __pyx_L1_error) /* "dnet.pyx":219 * IP_OFFMASK = 0x1fff # /[inserted by cython to avoid comment start]* mask for fragment offset *[inserted by cython to avoid comment closer]/ - * + * * IP_TTL_DEFAULT =64 # /[inserted by cython to avoid comment start]* default ttl, RFC 1122, RFC 1340 *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_TTL_MAX = 255 # /[inserted by cython to avoid comment start]* maximum ttl *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_TTL_DEFAULT, __pyx_int_64) < 0) __PYX_ERR(0, 219, __pyx_L1_error) /* "dnet.pyx":220 - * + * * IP_TTL_DEFAULT =64 # /[inserted by cython to avoid comment start]* default ttl, RFC 1122, RFC 1340 *[inserted by cython to avoid comment closer]/ * IP_TTL_MAX = 255 # /[inserted by cython to avoid comment start]* maximum ttl *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * IP_PROTO_IP = 0 # /[inserted by cython to avoid comment start]* dummy for IP *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_TTL_MAX, __pyx_int_255) < 0) __PYX_ERR(0, 220, __pyx_L1_error) /* "dnet.pyx":222 * IP_TTL_MAX = 255 # /[inserted by cython to avoid comment start]* maximum ttl *[inserted by cython to avoid comment closer]/ - * + * * IP_PROTO_IP = 0 # /[inserted by cython to avoid comment start]* dummy for IP *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_PROTO_ICMP = 1 # /[inserted by cython to avoid comment start]* ICMP *[inserted by cython to avoid comment closer]/ * IP_PROTO_IGMP = 2 # /[inserted by cython to avoid comment start]* IGMP *[inserted by cython to avoid comment closer]/ @@ -31005,7 +31005,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_PROTO_IP, __pyx_int_0) < 0) __PYX_ERR(0, 222, __pyx_L1_error) /* "dnet.pyx":223 - * + * * IP_PROTO_IP = 0 # /[inserted by cython to avoid comment start]* dummy for IP *[inserted by cython to avoid comment closer]/ * IP_PROTO_ICMP = 1 # /[inserted by cython to avoid comment start]* ICMP *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_PROTO_IGMP = 2 # /[inserted by cython to avoid comment start]* IGMP *[inserted by cython to avoid comment closer]/ @@ -31099,7 +31099,7 @@ if (!__Pyx_RefNanny) { * IP_PROTO_RAW = 255 # /[inserted by cython to avoid comment start]* Raw IP packets *[inserted by cython to avoid comment closer]/ * IP_PROTO_RESERVED = IP_PROTO_RAW # /[inserted by cython to avoid comment start]* Reserved *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP_PROTO_MAX = 255 - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_IP_PROTO_RAW); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 233, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31110,14 +31110,14 @@ if (!__Pyx_RefNanny) { * IP_PROTO_RAW = 255 # /[inserted by cython to avoid comment start]* Raw IP packets *[inserted by cython to avoid comment closer]/ * IP_PROTO_RESERVED = IP_PROTO_RAW # /[inserted by cython to avoid comment start]* Reserved *[inserted by cython to avoid comment closer]/ * IP_PROTO_MAX = 255 # <<<<<<<<<<<<<< - * + * * IP_ADDR_ANY = PyBytes_FromStringAndSize("\x00\x00\x00\x00", 4) */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP_PROTO_MAX, __pyx_int_255) < 0) __PYX_ERR(0, 234, __pyx_L1_error) /* "dnet.pyx":236 * IP_PROTO_MAX = 255 - * + * * IP_ADDR_ANY = PyBytes_FromStringAndSize("\x00\x00\x00\x00", 4) # <<<<<<<<<<<<<< * IP_ADDR_BROADCAST = PyBytes_FromStringAndSize("\xff\xff\xff\xff", 4) * IP_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x7f\x00\x00\x01", 4) @@ -31128,7 +31128,7 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "dnet.pyx":237 - * + * * IP_ADDR_ANY = PyBytes_FromStringAndSize("\x00\x00\x00\x00", 4) * IP_ADDR_BROADCAST = PyBytes_FromStringAndSize("\xff\xff\xff\xff", 4) # <<<<<<<<<<<<<< * IP_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x7f\x00\x00\x01", 4) @@ -31156,7 +31156,7 @@ if (!__Pyx_RefNanny) { * IP_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x7f\x00\x00\x01", 4) * IP_ADDR_MCAST_ALL = PyBytes_FromStringAndSize("\xe0\x00\x00\x01", 4) # <<<<<<<<<<<<<< * IP_ADDR_MCAST_LOCAL = PyBytes_FromStringAndSize("\xe0\x00\x00\xff", 4) - * + * */ __pyx_t_4 = PyBytes_FromStringAndSize(((char *)"\340\000\000\001"), 4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 239, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31167,7 +31167,7 @@ if (!__Pyx_RefNanny) { * IP_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x7f\x00\x00\x01", 4) * IP_ADDR_MCAST_ALL = PyBytes_FromStringAndSize("\xe0\x00\x00\x01", 4) * IP_ADDR_MCAST_LOCAL = PyBytes_FromStringAndSize("\xe0\x00\x00\xff", 4) # <<<<<<<<<<<<<< - * + * * cdef class ip: */ __pyx_t_4 = PyBytes_FromStringAndSize(((char *)"\340\000\000\377"), 4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 240, __pyx_L1_error) @@ -31177,7 +31177,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":254 * raise OSError, __oserror() - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. @@ -31211,7 +31211,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":267 * ip_close(self.ip) - * + * * def ip_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a 4-byte packed binary string or * integer to a printable string ('10.0.0.1').""" @@ -31223,7 +31223,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":280 * return __ip_ntoa(&ia) - * + * * def ip_aton(buf): # <<<<<<<<<<<<<< * """Convert an IP address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" @@ -31235,7 +31235,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":288 * return PyBytes_FromStringAndSize(&ia, 4) - * + * * def ip_checksum(pkt): # <<<<<<<<<<<<<< * """Return packed binary string representing an IP packet * with the IP and transport-layer checksums set. @@ -31247,7 +31247,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":311 * raise TypeError - * + * * def ip_cksum_add(buf, int sum): # <<<<<<<<<<<<<< * cdef char *p * cdef int n @@ -31259,10 +31259,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":319 * raise TypeError - * + * * def ip_cksum_carry(int sum): # <<<<<<<<<<<<<< * return __ip_cksum_carry(sum) - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_17ip_cksum_carry, 0, __pyx_n_s_ip_cksum_carry, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31271,7 +31271,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":322 * return __ip_cksum_carry(sum) - * + * * def ip_pack_hdr(tos=IP_TOS_DEFAULT, len=IP_HDR_LEN, id=0, off=0, # <<<<<<<<<<<<<< * ttl=IP_TTL_DEFAULT, p=IP_PROTO_IP, * src=IP_ADDR_ANY, dst=IP_ADDR_ANY): @@ -31291,7 +31291,7 @@ if (!__Pyx_RefNanny) { __pyx_t_3 = 0; /* "dnet.pyx":323 - * + * * def ip_pack_hdr(tos=IP_TOS_DEFAULT, len=IP_HDR_LEN, id=0, off=0, * ttl=IP_TTL_DEFAULT, p=IP_PROTO_IP, # <<<<<<<<<<<<<< * src=IP_ADDR_ANY, dst=IP_ADDR_ANY): @@ -31313,7 +31313,7 @@ if (!__Pyx_RefNanny) { * ttl=IP_TTL_DEFAULT, p=IP_PROTO_IP, * src=IP_ADDR_ANY, dst=IP_ADDR_ANY): # <<<<<<<<<<<<<< * """Return a packed binary string representing an IP header. - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_IP_ADDR_ANY); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 324, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -31331,25 +31331,25 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":357 * int nxt, int hlim, ip6_addr_t s, ip6_addr_t d) - * + * * IP6_ADDR_LEN = 16 # <<<<<<<<<<<<<< * IP6_ADDR_BITS = 128 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP6_ADDR_LEN, __pyx_int_16) < 0) __PYX_ERR(0, 357, __pyx_L1_error) /* "dnet.pyx":358 - * + * * IP6_ADDR_LEN = 16 * IP6_ADDR_BITS = 128 # <<<<<<<<<<<<<< - * + * * IP6_HDR_LEN = 40 # /[inserted by cython to avoid comment start]* IPv6 header length *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP6_ADDR_BITS, __pyx_int_128) < 0) __PYX_ERR(0, 358, __pyx_L1_error) /* "dnet.pyx":360 * IP6_ADDR_BITS = 128 - * + * * IP6_HDR_LEN = 40 # /[inserted by cython to avoid comment start]* IPv6 header length *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * IP6_LEN_MIN = IP6_HDR_LEN * IP6_LEN_MAX = 65535 # /[inserted by cython to avoid comment start]* non-jumbo payload *[inserted by cython to avoid comment closer]/ @@ -31357,11 +31357,11 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP6_HDR_LEN, __pyx_int_40) < 0) __PYX_ERR(0, 360, __pyx_L1_error) /* "dnet.pyx":361 - * + * * IP6_HDR_LEN = 40 # /[inserted by cython to avoid comment start]* IPv6 header length *[inserted by cython to avoid comment closer]/ * IP6_LEN_MIN = IP6_HDR_LEN # <<<<<<<<<<<<<< * IP6_LEN_MAX = 65535 # /[inserted by cython to avoid comment start]* non-jumbo payload *[inserted by cython to avoid comment closer]/ - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_IP6_HDR_LEN); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 361, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31372,44 +31372,44 @@ if (!__Pyx_RefNanny) { * IP6_HDR_LEN = 40 # /[inserted by cython to avoid comment start]* IPv6 header length *[inserted by cython to avoid comment closer]/ * IP6_LEN_MIN = IP6_HDR_LEN * IP6_LEN_MAX = 65535 # /[inserted by cython to avoid comment start]* non-jumbo payload *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * IP6_MTU_MIN = 1280 # /[inserted by cython to avoid comment start]* minimum MTU (1024 + 256) *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP6_LEN_MAX, __pyx_int_65535) < 0) __PYX_ERR(0, 362, __pyx_L1_error) /* "dnet.pyx":364 * IP6_LEN_MAX = 65535 # /[inserted by cython to avoid comment start]* non-jumbo payload *[inserted by cython to avoid comment closer]/ - * + * * IP6_MTU_MIN = 1280 # /[inserted by cython to avoid comment start]* minimum MTU (1024 + 256) *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * IP6_HLIM_DEFAULT=64 */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP6_MTU_MIN, __pyx_int_1280) < 0) __PYX_ERR(0, 364, __pyx_L1_error) /* "dnet.pyx":366 * IP6_MTU_MIN = 1280 # /[inserted by cython to avoid comment start]* minimum MTU (1024 + 256) *[inserted by cython to avoid comment closer]/ - * + * * IP6_HLIM_DEFAULT=64 # <<<<<<<<<<<<<< * IP6_HLIM_MAX = 255 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP6_HLIM_DEFAULT, __pyx_int_64) < 0) __PYX_ERR(0, 366, __pyx_L1_error) /* "dnet.pyx":367 - * + * * IP6_HLIM_DEFAULT=64 * IP6_HLIM_MAX = 255 # <<<<<<<<<<<<<< - * + * * IP6_ADDR_UNSPEC = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16) */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_IP6_HLIM_MAX, __pyx_int_255) < 0) __PYX_ERR(0, 367, __pyx_L1_error) /* "dnet.pyx":369 * IP6_HLIM_MAX = 255 - * + * * IP6_ADDR_UNSPEC = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16) # <<<<<<<<<<<<<< * IP6_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16) - * + * */ __pyx_t_4 = PyBytes_FromStringAndSize(((char *)"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"), 16); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 369, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31417,10 +31417,10 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "dnet.pyx":370 - * + * * IP6_ADDR_UNSPEC = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16) * IP6_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16) # <<<<<<<<<<<<<< - * + * * def ip6_ntoa(buf): */ __pyx_t_4 = PyBytes_FromStringAndSize(((char *)"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"), 16); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 370, __pyx_L1_error) @@ -31430,7 +31430,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":372 * IP6_ADDR_LOOPBACK = PyBytes_FromStringAndSize("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16) - * + * * def ip6_ntoa(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a 16-byte packed binary string to a * printable string ('10.0.0.1').""" @@ -31442,7 +31442,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":379 * return __ip6_ntoa(&ia) - * + * * def ip6_aton(buf): # <<<<<<<<<<<<<< * """Convert an IPv6 address from a printable string to a * packed binary string ('\\x0a\\x00\\x00\\x01').""" @@ -31454,7 +31454,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":387 * return PyBytes_FromStringAndSize(&ia, 16) - * + * * def ip6_checksum(buf): # <<<<<<<<<<<<<< * """Return a packed binary string representing an IPv6 packet * with the IPv6 and transport-layer checksums set. @@ -31466,7 +31466,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":397 * return buf - * + * * def ip6_pack_hdr(fc=0, fl=0, plen=0, nxt=IP_PROTO_IPV6, hlim=IP6_HLIM_DEFAULT, # <<<<<<<<<<<<<< * src=IP6_ADDR_UNSPEC, dst=IP6_ADDR_UNSPEC): * """Return a packed binary string representing an IPv6 header. @@ -31486,11 +31486,11 @@ if (!__Pyx_RefNanny) { __pyx_t_3 = 0; /* "dnet.pyx":398 - * + * * def ip6_pack_hdr(fc=0, fl=0, plen=0, nxt=IP_PROTO_IPV6, hlim=IP6_HLIM_DEFAULT, * src=IP6_ADDR_UNSPEC, dst=IP6_ADDR_UNSPEC): # <<<<<<<<<<<<<< * """Return a packed binary string representing an IPv6 header. - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_IP6_ADDR_UNSPEC); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 398, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -31508,7 +31508,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":433 * int addr_aton(char *src, addr_t *dst) - * + * * ADDR_TYPE_NONE = 0 # <<<<<<<<<<<<<< * ADDR_TYPE_ETH = 1 * ADDR_TYPE_IP = 2 @@ -31516,7 +31516,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_ADDR_TYPE_NONE, __pyx_int_0) < 0) __PYX_ERR(0, 433, __pyx_L1_error) /* "dnet.pyx":434 - * + * * ADDR_TYPE_NONE = 0 * ADDR_TYPE_ETH = 1 # <<<<<<<<<<<<<< * ADDR_TYPE_IP = 2 @@ -31529,7 +31529,7 @@ if (!__Pyx_RefNanny) { * ADDR_TYPE_ETH = 1 * ADDR_TYPE_IP = 2 # <<<<<<<<<<<<<< * ADDR_TYPE_IP6 = 3 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ADDR_TYPE_IP, __pyx_int_2) < 0) __PYX_ERR(0, 435, __pyx_L1_error) @@ -31537,14 +31537,14 @@ if (!__Pyx_RefNanny) { * ADDR_TYPE_ETH = 1 * ADDR_TYPE_IP = 2 * ADDR_TYPE_IP6 = 3 # <<<<<<<<<<<<<< - * + * * cdef class addr: */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ADDR_TYPE_IP6, __pyx_int_3) < 0) __PYX_ERR(0, 436, __pyx_L1_error) /* "dnet.pyx":446 * cdef addr_t _addr - * + * * def __init__(self, addrtxt=None, addrtype=ADDR_TYPE_NONE): # <<<<<<<<<<<<<< * if addrtxt != None and addr_aton(addrtxt, &self._addr) < 0: * if PyBytes_Size(addrtxt) == 4: @@ -31557,7 +31557,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":531 * self._addr.addr_bits = IP6_ADDR_BITS - * + * * def bcast(self): # <<<<<<<<<<<<<< * """Return an addr object for our broadcast address.""" * bcast = addr() @@ -31570,7 +31570,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":537 * return bcast - * + * * def net(self): # <<<<<<<<<<<<<< * """Return an addr object for our network address.""" * net = addr() @@ -31583,7 +31583,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":555 * return z - * + * * def __copy__(self): # <<<<<<<<<<<<<< * a = addr() * (a)._addr = self._addr @@ -31640,52 +31640,52 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":677 * eth_addr_t dha, ip_addr_t dpa) - * + * * ARP_HDR_LEN = 8 # /[inserted by cython to avoid comment start]* base ARP header length *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ARP_ETHIP_LEN = 20 # /[inserted by cython to avoid comment start]* base ARP message length *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_HDR_LEN, __pyx_int_8) < 0) __PYX_ERR(0, 677, __pyx_L1_error) /* "dnet.pyx":678 - * + * * ARP_HDR_LEN = 8 # /[inserted by cython to avoid comment start]* base ARP header length *[inserted by cython to avoid comment closer]/ * ARP_ETHIP_LEN = 20 # /[inserted by cython to avoid comment start]* base ARP message length *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * ARP_HRD_ETH = 0x0001 # /[inserted by cython to avoid comment start]* ethernet hardware *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_ETHIP_LEN, __pyx_int_20) < 0) __PYX_ERR(0, 678, __pyx_L1_error) /* "dnet.pyx":680 * ARP_ETHIP_LEN = 20 # /[inserted by cython to avoid comment start]* base ARP message length *[inserted by cython to avoid comment closer]/ - * + * * ARP_HRD_ETH = 0x0001 # /[inserted by cython to avoid comment start]* ethernet hardware *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ARP_HRD_IEEE802=0x0006 # /[inserted by cython to avoid comment start]* IEEE 802 hardware *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_HRD_ETH, __pyx_int_1) < 0) __PYX_ERR(0, 680, __pyx_L1_error) /* "dnet.pyx":681 - * + * * ARP_HRD_ETH = 0x0001 # /[inserted by cython to avoid comment start]* ethernet hardware *[inserted by cython to avoid comment closer]/ * ARP_HRD_IEEE802=0x0006 # /[inserted by cython to avoid comment start]* IEEE 802 hardware *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * ARP_PRO_IP = 0x0800 # /[inserted by cython to avoid comment start]* IP protocol *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_HRD_IEEE802, __pyx_int_6) < 0) __PYX_ERR(0, 681, __pyx_L1_error) /* "dnet.pyx":683 * ARP_HRD_IEEE802=0x0006 # /[inserted by cython to avoid comment start]* IEEE 802 hardware *[inserted by cython to avoid comment closer]/ - * + * * ARP_PRO_IP = 0x0800 # /[inserted by cython to avoid comment start]* IP protocol *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * ARP_OP_REQUEST = 1 # /[inserted by cython to avoid comment start]* request to resolve ha given pa *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_PRO_IP, __pyx_int_2048) < 0) __PYX_ERR(0, 683, __pyx_L1_error) /* "dnet.pyx":685 * ARP_PRO_IP = 0x0800 # /[inserted by cython to avoid comment start]* IP protocol *[inserted by cython to avoid comment closer]/ - * + * * ARP_OP_REQUEST = 1 # /[inserted by cython to avoid comment start]* request to resolve ha given pa *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ARP_OP_REPLY = 2 # /[inserted by cython to avoid comment start]* response giving hardware address *[inserted by cython to avoid comment closer]/ * ARP_OP_REVREQUEST = 3 # /[inserted by cython to avoid comment start]* request to resolve pa given ha *[inserted by cython to avoid comment closer]/ @@ -31693,7 +31693,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_OP_REQUEST, __pyx_int_1) < 0) __PYX_ERR(0, 685, __pyx_L1_error) /* "dnet.pyx":686 - * + * * ARP_OP_REQUEST = 1 # /[inserted by cython to avoid comment start]* request to resolve ha given pa *[inserted by cython to avoid comment closer]/ * ARP_OP_REPLY = 2 # /[inserted by cython to avoid comment start]* response giving hardware address *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ARP_OP_REVREQUEST = 3 # /[inserted by cython to avoid comment start]* request to resolve pa given ha *[inserted by cython to avoid comment closer]/ @@ -31706,7 +31706,7 @@ if (!__Pyx_RefNanny) { * ARP_OP_REPLY = 2 # /[inserted by cython to avoid comment start]* response giving hardware address *[inserted by cython to avoid comment closer]/ * ARP_OP_REVREQUEST = 3 # /[inserted by cython to avoid comment start]* request to resolve pa given ha *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * ARP_OP_REVREPLY = 4 # /[inserted by cython to avoid comment start]* response giving protocol address *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_OP_REVREQUEST, __pyx_int_3) < 0) __PYX_ERR(0, 687, __pyx_L1_error) @@ -31714,17 +31714,17 @@ if (!__Pyx_RefNanny) { * ARP_OP_REPLY = 2 # /[inserted by cython to avoid comment start]* response giving hardware address *[inserted by cython to avoid comment closer]/ * ARP_OP_REVREQUEST = 3 # /[inserted by cython to avoid comment start]* request to resolve pa given ha *[inserted by cython to avoid comment closer]/ * ARP_OP_REVREPLY = 4 # /[inserted by cython to avoid comment start]* response giving protocol address *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * cdef int __arp_callback(arp_entry *entry, void *arg) except -1: */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ARP_OP_REVREPLY, __pyx_int_4) < 0) __PYX_ERR(0, 688, __pyx_L1_error) /* "dnet.pyx":712 * raise OSError, __oserror() - * + * * def add(self, addr pa, addr ha): # <<<<<<<<<<<<<< * """Add an entry to the system ARP table. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_3arp_3add, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_arp_add, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__55)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 712, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31734,10 +31734,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":725 * raise OSError, __oserror() - * + * * def delete(self, addr pa): # <<<<<<<<<<<<<< * """Delete an entry from the system ARP table. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_3arp_5delete, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_arp_delete, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__57)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 725, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31747,7 +31747,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":736 * raise OSError, __oserror() - * + * * def get(self, addr pa): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system ARP table. @@ -31760,7 +31760,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":749 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system ARP table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -31795,7 +31795,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":771 * arp_close(self.arp) - * + * * def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, # <<<<<<<<<<<<<< * sha=ETH_ADDR_UNSPEC, spa=IP_ADDR_ANY, * dha=ETH_ADDR_UNSPEC, dpa=IP_ADDR_ANY): @@ -31810,7 +31810,7 @@ if (!__Pyx_RefNanny) { __pyx_t_3 = 0; /* "dnet.pyx":772 - * + * * def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, * sha=ETH_ADDR_UNSPEC, spa=IP_ADDR_ANY, # <<<<<<<<<<<<<< * dha=ETH_ADDR_UNSPEC, dpa=IP_ADDR_ANY): @@ -31832,7 +31832,7 @@ if (!__Pyx_RefNanny) { * sha=ETH_ADDR_UNSPEC, spa=IP_ADDR_ANY, * dha=ETH_ADDR_UNSPEC, dpa=IP_ADDR_ANY): # <<<<<<<<<<<<<< * """Return a packed binary string representing an Ethernet/IP ARP message. - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_ETH_ADDR_UNSPEC); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 773, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -31850,10 +31850,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":799 * void __icmp_pack_hdr "icmp_pack_hdr" (char *hdr, int type, int code) - * + * * def icmp_pack_hdr(itype, code): # <<<<<<<<<<<<<< * """Return a packed binary string representing an ICMP header. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_31icmp_pack_hdr, 0, __pyx_n_s_icmp_pack_hdr, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__67)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 799, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -31862,16 +31862,16 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":817 * int sport, int dport, unsigned long seq, unsigned long ack, int flags, int win, int urp) - * + * * TCP_HDR_LEN = 20 # /[inserted by cython to avoid comment start]* base TCP header length *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * TH_FIN = 0x01 # /[inserted by cython to avoid comment start]* end of data *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_TCP_HDR_LEN, __pyx_int_20) < 0) __PYX_ERR(0, 817, __pyx_L1_error) /* "dnet.pyx":819 * TCP_HDR_LEN = 20 # /[inserted by cython to avoid comment start]* base TCP header length *[inserted by cython to avoid comment closer]/ - * + * * TH_FIN = 0x01 # /[inserted by cython to avoid comment start]* end of data *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * TH_SYN = 0x02 # /[inserted by cython to avoid comment start]* synchronize sequence numbers *[inserted by cython to avoid comment closer]/ * TH_RST = 0x04 # /[inserted by cython to avoid comment start]* reset connection *[inserted by cython to avoid comment closer]/ @@ -31879,7 +31879,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_TH_FIN, __pyx_int_1) < 0) __PYX_ERR(0, 819, __pyx_L1_error) /* "dnet.pyx":820 - * + * * TH_FIN = 0x01 # /[inserted by cython to avoid comment start]* end of data *[inserted by cython to avoid comment closer]/ * TH_SYN = 0x02 # /[inserted by cython to avoid comment start]* synchronize sequence numbers *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * TH_RST = 0x04 # /[inserted by cython to avoid comment start]* reset connection *[inserted by cython to avoid comment closer]/ @@ -31928,7 +31928,7 @@ if (!__Pyx_RefNanny) { * TH_URG = 0x20 # /[inserted by cython to avoid comment start]* urgent pointer set *[inserted by cython to avoid comment closer]/ * TH_ECE = 0x40 # /[inserted by cython to avoid comment start]* ECN echo, RFC 3168 *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * TH_CWR = 0x80 # /[inserted by cython to avoid comment start]* congestion window reduced *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_TH_ECE, __pyx_int_64) < 0) __PYX_ERR(0, 825, __pyx_L1_error) @@ -31936,32 +31936,32 @@ if (!__Pyx_RefNanny) { * TH_URG = 0x20 # /[inserted by cython to avoid comment start]* urgent pointer set *[inserted by cython to avoid comment closer]/ * TH_ECE = 0x40 # /[inserted by cython to avoid comment start]* ECN echo, RFC 3168 *[inserted by cython to avoid comment closer]/ * TH_CWR = 0x80 # /[inserted by cython to avoid comment start]* congestion window reduced *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * TCP_PORT_MAX = 65535 # /[inserted by cython to avoid comment start]* maximum port *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_TH_CWR, __pyx_int_128) < 0) __PYX_ERR(0, 826, __pyx_L1_error) /* "dnet.pyx":828 * TH_CWR = 0x80 # /[inserted by cython to avoid comment start]* congestion window reduced *[inserted by cython to avoid comment closer]/ - * + * * TCP_PORT_MAX = 65535 # /[inserted by cython to avoid comment start]* maximum port *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * TCP_WIN_MAX = 65535 # /[inserted by cython to avoid comment start]* maximum (unscaled) window *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_TCP_PORT_MAX, __pyx_int_65535) < 0) __PYX_ERR(0, 828, __pyx_L1_error) /* "dnet.pyx":829 - * + * * TCP_PORT_MAX = 65535 # /[inserted by cython to avoid comment start]* maximum port *[inserted by cython to avoid comment closer]/ * TCP_WIN_MAX = 65535 # /[inserted by cython to avoid comment start]* maximum (unscaled) window *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * TCP_OPT_EOL = 0 # /[inserted by cython to avoid comment start]* end of option list *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_TCP_WIN_MAX, __pyx_int_65535) < 0) __PYX_ERR(0, 829, __pyx_L1_error) /* "dnet.pyx":831 * TCP_WIN_MAX = 65535 # /[inserted by cython to avoid comment start]* maximum (unscaled) window *[inserted by cython to avoid comment closer]/ - * + * * TCP_OPT_EOL = 0 # /[inserted by cython to avoid comment start]* end of option list *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * TCP_OPT_NOP = 1 # /[inserted by cython to avoid comment start]* no operation *[inserted by cython to avoid comment closer]/ * TCP_OPT_MSS = 2 # /[inserted by cython to avoid comment start]* maximum segment size *[inserted by cython to avoid comment closer]/ @@ -31969,7 +31969,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_TCP_OPT_EOL, __pyx_int_0) < 0) __PYX_ERR(0, 831, __pyx_L1_error) /* "dnet.pyx":832 - * + * * TCP_OPT_EOL = 0 # /[inserted by cython to avoid comment start]* end of option list *[inserted by cython to avoid comment closer]/ * TCP_OPT_NOP = 1 # /[inserted by cython to avoid comment start]* no operation *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * TCP_OPT_MSS = 2 # /[inserted by cython to avoid comment start]* maximum segment size *[inserted by cython to avoid comment closer]/ @@ -32189,7 +32189,7 @@ if (!__Pyx_RefNanny) { * TCP_OPT_SNAP = 24 # /[inserted by cython to avoid comment start]* SNAP *[inserted by cython to avoid comment closer]/ * TCP_OPT_TCPCOMP = 26 # /[inserted by cython to avoid comment start]* TCP compression filter *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * TCP_OPT_MAX = 27 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_TCP_OPT_TCPCOMP, __pyx_int_26) < 0) __PYX_ERR(0, 856, __pyx_L1_error) @@ -32197,14 +32197,14 @@ if (!__Pyx_RefNanny) { * TCP_OPT_SNAP = 24 # /[inserted by cython to avoid comment start]* SNAP *[inserted by cython to avoid comment closer]/ * TCP_OPT_TCPCOMP = 26 # /[inserted by cython to avoid comment start]* TCP compression filter *[inserted by cython to avoid comment closer]/ * TCP_OPT_MAX = 27 # <<<<<<<<<<<<<< - * + * * def tcp_pack_hdr(sport, dport, seq=1, ack=0, flags=TH_SYN, */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_TCP_OPT_MAX, __pyx_int_27) < 0) __PYX_ERR(0, 857, __pyx_L1_error) /* "dnet.pyx":859 * TCP_OPT_MAX = 27 - * + * * def tcp_pack_hdr(sport, dport, seq=1, ack=0, flags=TH_SYN, # <<<<<<<<<<<<<< * win=TCP_WIN_MAX, urp=0): * """Return a packed binary string representing a TCP header. @@ -32219,11 +32219,11 @@ if (!__Pyx_RefNanny) { __pyx_t_3 = 0; /* "dnet.pyx":860 - * + * * def tcp_pack_hdr(sport, dport, seq=1, ack=0, flags=TH_SYN, * win=TCP_WIN_MAX, urp=0): # <<<<<<<<<<<<<< * """Return a packed binary string representing a TCP header. - * + * */ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_TCP_WIN_MAX); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 860, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); @@ -32236,28 +32236,28 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":882 * void __udp_pack_hdr "udp_pack_hdr" (char *hdr, int sport, int dport, int ulen) - * + * * UDP_HDR_LEN = 8 # <<<<<<<<<<<<<< * UDP_PORT_MAX = 65535 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_UDP_HDR_LEN, __pyx_int_8) < 0) __PYX_ERR(0, 882, __pyx_L1_error) /* "dnet.pyx":883 - * + * * UDP_HDR_LEN = 8 * UDP_PORT_MAX = 65535 # <<<<<<<<<<<<<< - * + * * def udp_pack_hdr(sport, dport, ulen=UDP_HDR_LEN): */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_UDP_PORT_MAX, __pyx_int_65535) < 0) __PYX_ERR(0, 883, __pyx_L1_error) /* "dnet.pyx":885 * UDP_PORT_MAX = 65535 - * + * * def udp_pack_hdr(sport, dport, ulen=UDP_HDR_LEN): # <<<<<<<<<<<<<< * """Return a packed binary string representing a UDP header. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_35udp_pack_hdr, 0, __pyx_n_s_udp_pack_hdr, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__71)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 885, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32273,7 +32273,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":924 * intf_t *intf_close(intf_t *intf) - * + * * INTF_TYPE_OTHER = 1 # /[inserted by cython to avoid comment start]* other *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * INTF_TYPE_ETH = 6 # /[inserted by cython to avoid comment start]* Ethernet *[inserted by cython to avoid comment closer]/ * INTF_TYPE_LOOPBACK = 24 # /[inserted by cython to avoid comment start]* software loopback *[inserted by cython to avoid comment closer]/ @@ -32281,7 +32281,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_INTF_TYPE_OTHER, __pyx_int_1) < 0) __PYX_ERR(0, 924, __pyx_L1_error) /* "dnet.pyx":925 - * + * * INTF_TYPE_OTHER = 1 # /[inserted by cython to avoid comment start]* other *[inserted by cython to avoid comment closer]/ * INTF_TYPE_ETH = 6 # /[inserted by cython to avoid comment start]* Ethernet *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * INTF_TYPE_LOOPBACK = 24 # /[inserted by cython to avoid comment start]* software loopback *[inserted by cython to avoid comment closer]/ @@ -32294,7 +32294,7 @@ if (!__Pyx_RefNanny) { * INTF_TYPE_ETH = 6 # /[inserted by cython to avoid comment start]* Ethernet *[inserted by cython to avoid comment closer]/ * INTF_TYPE_LOOPBACK = 24 # /[inserted by cython to avoid comment start]* software loopback *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * INTF_TYPE_TUN = 53 # /[inserted by cython to avoid comment start]* proprietary virtual/internal *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_INTF_TYPE_LOOPBACK, __pyx_int_24) < 0) __PYX_ERR(0, 926, __pyx_L1_error) @@ -32302,14 +32302,14 @@ if (!__Pyx_RefNanny) { * INTF_TYPE_ETH = 6 # /[inserted by cython to avoid comment start]* Ethernet *[inserted by cython to avoid comment closer]/ * INTF_TYPE_LOOPBACK = 24 # /[inserted by cython to avoid comment start]* software loopback *[inserted by cython to avoid comment closer]/ * INTF_TYPE_TUN = 53 # /[inserted by cython to avoid comment start]* proprietary virtual/internal *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * INTF_FLAG_UP = 0x01 # /[inserted by cython to avoid comment start]* enable interface *[inserted by cython to avoid comment closer]/ */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_INTF_TYPE_TUN, __pyx_int_53) < 0) __PYX_ERR(0, 927, __pyx_L1_error) /* "dnet.pyx":929 * INTF_TYPE_TUN = 53 # /[inserted by cython to avoid comment start]* proprietary virtual/internal *[inserted by cython to avoid comment closer]/ - * + * * INTF_FLAG_UP = 0x01 # /[inserted by cython to avoid comment start]* enable interface *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * INTF_FLAG_LOOPBACK = 0x02 # /[inserted by cython to avoid comment start]* is a loopback net (r/o) *[inserted by cython to avoid comment closer]/ * INTF_FLAG_POINTOPOINT = 0x04 # /[inserted by cython to avoid comment start]* point-to-point link (r/o) *[inserted by cython to avoid comment closer]/ @@ -32317,7 +32317,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_INTF_FLAG_UP, __pyx_int_1) < 0) __PYX_ERR(0, 929, __pyx_L1_error) /* "dnet.pyx":930 - * + * * INTF_FLAG_UP = 0x01 # /[inserted by cython to avoid comment start]* enable interface *[inserted by cython to avoid comment closer]/ * INTF_FLAG_LOOPBACK = 0x02 # /[inserted by cython to avoid comment start]* is a loopback net (r/o) *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * INTF_FLAG_POINTOPOINT = 0x04 # /[inserted by cython to avoid comment start]* point-to-point link (r/o) *[inserted by cython to avoid comment closer]/ @@ -32348,7 +32348,7 @@ if (!__Pyx_RefNanny) { * INTF_FLAG_NOARP = 0x08 # /[inserted by cython to avoid comment start]* disable ARP *[inserted by cython to avoid comment closer]/ * INTF_FLAG_BROADCAST = 0x10 # /[inserted by cython to avoid comment start]* supports broadcast (r/o) *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< * INTF_FLAG_MULTICAST = 0x20 # /[inserted by cython to avoid comment start]* supports multicast (r/o) *[inserted by cython to avoid comment closer]/ - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_INTF_FLAG_BROADCAST, __pyx_int_16) < 0) __PYX_ERR(0, 933, __pyx_L1_error) @@ -32356,14 +32356,14 @@ if (!__Pyx_RefNanny) { * INTF_FLAG_NOARP = 0x08 # /[inserted by cython to avoid comment start]* disable ARP *[inserted by cython to avoid comment closer]/ * INTF_FLAG_BROADCAST = 0x10 # /[inserted by cython to avoid comment start]* supports broadcast (r/o) *[inserted by cython to avoid comment closer]/ * INTF_FLAG_MULTICAST = 0x20 # /[inserted by cython to avoid comment start]* supports multicast (r/o) *[inserted by cython to avoid comment closer]/ # <<<<<<<<<<<<<< - * + * * cdef object ifent_to_dict(intf_entry *entry): */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_INTF_FLAG_MULTICAST, __pyx_int_32) < 0) __PYX_ERR(0, 934, __pyx_L1_error) /* "dnet.pyx":992 * raise OSError, __oserror() - * + * * def get(self, name): # <<<<<<<<<<<<<< * """Return the configuration for a network interface as a dict. * """ @@ -32376,7 +32376,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1004 * return ifent_to_dict(ifent) - * + * * def get_src(self, addr src): # <<<<<<<<<<<<<< * """Return the configuration for the interface whose primary address * matches the specified source address. @@ -32389,7 +32389,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1016 * return ifent_to_dict(ifent) - * + * * def get_dst(self, addr dst): # <<<<<<<<<<<<<< * """Return the configuration for the best interface with which to * reach the specified dst address. @@ -32402,10 +32402,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1028 * return ifent_to_dict(ifent) - * + * * def set(self, d): # <<<<<<<<<<<<<< * """Set the configuration for an interface from a dict. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_4intf_9set, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_intf_set, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__79)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1028, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32415,7 +32415,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1049 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system interface table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -32450,10 +32450,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1111 * raise OSError, __oserror() - * + * * def add(self, addr dst, addr gw): # <<<<<<<<<<<<<< * """Add an entry to the system routing table. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_5route_3add, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_route_add, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__84)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1111, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32463,10 +32463,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1124 * raise OSError, __oserror() - * + * * def delete(self, addr dst): # <<<<<<<<<<<<<< * """Delete an entry from the system routing table. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_5route_5delete, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_route_delete, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__86)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1124, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32476,7 +32476,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1135 * raise OSError, __oserror() - * + * * def get(self, addr dst): # <<<<<<<<<<<<<< * """Return the hardware address for a given protocol address * in the system routing table. @@ -32489,7 +32489,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1148 * return None - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the system routing table, invoking a user callback * with each entry, returning the status of the callback routine. @@ -32524,46 +32524,46 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1194 * fw_t *fw_close(fw_t *f) - * + * * FW_OP_ALLOW = 1 # <<<<<<<<<<<<<< * FW_OP_BLOCK = 2 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_FW_OP_ALLOW, __pyx_int_1) < 0) __PYX_ERR(0, 1194, __pyx_L1_error) /* "dnet.pyx":1195 - * + * * FW_OP_ALLOW = 1 * FW_OP_BLOCK = 2 # <<<<<<<<<<<<<< - * + * * FW_DIR_IN = 1 */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_FW_OP_BLOCK, __pyx_int_2) < 0) __PYX_ERR(0, 1195, __pyx_L1_error) /* "dnet.pyx":1197 * FW_OP_BLOCK = 2 - * + * * FW_DIR_IN = 1 # <<<<<<<<<<<<<< * FW_DIR_OUT = 2 - * + * */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_FW_DIR_IN, __pyx_int_1) < 0) __PYX_ERR(0, 1197, __pyx_L1_error) /* "dnet.pyx":1198 - * + * * FW_DIR_IN = 1 * FW_DIR_OUT = 2 # <<<<<<<<<<<<<< - * + * * cdef object rule_to_dict(fw_rule *rule): */ if (PyDict_SetItem(__pyx_d, __pyx_n_s_FW_DIR_OUT, __pyx_int_2) < 0) __PYX_ERR(0, 1198, __pyx_L1_error) /* "dnet.pyx":1257 * raise OSError, __oserror() - * + * * def add(self, d): # <<<<<<<<<<<<<< * """Add a firewall rule specified as a dict. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_2fw_3add, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_fw_add, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__92)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1257, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32573,7 +32573,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1276 * raise OSError, __oserror() - * + * * def delete(self, d): # <<<<<<<<<<<<<< * """Delete a firewall rule specified as a dict.""" * cdef fw_rule rule @@ -32586,7 +32586,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1284 * raise OSError, __oserror() - * + * * def loop(self, callback, arg=None): # <<<<<<<<<<<<<< * """Iterate over the local firewall ruleset, invoking a user callback * with each entry, returning the status of the callback routine. @@ -32621,10 +32621,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1337 * raise OSError, __oserror() - * + * * def get(self, len): # <<<<<<<<<<<<<< * """Return a string of random bytes. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_4rand_3get, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_rand_get, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__98)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1337, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32634,10 +32634,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1354 * return s - * + * * def set(self, buf): # <<<<<<<<<<<<<< * """Initialize the PRNG from a known seed. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_4rand_5set, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_rand_set, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__100)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1354, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32647,10 +32647,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1362 * rand_set(self.rand, buf, PyBytes_Size(buf)) - * + * * def add(self, buf): # <<<<<<<<<<<<<< * """Add additional entropy into the PRNG mix. - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_4rand_7add, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_rand_add, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__101)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1362, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32660,7 +32660,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1370 * rand_add(self.rand, buf, PyBytes_Size(buf)) - * + * * def uint8(self): # <<<<<<<<<<<<<< * """Return a random 8-bit integer.""" * return rand_uint8(self.rand) @@ -32673,7 +32673,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1374 * return rand_uint8(self.rand) - * + * * def uint16(self): # <<<<<<<<<<<<<< * """Return a random 16-bit integer.""" * return rand_uint16(self.rand) @@ -32686,7 +32686,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1378 * return rand_uint16(self.rand) - * + * * def uint32(self): # <<<<<<<<<<<<<< * """Return a random 32-bit integer.""" * return rand_uint32(self.rand) @@ -32699,10 +32699,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1382 * return rand_uint32(self.rand) - * + * * def xrange(self, start, stop=None): # <<<<<<<<<<<<<< * """xrange([start,] stop) -> xrange object - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_4rand_15xrange, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_rand_xrange_2, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__106)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1382, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -32755,7 +32755,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1518 * return tun_fileno(self.tun) - * + * * def fileno(self): # <<<<<<<<<<<<<< * """Return file descriptor for tunnel handle.""" * return tun_fileno(self.tun) @@ -32768,7 +32768,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1522 * return tun_fileno(self.tun) - * + * * def send(self, pkt): # <<<<<<<<<<<<<< * """Send an IP packet, returning the number of bytes sent * or -1 on failure. @@ -32781,7 +32781,7 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1531 * return tun_send(self.tun, pkt, PyBytes_Size(pkt)) - * + * * def recv(self): # <<<<<<<<<<<<<< * """Return the next packet delivered to the tunnel interface.""" * cdef int n @@ -32794,10 +32794,10 @@ if (!__Pyx_RefNanny) { /* "dnet.pyx":1539 * return PyBytes_FromStringAndSize(self.buf, n) - * + * * def close(self): # <<<<<<<<<<<<<< * self.tun = tun_close(self.tun) - * + * */ __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_4dnet_3tun_9close, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_tun_close, NULL, __pyx_n_s_dnet, __pyx_d, ((PyObject *)__pyx_codeobj__115)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1539, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); diff --git a/libs/libdnet/python/dnet.pxd b/libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.pxd similarity index 100% rename from libs/libdnet/python/dnet.pxd rename to libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.pxd diff --git a/libs/libdnet/python/dnet.pxd.in b/libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.pxd.in similarity index 100% rename from libs/libdnet/python/dnet.pxd.in rename to libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.pxd.in diff --git a/libs/libdnet/python/dnet.pyx b/libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.pyx similarity index 99% rename from libs/libdnet/python/dnet.pyx rename to libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.pyx index 4e3604fd0a..fd8a1eb218 100644 --- a/libs/libdnet/python/dnet.pyx +++ b/libs/libdnet/libdnet-libdnet-1.18.0/python/dnet.pyx @@ -62,7 +62,7 @@ cdef extern from *: int __xxx ctypedef struct eth_addr_t: char data[6] - + eth_t *eth_open(char *device) int eth_get(eth_t *eth, eth_addr_t *ea) int eth_set(eth_t *eth, eth_addr_t *ea) @@ -107,12 +107,12 @@ cdef class eth: Open the specified Ethernet device for sending. """ cdef eth_t *eth - + def __init__(self, device): self.eth = eth_open(device) if not self.eth: raise OSError, __oserror() - + def get(self): """Return the MAC address associated with the device as a binary string.""" @@ -124,7 +124,7 @@ cdef class eth: def set(self, value): """Set the MAC address for the device, returning 0 on success, -1 on failure. - + Arguments: eth_addr -- 6-byte binary string (e.g. '\\x00\\xde\\xad\\xbe\\xef\\x00') """ @@ -136,12 +136,12 @@ cdef class eth: def send(self, frame): """Send an Ethernet frame, returning the number of bytes sent or -1 on failure. - + Arguments: frame -- binary string representing an Ethernet frame """ return eth_send(self.eth, frame, PyBytes_Size(frame)) - + def __dealloc__(self): if self.eth: eth_close(self.eth) @@ -164,7 +164,7 @@ def eth_aton(buf): def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST, etype=ETH_TYPE_IP): """Return a packed binary string representing an Ethernet header. - + Keyword arguments: dst -- destination address (6-byte binary string) src -- source address (6-byte binary string) @@ -286,9 +286,9 @@ def ip_aton(buf): return PyBytes_FromStringAndSize(&ia, 4) def ip_checksum(pkt): - """Return packed binary string representing an IP packet + """Return packed binary string representing an IP packet with the IP and transport-layer checksums set. - + Arguments: pkt -- binary string representing an IP packet """ @@ -323,7 +323,7 @@ def ip_pack_hdr(tos=IP_TOS_DEFAULT, len=IP_HDR_LEN, id=0, off=0, ttl=IP_TTL_DEFAULT, p=IP_PROTO_IP, src=IP_ADDR_ANY, dst=IP_ADDR_ANY): """Return a packed binary string representing an IP header. - + Keyword arguments: tos -- type of service (8-bit integer) len -- length (IP_HDR_LEN + payload) (16-bit integer) @@ -385,7 +385,7 @@ def ip6_aton(buf): return PyBytes_FromStringAndSize(&ia, 16) def ip6_checksum(buf): - """Return a packed binary string representing an IPv6 packet + """Return a packed binary string representing an IPv6 packet with the IPv6 and transport-layer checksums set. Arguments: @@ -397,7 +397,7 @@ def ip6_checksum(buf): def ip6_pack_hdr(fc=0, fl=0, plen=0, nxt=IP_PROTO_IPV6, hlim=IP6_HLIM_DEFAULT, src=IP6_ADDR_UNSPEC, dst=IP6_ADDR_UNSPEC): """Return a packed binary string representing an IPv6 header. - + Keyword arguments: fc -- flow class (8-bit integer) fl -- flow label (20-bit integer) @@ -442,7 +442,7 @@ cdef class addr: human-readable Ethernet, IP, or IPv6 address string. """ cdef addr_t _addr - + def __init__(self, addrtxt=None, addrtype=ADDR_TYPE_NONE): if addrtxt != None and addr_aton(addrtxt, &self._addr) < 0: if PyBytes_Size(addrtxt) == 4: @@ -451,7 +451,7 @@ cdef class addr: self.ip = addrtxt else: raise ValueError, "invalid network address" - + property addrtype: """Address type (ADDR_TYPE_*) integer.""" def __get__(self): @@ -459,7 +459,7 @@ cdef class addr: def __set__(self, unsigned int value): if value > 0xffff: raise OverflowError self._addr.addr_type = value - + property bits: """Address bitlength integer.""" def __get__(self): @@ -479,28 +479,28 @@ cdef class addr: return self.ip6 else: raise ValueError, "invalid network address" - + property eth: """Ethernet MAC address as binary string.""" def __get__(self): if self._addr.addr_type != ADDR_TYPE_ETH: raise ValueError, "non-Ethernet address" return PyBytes_FromStringAndSize(self._addr.addr_data8, 6) - + def __set__(self, value): if PyBytes_Size(value) != ETH_ADDR_LEN: raise ValueError, "not a 6-byte string" __memcpy(self._addr.addr_data8, value, 6) self._addr.addr_type = ADDR_TYPE_ETH self._addr.addr_bits = ETH_ADDR_BITS - + property ip: """IPv4 address as binary string.""" def __get__(self): if self._addr.addr_type != ADDR_TYPE_IP: raise ValueError, "non-IP address" return PyBytes_FromStringAndSize(self._addr.addr_data8, 4) - + def __set__(self, value): # XXX - handle < 2.3, or else we'd use PyLong_AsUnsignedLongMask() if PyLong_Check(value): @@ -513,14 +513,14 @@ cdef class addr: __memcpy(self._addr.addr_data8, value, 4) self._addr.addr_type = ADDR_TYPE_IP self._addr.addr_bits = IP_ADDR_BITS - + property ip6: """IPv6 address as binary string.""" def __get__(self): if self._addr.addr_type != ADDR_TYPE_IP6: raise ValueError, "non-IPv6 address" return PyBytes_FromStringAndSize(self._addr.addr_data8, 16) - + def __set__(self, value): if PyBytes_Size(value) != IP6_ADDR_LEN: raise ValueError, "not a 16-byte string" @@ -551,7 +551,7 @@ cdef class addr: z = x.__copy__() (z)._addr.addr_ip = htonl(ntohl((x)._addr.addr_ip) + y) return z - + def __copy__(self): a = addr() (a)._addr = self._addr @@ -562,16 +562,16 @@ cdef class addr: def __ne__(addr x, addr y): return addr_cmp(&x._addr, &y._addr) != 0 - + def __lt__(addr x, addr y): return addr_cmp(&x._addr, &y._addr) == -1 - + def __gt__(addr x, addr y): return addr_cmp(&x._addr, &y._addr) == 1 - + def __le__(addr x, addr y): return addr_cmp(&x._addr, &y._addr) != 1 - + def __ge__(addr x, addr y): return addr_cmp(&x._addr, &y._addr) != -1 @@ -605,10 +605,10 @@ cdef class addr: if self._addr.addr_type != ADDR_TYPE_IP: raise NotImplementedError return ntohl(self._addr.addr_ip) - + def __long__(self): return self.__int__() - + def __iter__(self): cdef addr_t a, b if self._addr.addr_type != ADDR_TYPE_IP or \ @@ -624,7 +624,7 @@ cdef class addr: yield next """ return __addr_ip4_iter(a.addr_ip, b.addr_ip) - + def __repr__(self): cdef char *p p = addr_ntoa(&self._addr) @@ -639,7 +639,7 @@ cdef class __addr_ip4_iter: def __init__(self, cur, max): self.cur = ntohl(cur) self.max = ntohl(max) - + def __next__(self): cdef addr next if (self.cur <= self.max): @@ -662,7 +662,7 @@ cdef extern from *: ctypedef struct arp_t: int __xxx ctypedef int (*arp_handler)(arp_entry *entry, void *arg) except -1 - + arp_t *arp_open() int arp_add(arp_t *arp, arp_entry *entry) int arp_delete(arp_t *arp, arp_entry *entry) @@ -703,7 +703,7 @@ cdef class arp: Open a handle to the system ARP table. """ cdef arp_t *arp - + def __init__(self): self.arp = arp_open() if not self.arp: @@ -732,7 +732,7 @@ cdef class arp: entry.arp_pa = pa._addr if arp_delete(self.arp, &entry) < 0: raise OSError, __oserror() - + def get(self, addr pa): """Return the hardware address for a given protocol address in the system ARP table. @@ -763,7 +763,7 @@ cdef class arp: l = [] self.loop(__iter_append, l) return iter(l) - + def __dealloc__(self): if self.arp: arp_close(self.arp) @@ -772,7 +772,7 @@ def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, sha=ETH_ADDR_UNSPEC, spa=IP_ADDR_ANY, dha=ETH_ADDR_UNSPEC, dpa=IP_ADDR_ANY): """Return a packed binary string representing an Ethernet/IP ARP message. - + Keyword arguments: op -- operation (ARP_OP_*) (16-bit integer) sha -- sender Ethernet address (6-byte binary string) @@ -795,7 +795,7 @@ def arp_pack_hdr_ethip(op=ARP_OP_REQUEST, # cdef extern from *: void __icmp_pack_hdr "icmp_pack_hdr" (char *hdr, int type, int code) - + def icmp_pack_hdr(itype, code): """Return a packed binary string representing an ICMP header. @@ -912,7 +912,7 @@ cdef extern from *: ctypedef struct intf_t: int __xxx ctypedef int (*intf_handler)(intf_entry *entry, void *arg) except -1 - + intf_t *intf_open() int intf_get(intf_t *intf, intf_entry *entry) int intf_get_src(intf_t *intf, intf_entry *entry, addr_t *src) @@ -988,7 +988,7 @@ cdef class intf: self.intf = intf_open() if not self.intf: raise OSError, __oserror() - + def get(self, name): """Return the configuration for a network interface as a dict. """ @@ -1012,7 +1012,7 @@ cdef class intf: if intf_get_src(self.intf, ifent, &src._addr) < 0: raise OSError, __oserror() return ifent_to_dict(ifent) - + def get_dst(self, addr dst): """Return the configuration for the best interface with which to reach the specified dst address. @@ -1024,7 +1024,7 @@ cdef class intf: if intf_get_dst(self.intf, ifent, &dst._addr) < 0: raise OSError, __oserror() return ifent_to_dict(ifent) - + def set(self, d): """Set the configuration for an interface from a dict. @@ -1045,7 +1045,7 @@ cdef class intf: dict_to_ifent(d, ifent) if intf_set(self.intf, ifent) < 0: raise OSError, __oserror() - + def loop(self, callback, arg=None): """Iterate over the system interface table, invoking a user callback with each entry, returning the status of the callback routine. @@ -1063,7 +1063,7 @@ cdef class intf: l = [] self.loop(__iter_append, l) return iter(l) - + def __dealloc__(self): if self.intf: intf_close(self.intf) @@ -1078,7 +1078,7 @@ cdef extern from *: ctypedef struct route_t: int __xxx ctypedef int (*route_handler)(route_entry *entry, void *arg) except -1 - + route_t *route_open() int route_add(route_t *route, route_entry *entry) int route_delete(route_t *route, route_entry *entry) @@ -1102,7 +1102,7 @@ cdef class route: Open a handle to the system routing table. """ cdef route_t *route - + def __init__(self): self.route = route_open() if not self.route: @@ -1131,7 +1131,7 @@ cdef class route: entry.route_dst = dst._addr if route_delete(self.route, &entry) < 0: raise OSError, __oserror() - + def get(self, addr dst): """Return the hardware address for a given protocol address in the system routing table. @@ -1157,12 +1157,12 @@ cdef class route: """ _arg = (callback, arg) return route_loop(self.route, __route_callback, _arg) - + def __iter__(self): l = [] self.loop(__iter_append, l) return iter(l) - + def __dealloc__(self): if self.route: route_close(self.route) @@ -1180,7 +1180,7 @@ cdef extern from *: addr_t fw_dst int fw_sport[2] int fw_dport[2] - + ctypedef struct fw_t: int __xxx ctypedef int (*fw_handler)(fw_rule *rule, void *arg) except -1 @@ -1244,11 +1244,11 @@ cdef int __fw_callback(fw_rule *rule, void *arg) except -1: cdef class fw: """fw() -> Firewall ruleset object - + Open a handle to the local network firewall configuration. """ cdef fw_t *fw - + def __init__(self): self.fw = fw_open() if not self.fw: @@ -1298,7 +1298,7 @@ cdef class fw: l = [] self.loop(__iter_append, l) return iter(l) - + def __dealloc__(self): if self.fw: fw_close(self.fw) @@ -1309,7 +1309,7 @@ cdef class fw: cdef extern from *: ctypedef struct rand_t: int __xxx - + rand_t *rand_open() int rand_get(rand_t *rand, char *buf, int len) int rand_set(rand_t *rand, char *seed, int len) @@ -1336,7 +1336,7 @@ cdef class rand: def get(self, len): """Return a string of random bytes. - + Arguments: len -- number of random bytes to generate """ @@ -1350,15 +1350,15 @@ cdef class rand: s = PyBytes_FromStringAndSize(p, len) free(p) return s - + def set(self, buf): """Initialize the PRNG from a known seed. - + Arguments: string -- binary string seed value """ rand_set(self.rand, buf, PyBytes_Size(buf)) - + def add(self, buf): """Add additional entropy into the PRNG mix. @@ -1366,15 +1366,15 @@ cdef class rand: string -- binary string """ rand_add(self.rand, buf, PyBytes_Size(buf)) - + def uint8(self): """Return a random 8-bit integer.""" return rand_uint8(self.rand) - + def uint16(self): """Return a random 16-bit integer.""" return rand_uint16(self.rand) - + def uint32(self): """Return a random 32-bit integer.""" return rand_uint32(self.rand) @@ -1389,7 +1389,7 @@ cdef class rand: return __rand_xrange(self, 0, start) else: return __rand_xrange(self, start, stop) - + def __dealloc__(self): if self.rand: rand_close(self.rand) @@ -1406,10 +1406,10 @@ cdef class __rand_xrange: cdef unsigned long cur, enc, max, mask, start, sboxmask cdef unsigned int sbox[128] # TEASBOXSIZE cdef int left, right, kshift - + def __init__(self, r, start, stop): cdef unsigned int bits - + self.rand = (r).rand if PyLong_Check(start): self.start = PyLong_AsLong(start) @@ -1417,21 +1417,21 @@ cdef class __rand_xrange: self.start = PyLong_AsUnsignedLong(start) else: raise TypeError, 'start must be an integer' - + if PyLong_Check(start): self.max = PyLong_AsLong(stop) - self.start elif PyLong_Check(start): self.max = PyLong_AsUnsignedLong(stop) - self.start else: raise TypeError, 'stop must be an integer' - + # XXX - permute range once only! rand_get(self.rand, self.sbox, sizeof(self.sbox)) - + bits = 0 while self.max > (1 << bits): bits = bits + 1 - + self.left = int(bits / 2) self.right = bits - self.left self.mask = (1 << bits) - 1 @@ -1450,10 +1450,10 @@ cdef class __rand_xrange: def __len__(self): return self.max - + def __next__(self): cdef unsigned long c, sum - + if self.cur == self.max: raise StopIteration self.cur = self.cur + 1 @@ -1477,7 +1477,7 @@ cdef class __rand_xrange: cdef extern from *: ctypedef struct tun_t: int __xxx - + tun_t *tun_open(addr_t *src, addr_t *dst, int mtu) int tun_fileno(tun_t *tun) char *tun_name(tun_t *tun) @@ -1487,7 +1487,7 @@ cdef extern from *: cdef class tun: """tun(src, dst[, mtu]) -> Network tunnel interface handle - + Obtain a handle to a network tunnel interface, to which packets destined for dst are delivered (with source addresses rewritten to src), where they may be read by a userland process and processed @@ -1518,7 +1518,7 @@ cdef class tun: def fileno(self): """Return file descriptor for tunnel handle.""" return tun_fileno(self.tun) - + def send(self, pkt): """Send an IP packet, returning the number of bytes sent or -1 on failure. @@ -1538,7 +1538,7 @@ cdef class tun: def close(self): self.tun = tun_close(self.tun) - + def __dealloc__(self): if self.buf: free(self.buf) diff --git a/libs/libdnet/python/interfacefinder.py b/libs/libdnet/libdnet-libdnet-1.18.0/python/interfacefinder.py similarity index 98% rename from libs/libdnet/python/interfacefinder.py rename to libs/libdnet/libdnet-libdnet-1.18.0/python/interfacefinder.py index bebd20e926..72d34deb0e 100644 --- a/libs/libdnet/python/interfacefinder.py +++ b/libs/libdnet/libdnet-libdnet-1.18.0/python/interfacefinder.py @@ -26,4 +26,4 @@ print("error in finding network interfaces") exit(1) else: - mac_addr = netifaces.ifaddresses(local_intf)[netifaces.AF_LINK][0]['addr'] \ No newline at end of file + mac_addr = netifaces.ifaddresses(local_intf)[netifaces.AF_LINK][0]['addr'] diff --git a/libs/libdnet/python/setup.py.in b/libs/libdnet/libdnet-libdnet-1.18.0/python/setup.py.in similarity index 100% rename from libs/libdnet/python/setup.py.in rename to libs/libdnet/libdnet-libdnet-1.18.0/python/setup.py.in diff --git a/libs/libdnet/python/test.py b/libs/libdnet/libdnet-libdnet-1.18.0/python/test.py similarity index 99% rename from libs/libdnet/python/test.py rename to libs/libdnet/libdnet-libdnet-1.18.0/python/test.py index 4690bfe9f1..aa87e856fb 100755 --- a/libs/libdnet/python/test.py +++ b/libs/libdnet/libdnet-libdnet-1.18.0/python/test.py @@ -29,7 +29,7 @@ def test_addr_bcast(self): b = a.bcast() self.assertTrue(b.__repr__() == d[bits], 'wrong bcast for /%d' % bits) - + def test_addr_net(self): d = { 32:'1.255.255.255', 31:'1.255.255.254', 30:'1.255.255.252', 29:'1.255.255.248', 28:'1.255.255.240', 27:'1.255.255.224', @@ -49,7 +49,7 @@ def test_addr_properties(self): assert a.ip == b'\x01\x02\x03\x04' and a.__repr__() == atxt try: self.assertTrue(a.eth == 'xxx', 'invalid eth property') except ValueError: pass - + atxt = '00:0d:0e:0a:0d:00' a = dnet.addr(atxt) assert a == dnet.addr('0:d:E:a:D:0') @@ -72,7 +72,7 @@ def setUp(self): self.assertTrue(self.arp, "couldn't open ARP handle") def tearDown(self): del self.arp - + def test_arp(self): # XXX - site-specific values here! pa = dnet.addr(local_ip) @@ -83,12 +83,12 @@ def test_arp(self): self.assertTrue(self.arp.get(pa) == None, "wrong ARP entry present") self.assertTrue(self.arp.add(pa, ha) == None, "couldn't add ARP entry") self.assertTrue(self.arp.get(pa) == ha, "couldn't find ARP entry") - + def __arp_cb(self, pa, arg): # XXX - do nothing return arg - + def test_arp_loop(self): assert self.arp.loop(self.__arp_cb, 0) == 0 assert self.arp.loop(self.__arp_cb, 123) == 123 @@ -100,7 +100,7 @@ def test_arp_misc(self): dpa = b'\x05\x06\x07\x08' msg = dnet.arp_pack_hdr_ethip(dnet.ARP_OP_REQUEST, sha, spa, dha, dpa) assert msg == b'\x00\x01\x08\x00\x06\x04\x00\x01\x00\r\x0e\n\r\x00\x01\x02\x03\x04\x00\x0b\x0e\x0e\x0f\x00\x05\x06\x07\x08' - + class EthTestCase(unittest.TestCase): def setUp(self): self.dev = dnet.intf().get_dst(dnet.addr('1.2.3.4'))['name'] @@ -184,7 +184,7 @@ def test_intf_set(self): def __intf_cb(self, ifent, arg): # XXX - do nothing return arg - + def test_intf_loop(self): assert self.intf.loop(self.__intf_cb, 0) == 0 assert self.intf.loop(self.__intf_cb, 123) == 123 @@ -235,7 +235,6 @@ def __route_cb(self, dst, arg): def test_route_loop(self): assert self.route.loop(self.__route_cb, 0) == 0 assert self.route.loop(self.__route_cb, 123) == 123 - + if __name__ == '__main__': unittest.main() - diff --git a/libs/libdnet/src/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/src/Makefile.am similarity index 100% rename from libs/libdnet/src/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/src/Makefile.am diff --git a/libs/libdnet/src/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/src/Makefile.in similarity index 99% rename from libs/libdnet/src/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/src/Makefile.in index f9eb197322..43d7cb6add 100644 --- a/libs/libdnet/src/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/Makefile.in @@ -137,7 +137,7 @@ libdnet_la_OBJECTS = $(am_libdnet_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent -am__v_lt_1 = +am__v_lt_1 = libdnet_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libdnet_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -148,11 +148,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = am__maybe_remake_depfiles = @@ -165,7 +165,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -173,7 +173,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = +am__v_CCLD_1 = SOURCES = $(libdnet_la_SOURCES) DIST_SOURCES = $(libdnet_la_SOURCES) am__can_run_installinfo = \ @@ -419,7 +419,7 @@ clean-libLTLIBRARIES: rm -f $${locs}; \ } -libdnet.la: $(libdnet_la_OBJECTS) $(libdnet_la_DEPENDENCIES) $(EXTRA_libdnet_la_DEPENDENCIES) +libdnet.la: $(libdnet_la_OBJECTS) $(libdnet_la_DEPENDENCIES) $(EXTRA_libdnet_la_DEPENDENCIES) $(AM_V_CCLD)$(libdnet_la_LINK) -rpath $(libdir) $(libdnet_la_OBJECTS) $(libdnet_la_LIBADD) $(LIBS) mostlyclean-compile: diff --git a/libs/libdnet/src/addr-util.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/addr-util.c similarity index 99% rename from libs/libdnet/src/addr-util.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/addr-util.c index 43cad7b1f9..ab7bf26260 100644 --- a/libs/libdnet/src/addr-util.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/addr-util.c @@ -77,17 +77,17 @@ eth_ntop(const eth_addr_t *eth, char *dst, size_t len) const char *x; char *p = dst; int i; - + if (len < 18) return (NULL); - + for (i = 0; i < ETH_ADDR_LEN; i++) { for (x = octet2hex[eth->data[i]]; (*p = *x) != '\0'; x++, p++) ; *p++ = ':'; } p[-1] = '\0'; - + return (dst); } @@ -95,7 +95,7 @@ char * eth_ntoa(const eth_addr_t *eth) { struct addr a; - + addr_pack(&a, ADDR_TYPE_ETH, ETH_ADDR_BITS, eth->data, ETH_ADDR_LEN); return (addr_ntoa(&a)); } @@ -106,7 +106,7 @@ eth_pton(const char *p, eth_addr_t *eth) char *ep; long l; int i; - + for (i = 0; i < ETH_ADDR_LEN; i++) { l = strtol(p, &ep, 16); if (ep == p || l < 0 || l > 0xff || @@ -125,17 +125,17 @@ ip_ntop(const ip_addr_t *ip, char *dst, size_t len) char *p = dst; u_char *data = (u_char *)ip; int i; - + if (len < 16) return (NULL); - + for (i = 0; i < IP_ADDR_LEN; i++) { for (d = octet2dec[data[i]]; (*p = *d) != '\0'; d++, p++) ; *p++ = '.'; } p[-1] = '\0'; - + return (dst); } @@ -143,7 +143,7 @@ char * ip_ntoa(const ip_addr_t *ip) { struct addr a; - + addr_pack(&a, ADDR_TYPE_IP, IP_ADDR_BITS, ip, IP_ADDR_LEN); return (addr_ntoa(&a)); } @@ -176,10 +176,10 @@ ip6_ntop(const ip6_addr_t *ip6, char *dst, size_t len) uint16_t *ip6_data; cur.len = best.len = 0; - + if (len < 46) return (NULL); - + best.base = cur.base = -1; /* * Algorithm borrowed from Vixie's inet_pton6() @@ -233,7 +233,7 @@ char * ip6_ntoa(const ip6_addr_t *ip6) { struct addr a; - + addr_pack(&a, ADDR_TYPE_IP6, IP6_ADDR_BITS, ip6->data, IP6_ADDR_LEN); return (addr_ntoa(&a)); } @@ -245,13 +245,13 @@ ip6_pton(const char *p, ip6_addr_t *ip6) int i, j, n, z = -1; char *ep; long l; - + if (*p == ':') p++; - + for (n = 0; n < 8; n++) { l = strtol(p, &ep, 16); - + if (ep == p) { if (ep[0] == ':' && z == -1) { z = n; @@ -282,7 +282,7 @@ ip6_pton(const char *p, ip6_addr_t *ip6) } if (n == 0 || *ep != '\0' || (z == -1 && n != 8)) return (-1); - + for (i = 0; i < z; i++) { u[i] = data[i]; } diff --git a/libs/libdnet/src/addr.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/addr.c similarity index 99% rename from libs/libdnet/src/addr.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/addr.c index c9f305496b..b40e9e6535 100644 --- a/libs/libdnet/src/addr.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/addr.c @@ -56,11 +56,11 @@ addr_cmp(const struct addr *a, const struct addr *b) /* XXX */ if ((i = a->addr_type - b->addr_type) != 0) return (i); - + /* XXX - 10.0.0.1 is "smaller" than 10.0.0.0/8? */ if ((i = a->addr_bits - b->addr_bits) != 0) return (i); - + j = b->addr_bits / 8; for (i = 0; i < j; i++) { @@ -73,7 +73,7 @@ addr_cmp(const struct addr *a, const struct addr *b) k = ~0 << (8 - k); i = b->addr_data8[j] & k; j = a->addr_data8[j] & k; - + return (j - i); } @@ -97,7 +97,7 @@ addr_net(const struct addr *a, struct addr *b) b->addr_type = ADDR_TYPE_IP6; b->addr_bits = IP6_ADDR_BITS; memset(&b->addr_ip6, 0, IP6_ADDR_LEN); - + switch ((i = a->addr_bits / 32)) { case 4: b->addr_data32[3] = a->addr_data32[3]; case 3: b->addr_data32[2] = a->addr_data32[2]; @@ -110,7 +110,7 @@ addr_net(const struct addr *a, struct addr *b) } } else return (-1); - + return (0); } @@ -118,7 +118,7 @@ int addr_bcast(const struct addr *a, struct addr *b) { struct addr mask; - + if (a->addr_type == ADDR_TYPE_IP) { addr_btom(a->addr_bits, &mask.addr_ip, IP_ADDR_LEN); b->addr_type = ADDR_TYPE_IP; @@ -168,7 +168,7 @@ addr_pton(const char *src, struct addr *dst) char *ep, tmp[300]; long bits = -1; int i; - + for (i = 0; i < (int)sizeof(tmp) - 1; i++) { if (src[i] == '/') { tmp[i] = '\0'; @@ -221,10 +221,10 @@ addr_ntoa(const struct addr *a) { static char *p, buf[BUFSIZ]; char *q = NULL; - + if (p == NULL || p > buf + sizeof(buf) - 64 /* XXX */) p = buf; - + if (addr_ntop(a, p, (buf + sizeof(buf)) - p) != NULL) { q = p; p += strlen(p) + 1; @@ -236,7 +236,7 @@ int addr_ntos(const struct addr *a, struct sockaddr *sa) { union sockunion *so = (union sockunion *)sa; - + switch (a->addr_type) { case ADDR_TYPE_ETH: #ifdef HAVE_NET_IF_DL_H @@ -244,7 +244,7 @@ addr_ntos(const struct addr *a, struct sockaddr *sa) # ifdef HAVE_SOCKADDR_SA_LEN so->sdl.sdl_len = sizeof(so->sdl); # endif -# ifdef AF_LINK +# ifdef AF_LINK so->sdl.sdl_family = AF_LINK; # else so->sdl.sdl_family = AF_UNSPEC; @@ -290,9 +290,9 @@ int addr_ston(const struct sockaddr *sa, struct addr *a) { union sockunion *so = (union sockunion *)sa; - + memset(a, 0, sizeof(*a)); - + switch (sa->sa_family) { #ifdef HAVE_NET_IF_DL_H # ifdef AF_LINK @@ -313,7 +313,7 @@ addr_ston(const struct sockaddr *sa, struct addr *a) a->addr_bits = ETH_ADDR_BITS; memcpy(&a->addr_eth, sa->sa_data, ETH_ADDR_LEN); break; - + #ifdef AF_RAW case AF_RAW: /* XXX - IRIX raw(7f) */ a->addr_type = ADDR_TYPE_ETH; @@ -408,10 +408,10 @@ addr_stob(const struct sockaddr *sa, uint16_t *bits) } } *bits = n; - + return (0); } - + int addr_btom(uint16_t bits, void *mask, size_t size) { @@ -431,10 +431,10 @@ addr_btom(uint16_t bits, void *mask, size_t size) return (-1); } p = (u_char *)mask; - + if ((net = bits / 8) > 0) memset(p, 0xff, net); - + if ((host = bits % 8) > 0) { p[net] = 0xff << (8 - host); memset(&p[net + 1], 0, size - net - 1); @@ -452,7 +452,7 @@ addr_mtob(const void *mask, size_t size, uint16_t *bits) int i, j; p = (u_char *)mask; - + for (n = i = 0; i < (int)size; i++, n += 8) { if (p[i] != 0xff) break; diff --git a/libs/libdnet/src/arp-bsd.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/arp-bsd.c similarity index 98% rename from libs/libdnet/src/arp-bsd.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/arp-bsd.c index 64d271c62b..74c3701df8 100644 --- a/libs/libdnet/src/arp-bsd.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/arp-bsd.c @@ -1,6 +1,6 @@ /* * arp-bsd.c - * + * * Copyright (c) 2000 Dug Song * * $Id$ @@ -67,11 +67,11 @@ arp_msg(arp_t *arp, struct arpmsg *msg) struct arpmsg smsg; int len, i = 0; pid_t pid; - + msg->rtm.rtm_version = RTM_VERSION; - msg->rtm.rtm_seq = ++arp->seq; + msg->rtm.rtm_seq = ++arp->seq; memcpy(&smsg, msg, sizeof(smsg)); - + #ifdef HAVE_STREAMS_ROUTE return (ioctl(arp->fd, RTSTR_SEND, &msg->rtm)); #else @@ -80,7 +80,7 @@ arp_msg(arp_t *arp, struct arpmsg *msg) return (-1); } pid = getpid(); - + /* XXX - should we only read RTM_GET responses here? */ while ((len = read(arp->fd, msg, sizeof(*msg))) > 0) { if (len < (int)sizeof(msg->rtm)) @@ -92,7 +92,7 @@ arp_msg(arp_t *arp, struct arpmsg *msg) continue; } else if ((i++ % 2) == 0) continue; - + /* Repeat request. */ if (write(arp->fd, &smsg, smsg.rtm.rtm_msglen) < 0) { if (errno != ESRCH || msg->rtm.rtm_type != RTM_DELETE) @@ -101,7 +101,7 @@ arp_msg(arp_t *arp, struct arpmsg *msg) } if (len < 0) return (-1); - + return (0); #endif } @@ -113,7 +113,7 @@ arp_add(arp_t *arp, const struct arp_entry *entry) struct sockaddr_in *sin; struct sockaddr *sa; int index, type; - + if (entry->arp_pa.addr_type != ADDR_TYPE_IP || entry->arp_ha.addr_type != ADDR_TYPE_ETH) { errno = EAFNOSUPPORT; @@ -121,18 +121,18 @@ arp_add(arp_t *arp, const struct arp_entry *entry) } sin = (struct sockaddr_in *)msg.addrs; sa = (struct sockaddr *)(sin + 1); - + if (addr_ntos(&entry->arp_pa, (struct sockaddr *)sin) < 0) return (-1); - + memset(&msg.rtm, 0, sizeof(msg.rtm)); msg.rtm.rtm_type = RTM_GET; msg.rtm.rtm_addrs = RTA_DST; msg.rtm.rtm_msglen = sizeof(msg.rtm) + sizeof(*sin); - + if (arp_msg(arp, &msg) < 0) return (-1); - + if (msg.rtm.rtm_msglen < (int)sizeof(msg.rtm) + sizeof(*sin) + sizeof(*sa)) { errno = EADDRNOTAVAIL; @@ -158,7 +158,7 @@ arp_add(arp_t *arp, const struct arp_entry *entry) ((struct sockaddr_dl *)sa)->sdl_index = index; ((struct sockaddr_dl *)sa)->sdl_type = type; - + memset(&msg.rtm, 0, sizeof(msg.rtm)); msg.rtm.rtm_type = RTM_ADD; msg.rtm.rtm_addrs = RTA_DST | RTA_GATEWAY; @@ -193,10 +193,10 @@ arp_delete(arp_t *arp, const struct arp_entry *entry) msg.rtm.rtm_type = RTM_GET; msg.rtm.rtm_addrs = RTA_DST; msg.rtm.rtm_msglen = sizeof(msg.rtm) + sizeof(*sin); - + if (arp_msg(arp, &msg) < 0) return (-1); - + if (msg.rtm.rtm_msglen < (int)sizeof(msg.rtm) + sizeof(*sin) + sizeof(*sa)) { errno = ESRCH; @@ -214,7 +214,7 @@ arp_delete(arp_t *arp, const struct arp_entry *entry) return (-1); } msg.rtm.rtm_type = RTM_DELETE; - + return (arp_msg(arp, &msg)); } @@ -224,26 +224,26 @@ arp_get(arp_t *arp, struct arp_entry *entry) struct arpmsg msg; struct sockaddr_in *sin; struct sockaddr *sa; - + if (entry->arp_pa.addr_type != ADDR_TYPE_IP) { errno = EAFNOSUPPORT; return (-1); } sin = (struct sockaddr_in *)msg.addrs; sa = (struct sockaddr *)(sin + 1); - + if (addr_ntos(&entry->arp_pa, (struct sockaddr *)sin) < 0) return (-1); - + memset(&msg.rtm, 0, sizeof(msg.rtm)); msg.rtm.rtm_type = RTM_GET; msg.rtm.rtm_addrs = RTA_DST; msg.rtm.rtm_flags = RTF_LLINFO; msg.rtm.rtm_msglen = sizeof(msg.rtm) + sizeof(*sin); - + if (arp_msg(arp, &msg) < 0) return (-1); - + if (msg.rtm.rtm_msglen < (int)sizeof(msg.rtm) + sizeof(*sin) + sizeof(*sa) || sin->sin_addr.s_addr != entry->arp_pa.addr_ip || @@ -253,7 +253,7 @@ arp_get(arp_t *arp, struct arp_entry *entry) } if (addr_ston(sa, &entry->arp_ha) < 0) return (-1); - + return (0); } @@ -278,28 +278,28 @@ arp_loop(arp_t *arp, arp_handler callback, void *arg) if ((buf = malloc(len)) == NULL) return (-1); - + if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { free(buf); return (-1); } lim = buf + len; ret = 0; - + for (next = buf; next < lim; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)next; sin = (struct sockaddr_in *)(rtm + 1); sa = (struct sockaddr *)(sin + 1); - + if (addr_ston((struct sockaddr *)sin, &entry.arp_pa) < 0 || addr_ston(sa, &entry.arp_ha) < 0) continue; - + if ((ret = callback(&entry, arg)) != 0) break; } free(buf); - + return (ret); } #else diff --git a/libs/libdnet/src/arp-ioctl.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/arp-ioctl.c similarity index 99% rename from libs/libdnet/src/arp-ioctl.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/arp-ioctl.c index ca47ce9785..a8c48aa0f7 100644 --- a/libs/libdnet/src/arp-ioctl.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/arp-ioctl.c @@ -55,7 +55,7 @@ arp_t * arp_open(void) { arp_t *a; - + if ((a = calloc(1, sizeof(*a))) != NULL) { #ifdef HAVE_STREAMS_MIB2 if ((a->fd = open(IP_DEV_NAME, O_RDWR)) < 0) @@ -85,7 +85,7 @@ _arp_set_dev(const struct intf_entry *entry, void *arg) entry->intf_addr.addr_type == ADDR_TYPE_IP) { addr_btom(entry->intf_addr.addr_bits, &mask, IP_ADDR_LEN); addr_ston((struct sockaddr *)&ar->arp_pa, &dst); - + if ((entry->intf_addr.addr_ip & mask) == (dst.addr_ip & mask)) { strlcpy(ar->arp_dev, entry->intf_name, @@ -144,13 +144,13 @@ arp_add(arp_t *a, const struct arp_entry *entry) { struct sockaddr_in sin; int fd; - + addr_ntos(&entry->arp_pa, (struct sockaddr *)&sin); sin.sin_port = htons(666); - + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) return (-1); - + if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) { close(fd); return (-1); @@ -168,10 +168,10 @@ arp_delete(arp_t *a, const struct arp_entry *entry) struct arpreq ar; memset(&ar, 0, sizeof(ar)); - + if (addr_ntos(&entry->arp_pa, &ar.arp_pa) < 0) return (-1); - + if (ioctl(a->fd, SIOCDARP, &ar) < 0) return (-1); @@ -184,10 +184,10 @@ arp_get(arp_t *a, struct arp_entry *entry) struct arpreq ar; memset(&ar, 0, sizeof(ar)); - + if (addr_ntos(&entry->arp_pa, &ar.arp_pa) < 0) return (-1); - + #ifdef HAVE_ARPREQ_ARP_DEV if (intf_loop(a->intf, _arp_set_dev, &ar) != 1) { errno = ESRCH; @@ -220,10 +220,10 @@ arp_loop(arp_t *a, arp_handler callback, void *arg) while (fgets(buf, sizeof(buf), fp) != NULL) { i = sscanf(buf, "%s 0x%x 0x%x %100s %100s %100s\n", ipbuf, &type, &flags, macbuf, maskbuf, devbuf); - + if (i < 4 || (flags & ATF_COM) == 0) continue; - + if (addr_aton(ipbuf, &entry.arp_pa) == 0 && addr_aton(macbuf, &entry.arp_ha) == 0) { if ((ret = callback(&entry, arg)) != 0) @@ -235,7 +235,7 @@ arp_loop(arp_t *a, arp_handler callback, void *arg) return (-1); } fclose(fp); - + return (ret); } #elif defined (HAVE_STREAMS_MIB2) @@ -260,21 +260,21 @@ arp_loop(arp_t *r, arp_handler callback, void *arg) tor->OPT_offset = sizeof(*tor); tor->OPT_length = sizeof(*opt); tor->MGMT_flags = T_CURRENT; - + opt = (struct opthdr *)(tor + 1); opt->level = MIB2_IP; opt->name = opt->len = 0; - + msg.maxlen = sizeof(buf); msg.len = sizeof(*tor) + sizeof(*opt); msg.buf = buf; - + if (putmsg(r->fd, &msg, NULL, 0) < 0) return (-1); - + opt = (struct opthdr *)(toa + 1); msg.maxlen = sizeof(buf); - + for (;;) { flags = 0; if ((rc = getmsg(r->fd, &msg, NULL, &flags)) < 0) @@ -289,45 +289,45 @@ arp_loop(arp_t *r, arp_handler callback, void *arg) if (msg.len >= sizeof(*tea) && tea->PRIM_type == T_ERROR_ACK) return (-1); - + if (rc != MOREDATA || msg.len < (int)sizeof(*toa) || toa->PRIM_type != T_OPTMGMT_ACK || toa->MGMT_flags != T_SUCCESS) return (-1); - + atable = (opt->level == MIB2_IP && opt->name == MIB2_IP_22); - + msg.maxlen = sizeof(buf) - (sizeof(buf) % sizeof(*arp)); msg.len = 0; flags = 0; - + do { rc = getmsg(r->fd, NULL, &msg, &flags); - + if (rc != 0 && rc != MOREDATA) return (-1); - + if (!atable) continue; - + arp = (mib2_ipNetToMediaEntry_t *)msg.buf; arpend = (mib2_ipNetToMediaEntry_t *) (msg.buf + msg.len); entry.arp_pa.addr_type = ADDR_TYPE_IP; entry.arp_pa.addr_bits = IP_ADDR_BITS; - + entry.arp_ha.addr_type = ADDR_TYPE_ETH; entry.arp_ha.addr_bits = ETH_ADDR_BITS; for ( ; arp < arpend; arp++) { entry.arp_pa.addr_ip = arp->ipNetToMediaNetAddress; - + memcpy(&entry.arp_ha.addr_eth, arp->ipNetToMediaPhysAddress.o_bytes, ETH_ADDR_LEN); - + if ((ret = callback(&entry, arg)) != 0) return (ret); } @@ -345,15 +345,15 @@ arp_loop(arp_t *r, arp_handler callback, void *arg) struct arp_entry entry; mib_ipNetToMediaEnt arpentries[MAX_ARPENTRIES]; int fd, i, n, ret; - + if ((fd = open_mib("/dev/ip", O_RDWR, 0 /* XXX */, 0)) < 0) return (-1); - + nm.objid = ID_ipNetToMediaTable; nm.buffer = arpentries; n = sizeof(arpentries); nm.len = &n; - + if (get_mib_info(fd, &nm) < 0) { close_mib(fd); return (-1); @@ -365,19 +365,19 @@ arp_loop(arp_t *r, arp_handler callback, void *arg) entry.arp_ha.addr_type = ADDR_TYPE_ETH; entry.arp_ha.addr_bits = ETH_ADDR_BITS; - + n /= sizeof(*arpentries); ret = 0; - + for (i = 0; i < n; i++) { if (arpentries[i].Type == INTM_INVALID || arpentries[i].PhysAddr.o_length != ETH_ADDR_LEN) continue; - + entry.arp_pa.addr_ip = arpentries[i].NetAddr; memcpy(&entry.arp_ha.addr_eth, arpentries[i].PhysAddr.o_bytes, ETH_ADDR_LEN); - + if ((ret = callback(&entry, arg)) != 0) break; } @@ -438,13 +438,13 @@ arp_loop(arp_t *r, arp_handler callback, void *arg) struct ifnet *ifp, ifnet; struct ifnet_arp_cache_head ifarp; struct radix_node_head *head; - + struct nlist nl[2]; int fd, ret = 0; memset(nl, 0, sizeof(nl)); nl[0].n_name = "ifnet"; - + if (knlist(nl) < 0 || nl[0].n_type == 0 || (fd = open("/dev/kmem", O_RDONLY, 0)) < 0) return (-1); diff --git a/libs/libdnet/src/arp-none.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/arp-none.c similarity index 100% rename from libs/libdnet/src/arp-none.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/arp-none.c diff --git a/libs/libdnet/src/arp-win32.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/arp-win32.c similarity index 99% rename from libs/libdnet/src/arp-win32.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/arp-win32.c index 0239ea0ab8..978c0fdad0 100644 --- a/libs/libdnet/src/arp-win32.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/arp-win32.c @@ -32,7 +32,7 @@ arp_add(arp_t *arp, const struct arp_entry *entry) { MIB_IPFORWARDROW ipfrow; MIB_IPNETROW iprow; - + if (GetBestRoute(entry->arp_pa.addr_ip, IP_ADDR_ANY, &ipfrow) != NO_ERROR) return (-1); @@ -74,7 +74,7 @@ static int _arp_get_entry(const struct arp_entry *entry, void *arg) { struct arp_entry *e = (struct arp_entry *)arg; - + if (addr_cmp(&entry->arp_pa, &e->arp_pa) == 0) { memcpy(&e->arp_ha, &entry->arp_ha, sizeof(e->arp_ha)); return (1); @@ -112,10 +112,10 @@ arp_loop(arp_t *arp, arp_handler callback, void *arg) } entry.arp_pa.addr_type = ADDR_TYPE_IP; entry.arp_pa.addr_bits = IP_ADDR_BITS; - + entry.arp_ha.addr_type = ADDR_TYPE_ETH; entry.arp_ha.addr_bits = ETH_ADDR_BITS; - + for (i = 0; i < (int)arp->iptable->dwNumEntries; i++) { if (arp->iptable->table[i].dwPhysAddrLen != ETH_ADDR_LEN) continue; @@ -125,7 +125,7 @@ arp_loop(arp_t *arp, arp_handler callback, void *arg) entry.arp_pa.addr_ip = arp->iptable->table[i].dwAddr; memcpy(&entry.arp_ha.addr_eth, arp->iptable->table[i].bPhysAddr, ETH_ADDR_LEN); - + if ((ret = (*callback)(&entry, arg)) != 0) return (ret); } diff --git a/libs/libdnet/src/blob.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/blob.c similarity index 99% rename from libs/libdnet/src/blob.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/blob.c index c0d8450e4c..1607b97749 100644 --- a/libs/libdnet/src/blob.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/blob.c @@ -86,15 +86,15 @@ blob_reserve(blob_t *b, int len) if ((nsize = b->end + len) > bl_size) nsize = ((nsize / bl_size) + 1) * bl_size; - + if ((p = bl_realloc(b->base, nsize)) == NULL) return (-1); - + b->base = p; b->size = nsize; } b->end += len; - + return (0); } @@ -103,10 +103,10 @@ blob_read(blob_t *b, void *buf, int len) { if (b->end - b->off < len) len = b->end - b->off; - + memcpy(buf, b->base + b->off, len); b->off += len; - + return (len); } @@ -165,7 +165,7 @@ blob_fmt(blob_t *b, int pack, const char *fmt, va_list *ap) p++; } else len = 0; - + if ((fmt_cb = blob_ascii_fmt[(int)*p]) == NULL) return (-1); @@ -219,7 +219,7 @@ blob_seek(blob_t *b, int off, int whence) if (off < 0 || off > b->end) return (-1); - + return ((b->off = off)); } @@ -302,7 +302,7 @@ static int fmt_D(int pack, int len, blob_t *b, va_list *ap) { if (len) return (-1); - + if (pack) { uint32_t n = va_arg(*ap, uint32_t); n = htonl(n); @@ -321,7 +321,7 @@ static int fmt_H(int pack, int len, blob_t *b, va_list *ap) { if (len) return (-1); - + if (pack) { uint16_t n = va_arg(*ap, int); n = htons(n); @@ -340,9 +340,9 @@ static int fmt_b(int pack, int len, blob_t *b, va_list *ap) { void *p = va_arg(*ap, void *); - + if (len <= 0) return (-1); - + if (pack) return (blob_write(b, p, len)); else @@ -353,7 +353,7 @@ static int fmt_c(int pack, int len, blob_t *b, va_list *ap) { if (len) return (-1); - + if (pack) { uint8_t n = va_arg(*ap, int); return (blob_write(b, &n, sizeof(n))); @@ -367,7 +367,7 @@ static int fmt_d(int pack, int len, blob_t *b, va_list *ap) { if (len) return (-1); - + if (pack) { uint32_t n = va_arg(*ap, uint32_t); return (blob_write(b, &n, sizeof(n))); @@ -381,7 +381,7 @@ static int fmt_h(int pack, int len, blob_t *b, va_list *ap) { if (len) return (-1); - + if (pack) { uint16_t n = va_arg(*ap, int); return (blob_write(b, &n, sizeof(n))); @@ -397,14 +397,14 @@ fmt_s(int pack, int len, blob_t *b, va_list *ap) char *p = va_arg(*ap, char *); char c = '\0'; int i, end; - + if (pack) { if (len > 0) { if ((c = p[len - 1]) != '\0') p[len - 1] = '\0'; } else len = strlen(p) + 1; - + if (blob_write(b, p, len) > 0) { if (c != '\0') p[len - 1] = c; @@ -415,7 +415,7 @@ fmt_s(int pack, int len, blob_t *b, va_list *ap) if ((end = b->end - b->off) < len) end = len; - + for (i = 0; i < end; i++) { if ((p[i] = b->base[b->off + i]) == '\0') { b->off += i + 1; @@ -435,14 +435,14 @@ print_hexl(blob_t *b) p = b->base + b->off; len = b->end - b->off; - + printf("\n"); - + for (i = 0; i < len; i += 0x10) { printf(" %04x: ", (u_int)(i + b->off)); jm = len - i; jm = jm > 16 ? 16 : jm; - + for (j = 0; j < jm; j++) { printf((j % 2) ? "%02x " : "%02x", (u_int)p[i + j]); } @@ -450,7 +450,7 @@ print_hexl(blob_t *b) printf((j % 2) ? " " : " "); } printf(" "); - + for (j = 0; j < jm; j++) { c = p[i + j]; printf("%c", isprint(c) ? c : '.'); diff --git a/libs/libdnet/src/crc32ct.h b/libs/libdnet/libdnet-libdnet-1.18.0/src/crc32ct.h similarity index 99% rename from libs/libdnet/src/crc32ct.h rename to libs/libdnet/libdnet-libdnet-1.18.0/src/crc32ct.h index 8c3ac929be..9bee238355 100644 --- a/libs/libdnet/src/crc32ct.h +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/crc32ct.h @@ -80,4 +80,3 @@ static unsigned long crc_c[256] = { }; #endif /* CRC32CT_H */ - diff --git a/libs/libdnet/src/err.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/err.c similarity index 99% rename from libs/libdnet/src/err.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/err.c index cd201c3462..70eae423d3 100644 --- a/libs/libdnet/src/err.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/err.c @@ -50,7 +50,7 @@ void err(int eval, const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); if (fmt != NULL) { (void)vfprintf(stderr, fmt, ap); @@ -69,7 +69,7 @@ void warn(const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); if (fmt != NULL) { (void)vfprintf(stderr, fmt, ap); @@ -87,7 +87,7 @@ void errx(int eval, const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); if (fmt != NULL) (void)vfprintf(stderr, fmt, ap); @@ -100,11 +100,10 @@ void warnx(const char *fmt, ...) { va_list ap; - + va_start(ap, fmt); if (fmt != NULL) (void)vfprintf(stderr, fmt, ap); (void)fprintf(stderr, "\n"); va_end(ap); } - diff --git a/libs/libdnet/src/eth-bsd.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-bsd.c similarity index 99% rename from libs/libdnet/src/eth-bsd.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-bsd.c index 8948f5ce4f..ed0e2422da 100644 --- a/libs/libdnet/src/eth-bsd.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-bsd.c @@ -46,10 +46,10 @@ eth_open(const char *device) if ((e = calloc(1, sizeof(*e))) != NULL) { if ((e->fd = open("/dev/bpf", O_WRONLY)) < 0) return (eth_close(e)); - + memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)); - + if (ioctl(e->fd, BIOCSETIF, (char *)&ifr) < 0) return (eth_close(e)); #ifdef BIOCSHDRCMPLT @@ -92,10 +92,10 @@ eth_get(eth_t *e, eth_addr_t *ea) if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) return (-1); - + if ((buf = malloc(len)) == NULL) return (-1); - + if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { free(buf); return (-1); @@ -103,26 +103,26 @@ eth_get(eth_t *e, eth_addr_t *ea) for (p = buf; p < buf + len; p += ifm->ifm_msglen) { ifm = (struct if_msghdr *)p; sdl = (struct sockaddr_dl *)(ifm + 1); - + if (ifm->ifm_type != RTM_IFINFO || (ifm->ifm_addrs & RTA_IFP) == 0) continue; - + if (sdl->sdl_family != AF_LINK || sdl->sdl_nlen == 0 || memcmp(sdl->sdl_data, e->device, sdl->sdl_nlen) != 0) continue; - + if (addr_ston((struct sockaddr *)sdl, &ha) == 0) break; } free(buf); - + if (p >= buf + len) { errno = ESRCH; return (-1); } memcpy(ea, &ha.addr_eth, sizeof(*ea)); - + return (0); } #else @@ -144,11 +144,11 @@ eth_set(eth_t *e, const eth_addr_t *ea) ha.addr_type = ADDR_TYPE_ETH; ha.addr_bits = ETH_ADDR_BITS; memcpy(&ha.addr_eth, ea, ETH_ADDR_LEN); - + memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, e->device, sizeof(ifr.ifr_name)); addr_ntos(&ha, &ifr.ifr_addr); - + return (ioctl(e->fd, SIOCSIFLLADDR, &ifr)); } #else diff --git a/libs/libdnet/src/eth-dlpi.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-dlpi.c similarity index 99% rename from libs/libdnet/src/eth-dlpi.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-dlpi.c index d0d0c144ff..c473a09d5b 100644 --- a/libs/libdnet/src/eth-dlpi.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-dlpi.c @@ -53,21 +53,21 @@ dlpi_msg(int fd, union DL_primitives *dlp, int rlen, int flags, ctl.maxlen = 0; ctl.len = rlen; ctl.buf = (caddr_t)dlp; - + if (putmsg(fd, &ctl, NULL, flags) < 0) return (-1); - + ctl.maxlen = size; ctl.len = 0; - + flags = 0; if (getmsg(fd, &ctl, NULL, &flags) < 0) return (-1); - + if (dlp->dl_primitive != ack || ctl.len < alen) return (-1); - + return (0); } @@ -76,15 +76,15 @@ static int strioctl(int fd, int cmd, int len, char *dp) { struct strioctl str; - + str.ic_cmd = cmd; str.ic_timout = INFTIM; str.ic_len = len; str.ic_dp = dp; - + if (ioctl(fd, I_STR, &str) < 0) return (-1); - + return (str.ic_len); } #endif @@ -100,10 +100,10 @@ eth_match_ppa(eth_t *e, const char *device) int len, ppa; strlcpy(buf, "dl_ifnames", sizeof(buf)); - + if ((len = strioctl(e->fd, ND_GET, sizeof(buf), buf)) < 0) return (-1); - + for (p = buf; p < buf + len; p += strlen(p) + 1) { ppa = -1; if (sscanf(p, "%s (PPA %d)\n", dev, &ppa) != 2) @@ -144,7 +144,7 @@ eth_open(const char *device) #ifdef HAVE_SYS_DLPIHDR_H if ((e->fd = open("/dev/streams/dlb", O_RDWR)) < 0) return (eth_close(e)); - + if ((ppa = eth_match_ppa(e, device)) < 0) { errno = ESRCH; return (eth_close(e)); @@ -167,17 +167,17 @@ eth_open(const char *device) #endif dlp = (union DL_primitives *)buf; dlp->info_req.dl_primitive = DL_INFO_REQ; - + if (dlpi_msg(e->fd, dlp, DL_INFO_REQ_SIZE, RS_HIPRI, DL_INFO_ACK, DL_INFO_ACK_SIZE, sizeof(buf)) < 0) return (eth_close(e)); - + e->sap_len = dlp->info_ack.dl_sap_length; - + if (dlp->info_ack.dl_provider_style == DL_STYLE2) { dlp->attach_req.dl_primitive = DL_ATTACH_REQ; dlp->attach_req.dl_ppa = ppa; - + if (dlpi_msg(e->fd, dlp, DL_ATTACH_REQ_SIZE, 0, DL_OK_ACK, DL_OK_ACK_SIZE, sizeof(buf)) < 0) return (eth_close(e)); @@ -228,12 +228,12 @@ eth_send(eth_t *e, const void *buf, size_t len) #endif eth = (struct eth_hdr *)buf; *(uint16_t *)sap = ntohs(eth->eth_type); - + /* XXX - DLSAP setup logic from ISC DHCP */ ctl.maxlen = 0; ctl.len = dlen + ETH_ADDR_LEN + abs(e->sap_len); ctl.buf = (char *)ctlbuf; - + if (e->sap_len >= 0) { memcpy(ctlbuf + dlen, sap, e->sap_len); memcpy(ctlbuf + dlen + e->sap_len, @@ -269,7 +269,7 @@ eth_get(eth_t *e, eth_addr_t *ea) { union DL_primitives *dlp; u_char buf[2048]; - + dlp = (union DL_primitives *)buf; dlp->physaddr_req.dl_primitive = DL_PHYS_ADDR_REQ; dlp->physaddr_req.dl_addr_type = DL_CURR_PHYS_ADDR; @@ -279,7 +279,7 @@ eth_get(eth_t *e, eth_addr_t *ea) return (-1); memcpy(ea, buf + dlp->physaddr_ack.dl_addr_offset, sizeof(*ea)); - + return (0); } @@ -295,7 +295,7 @@ eth_set(eth_t *e, const eth_addr_t *ea) dlp->set_physaddr_req.dl_addr_offset = DL_SET_PHYS_ADDR_REQ_SIZE; memcpy(buf + DL_SET_PHYS_ADDR_REQ_SIZE, ea, sizeof(*ea)); - + return (dlpi_msg(e->fd, dlp, DL_SET_PHYS_ADDR_REQ_SIZE + ETH_ADDR_LEN, 0, DL_OK_ACK, DL_OK_ACK_SIZE, sizeof(buf))); } diff --git a/libs/libdnet/src/eth-linux.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-linux.c similarity index 99% rename from libs/libdnet/src/eth-linux.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-linux.c index 3d46ecaf05..c274b18ab6 100644 --- a/libs/libdnet/src/eth-linux.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-linux.c @@ -44,7 +44,7 @@ eth_open(const char *device) { eth_t *e; int n; - + if ((e = calloc(1, sizeof(*e))) != NULL) { if ((e->fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) @@ -56,10 +56,10 @@ eth_open(const char *device) return (eth_close(e)); #endif strlcpy(e->ifr.ifr_name, device, sizeof(e->ifr.ifr_name)); - + if (ioctl(e->fd, SIOCGIFINDEX, &e->ifr) < 0) return (eth_close(e)); - + e->sll.sll_family = AF_PACKET; e->sll.sll_ifindex = e->ifr.ifr_ifindex; } @@ -70,7 +70,7 @@ ssize_t eth_send(eth_t *e, const void *buf, size_t len) { struct eth_hdr *eth = (struct eth_hdr *)buf; - + e->sll.sll_protocol = eth->eth_type; return (sendto(e->fd, buf, len, 0, (struct sockaddr *)&e->sll, @@ -92,10 +92,10 @@ int eth_get(eth_t *e, eth_addr_t *ea) { struct addr ha; - + if (ioctl(e->fd, SIOCGIFHWADDR, &e->ifr) < 0) return (-1); - + if (addr_ston(&e->ifr.ifr_hwaddr, &ha) < 0) return (-1); diff --git a/libs/libdnet/src/eth-ndd.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-ndd.c similarity index 98% rename from libs/libdnet/src/eth-ndd.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-ndd.c index d68f864815..140c0c3962 100644 --- a/libs/libdnet/src/eth-ndd.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-ndd.c @@ -32,28 +32,28 @@ eth_open(const char *device) { struct sockaddr_ndd_8022 sa; eth_t *e; - + if ((e = calloc(1, sizeof(*e))) == NULL) return (NULL); if ((e->fd = socket(AF_NDD, SOCK_DGRAM, NDD_PROT_ETHER)) < 0) return (eth_close(e)); - + sa.sndd_8022_family = AF_NDD; sa.sndd_8022_len = sizeof(sa); sa.sndd_8022_filtertype = NS_ETHERTYPE; sa.sndd_8022_ethertype = ETH_TYPE_IP; sa.sndd_8022_filterlen = sizeof(struct ns_8022); strlcpy(sa.sndd_8022_nddname, device, sizeof(sa.sndd_8022_nddname)); - + if (bind(e->fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) return (eth_close(e)); - + if (connect(e->fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) return (eth_close(e)); - + /* XXX - SO_BROADCAST needed? */ - + return (e); } @@ -80,16 +80,16 @@ eth_get(eth_t *e, eth_addr_t *ea) struct kinfo_ndd *nddp; int size; void *end; - + if ((size = getkerninfo(KINFO_NDD, 0, 0, 0)) == 0) { errno = ENOENT; return (-1); } else if (size < 0) return (-1); - + if ((nddp = malloc(size)) == NULL) return (-1); - + if (getkerninfo(KINFO_NDD, nddp, &size, 0) < 0) { free(nddp); return (-1); @@ -101,7 +101,7 @@ eth_get(eth_t *e, eth_addr_t *ea) } } free(nddp); - + if ((void *)nddp >= end) { errno = ESRCH; return (-1); diff --git a/libs/libdnet/src/eth-none.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-none.c similarity index 100% rename from libs/libdnet/src/eth-none.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-none.c diff --git a/libs/libdnet/src/eth-pfilt.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-pfilt.c similarity index 99% rename from libs/libdnet/src/eth-pfilt.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-pfilt.c index a96f99f9f8..1fabbf2f2a 100644 --- a/libs/libdnet/src/eth-pfilt.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-pfilt.c @@ -35,7 +35,7 @@ eth_open(const char *device) { struct eth_handle *e; int fd; - + if ((e = calloc(1, sizeof(*e))) != NULL) { strlcpy(e->device, device, sizeof(e->device)); if ((e->fd = pfopen(e->device, O_WRONLY)) < 0 || diff --git a/libs/libdnet/src/eth-snoop.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-snoop.c similarity index 98% rename from libs/libdnet/src/eth-snoop.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-snoop.c index 3f7a7091bb..98312f3f32 100644 --- a/libs/libdnet/src/eth-snoop.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-snoop.c @@ -33,26 +33,26 @@ eth_open(const char *device) struct sockaddr_raw sr; eth_t *e; int n; - + if ((e = calloc(1, sizeof(*e))) == NULL) return (NULL); if ((e->fd = socket(PF_RAW, SOCK_RAW, RAWPROTO_SNOOP)) < 0) return (eth_close(e)); - + memset(&sr, 0, sizeof(sr)); sr.sr_family = AF_RAW; strlcpy(sr.sr_ifname, device, sizeof(sr.sr_ifname)); if (bind(e->fd, (struct sockaddr *)&sr, sizeof(sr)) < 0) return (eth_close(e)); - + n = 60000; if (setsockopt(e->fd, SOL_SOCKET, SO_SNDBUF, &n, sizeof(n)) < 0) return (eth_close(e)); - + strlcpy(e->ifr.ifr_name, device, sizeof(e->ifr.ifr_name)); - + return (e); } @@ -60,7 +60,7 @@ int eth_get(eth_t *e, eth_addr_t *ea) { struct addr ha; - + if (ioctl(e->fd, SIOCGIFADDR, &e->ifr) < 0) return (-1); @@ -72,7 +72,7 @@ eth_get(eth_t *e, eth_addr_t *ea) return (-1); } memcpy(ea, &ha.addr_eth, sizeof(*ea)); - + return (0); } @@ -84,10 +84,10 @@ eth_set(eth_t *e, const eth_addr_t *ea) ha.addr_type = ADDR_TYPE_ETH; ha.addr_bits = ETH_ADDR_BITS; memcpy(&ha.addr_eth, ea, ETH_ADDR_LEN); - + if (addr_ntos(&ha, &e->ifr.ifr_addr) < 0) return (-1); - + return (ioctl(e->fd, SIOCSIFADDR, &e->ifr)); } diff --git a/libs/libdnet/src/eth-win32.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-win32.c similarity index 99% rename from libs/libdnet/src/eth-win32.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/eth-win32.c index c32452902e..d7e3f1900e 100644 --- a/libs/libdnet/src/eth-win32.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/eth-win32.c @@ -55,7 +55,7 @@ eth_open(const char *device) } if (buf == NULL) return (NULL); - + /* XXX - find adapter with matching interface MAC address. */ if ((eth = calloc(1, sizeof(*eth))) == NULL) { free(buf); @@ -77,7 +77,7 @@ eth_open(const char *device) free(buf); if (eth->pkt == NULL) eth = eth_close(eth); - + return (eth); } @@ -129,9 +129,9 @@ eth_set(eth_t *eth, const eth_addr_t *ea) data->Oid = OID_802_3_CURRENT_ADDRESS; memcpy(data->Data, ea, ETH_ADDR_LEN); data->Length = ETH_ADDR_LEN; - + if (PacketRequest(eth->lpa, TRUE, data) == TRUE) return (0); - + return (-1); } diff --git a/libs/libdnet/src/fw-ipchains.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipchains.c similarity index 98% rename from libs/libdnet/src/fw-ipchains.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipchains.c index 00c5b38d29..3b5a8fba27 100644 --- a/libs/libdnet/src/fw-ipchains.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipchains.c @@ -47,9 +47,9 @@ fr_to_fwc(const struct fw_rule *fr, struct ip_fwchange *fwc) memset(fwc, 0, sizeof(*fwc)); strlcpy(fwc->fwc_rule.ipfw.fw_vianame, fr->fw_device, IFNAMSIZ); - + if (fr->fw_op == FW_OP_ALLOW) - strlcpy(fwc->fwc_rule.label, IP_FW_LABEL_ACCEPT, + strlcpy(fwc->fwc_rule.label, IP_FW_LABEL_ACCEPT, sizeof(fwc->fwc_rule.label)); else strlcpy(fwc->fwc_rule.label, IP_FW_LABEL_BLOCK, @@ -61,7 +61,7 @@ fr_to_fwc(const struct fw_rule *fr, struct ip_fwchange *fwc) else strlcpy(fwc->fwc_label, IP_FW_LABEL_OUTPUT, sizeof(fwc->fwc_label)); - + fwc->fwc_rule.ipfw.fw_proto = fr->fw_proto; fwc->fwc_rule.ipfw.fw_src.s_addr = fr->fw_src.addr_ip; fwc->fwc_rule.ipfw.fw_dst.s_addr = fr->fw_dst.addr_ip; @@ -129,7 +129,7 @@ fw_add(fw_t *fw, const struct fw_rule *rule) struct ip_fwchange fwc; fr_to_fwc(rule, &fwc); - + return (setsockopt(fw->fd, IPPROTO_IP, IP_FW_APPEND, &fwc, sizeof(fwc))); } @@ -140,7 +140,7 @@ fw_delete(fw_t *fw, const struct fw_rule *rule) struct ip_fwchange fwc; fr_to_fwc(rule, &fwc); - + return (setsockopt(fw->fd, IPPROTO_IP, IP_FW_DELETE, &fwc, sizeof(fwc))); } @@ -154,7 +154,7 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg) char buf[BUFSIZ]; u_int phi, plo, bhi, blo, tand, txor; int ret; - + if ((fp = fopen(PROC_IPCHAINS_FILE, "r")) == NULL) return (-1); @@ -202,16 +202,16 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg) htonl(fwc.fwc_rule.ipfw.fw_smsk.s_addr); fwc.fwc_rule.ipfw.fw_dmsk.s_addr = htonl(fwc.fwc_rule.ipfw.fw_dmsk.s_addr); - + fwc_to_fr(&fwc, &fr); - + if ((ret = callback(&fr, arg)) != 0) { fclose(fp); return (ret); } } fclose(fp); - + return (0); } diff --git a/libs/libdnet/src/fw-ipf.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipf.c similarity index 99% rename from libs/libdnet/src/fw-ipf.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipf.c index 19f0928096..458091dd0a 100644 --- a/libs/libdnet/src/fw-ipf.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipf.c @@ -66,13 +66,13 @@ rule_to_ipf(const struct fw_rule *rule, struct frentry *fr) fr->fr_flags |= FR_INQUE; else fr->fr_flags |= FR_OUTQUE; - + fr->fr_ip.fi_p = rule->fw_proto; fr->fr_ip.fi_saddr = rule->fw_src.addr_ip; fr->fr_ip.fi_daddr = rule->fw_dst.addr_ip; addr_btom(rule->fw_src.addr_bits, &fr->fr_mip.fi_saddr, IP_ADDR_LEN); addr_btom(rule->fw_dst.addr_bits, &fr->fr_mip.fi_daddr, IP_ADDR_LEN); - + switch (rule->fw_proto) { case IPPROTO_ICMP: fr->fr_icmpm = rule->fw_sport[1] << 8 | @@ -157,7 +157,7 @@ ipf_to_rule(const struct frentry *fr, struct fw_rule *rule) &rule->fw_src.addr_bits); addr_mtob(&fr->fr_mip.fi_daddr, IP_ADDR_LEN, &rule->fw_dst.addr_bits); - + switch (rule->fw_proto) { case IPPROTO_ICMP: rule->fw_sport[0] = ntohs(fr->fr_icmp & fr->fr_icmpm) >> 8; @@ -179,7 +179,7 @@ fw_t * fw_open(void) { fw_t *fw; - + if ((fw = calloc(1, sizeof(*fw))) != NULL) { fw->fd = fw->kfd = -1; if ((fw->fd = open(IPL_NAME, O_RDWR, 0)) < 0) @@ -194,11 +194,11 @@ int fw_add(fw_t *fw, const struct fw_rule *rule) { struct frentry fr; - + assert(fw != NULL && rule != NULL); - + rule_to_ipf(rule, &fr); - + return (ioctl(fw->fd, SIOCADDFR, &fr)); } @@ -206,11 +206,11 @@ int fw_delete(fw_t *fw, const struct fw_rule *rule) { struct frentry fr; - + assert(fw != NULL && rule != NULL); rule_to_ipf(rule, &fr); - + return (ioctl(fw->fd, SIOCDELFR, &fr)); } @@ -218,7 +218,7 @@ static int fw_kcopy(fw_t *fw, u_char *buf, off_t pos, size_t n) { int i; - + if (lseek(fw->kfd, pos, 0) < 0) return (-1); @@ -239,7 +239,7 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg) struct frentry *frp, fr; struct fw_rule rule; int ret; - + memset(&fio, 0, sizeof(fio)); #ifdef __OpenBSD__ if (ioctl(fw->fd, SIOCGETFS, fiop) < 0) diff --git a/libs/libdnet/src/fw-ipfw.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipfw.c similarity index 98% rename from libs/libdnet/src/fw-ipfw.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipfw.c index 5de6eff73f..a1f78eaa58 100644 --- a/libs/libdnet/src/fw-ipfw.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-ipfw.c @@ -43,7 +43,7 @@ static void fr_to_ipfw(const struct fw_rule *fr, struct ip_fw *ipfw) { int i; - + memset(ipfw, 0, sizeof(*ipfw)); if (fr->fw_dir == FW_DIR_IN) { @@ -67,7 +67,7 @@ fr_to_ipfw(const struct fw_rule *fr, struct ip_fw *ipfw) ipfw->fw_flg |= IP_FW_F_ACCEPT; else ipfw->fw_flg |= IP_FW_F_DENY; - + ipfw->fw_prot = fr->fw_proto; ipfw->fw_src.s_addr = fr->fw_src.addr_ip; ipfw->fw_dst.s_addr = fr->fw_dst.addr_ip; @@ -112,7 +112,7 @@ static void ipfw_to_fr(const struct ip_fw *ipfw, struct fw_rule *fr) { int i; - + memset(fr, 0, sizeof(*fr)); if ((ipfw->fw_flg & IP_FW_F_IN) && *ipfw->fw_in_if.fu_via_if.name) @@ -124,7 +124,7 @@ ipfw_to_fr(const struct ip_fw *ipfw, struct fw_rule *fr) snprintf(fr->fw_device, sizeof(fr->fw_device), "%s%d", ipfw->fw_out_if.fu_via_if.name, ipfw->fw_out_if.fu_via_if.unit); - + fr->fw_op = (ipfw->fw_flg & IP_FW_F_ACCEPT) ? FW_OP_ALLOW : FW_OP_BLOCK; fr->fw_dir = (ipfw->fw_flg & IP_FW_F_IN) ? FW_DIR_IN : FW_DIR_OUT; @@ -150,7 +150,7 @@ ipfw_to_fr(const struct ip_fw *ipfw, struct fw_rule *fr) fr->fw_sport[0] = 0; fr->fw_sport[1] = TCP_PORT_MAX; } - + if ((ipfw->fw_flg & IP_FW_F_DRNG) && IP_FW_GETNDSTP(ipfw) == 2) { i = IP_FW_GETNSRCP(ipfw); @@ -185,7 +185,7 @@ fw_t * fw_open(void) { fw_t *fw; - + if ((fw = calloc(1, sizeof(*fw))) != NULL) { if ((fw->fd = socket(AF_INET, SOCK_RAW, IPPROTO_IP)) < 0) return (fw_close(fw)); @@ -197,7 +197,7 @@ int fw_add(fw_t *fw, const struct fw_rule *rule) { struct ip_fw ipfw; - + assert(fw != NULL && rule != NULL); fr_to_ipfw(rule, &ipfw); @@ -210,7 +210,7 @@ static int fw_cmp(const struct fw_rule *a, const struct fw_rule *b) { if (strcmp(a->fw_device, b->fw_device) != 0 || a->fw_op != b->fw_op || - a->fw_dir != b->fw_dir || a->fw_proto != b->fw_proto || + a->fw_dir != b->fw_dir || a->fw_proto != b->fw_proto || addr_cmp(&a->fw_src, &b->fw_src) != 0 || addr_cmp(&a->fw_dst, &b->fw_dst) != 0 || memcmp(a->fw_sport, b->fw_sport, sizeof(a->fw_sport)) != 0 || @@ -232,7 +232,7 @@ fw_delete(fw_t *fw, const struct fw_rule *rule) nbytes = nalloc = sizeof(*ipfw); if ((buf = malloc(nbytes)) == NULL) return (-1); - + while (nbytes >= nalloc) { nalloc = nalloc * 2 + 200; nbytes = nalloc; @@ -263,7 +263,7 @@ fw_delete(fw_t *fw, const struct fw_rule *rule) } } free(buf); - + if (ret < 0) { if (ret == -1) errno = ESRCH; @@ -283,7 +283,7 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg) nbytes = nalloc = sizeof(*ipfw); if ((buf = malloc(nbytes)) == NULL) return (-1); - + while (nbytes >= nalloc) { nalloc = nalloc * 2 + 200; nbytes = nalloc; @@ -302,7 +302,7 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg) cnt = nbytes / sizeof(*ipfw); ipfw = (struct ip_fw *)buf; ret = 0; - + for (i = 0; i < cnt; i++) { ipfw_to_fr(&ipfw[i], &fr); if ((ret = callback(&fr, arg)) != 0) diff --git a/libs/libdnet/src/fw-none.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-none.c similarity index 99% rename from libs/libdnet/src/fw-none.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/fw-none.c index e6b9fa39ff..b07e122712 100644 --- a/libs/libdnet/src/fw-none.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-none.c @@ -1,6 +1,6 @@ /* * fw-none.c - * + * * Copyright (c) 2000 Dug Song * * $Id$ diff --git a/libs/libdnet/src/fw-pf.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-pf.c similarity index 99% rename from libs/libdnet/src/fw-pf.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/fw-pf.c index e209e24253..12908b9398 100644 --- a/libs/libdnet/src/fw-pf.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-pf.c @@ -72,9 +72,9 @@ static void fr_to_pr(const struct fw_rule *fr, struct pf_rule *pr) { memset(pr, 0, sizeof(*pr)); - + strlcpy(pr->ifname, fr->fw_device, sizeof(pr->ifname)); - + pr->action = (fr->fw_op == FW_OP_ALLOW) ? PF_PASS : PF_DROP; pr->direction = (fr->fw_dir == FW_DIR_IN) ? PF_IN : PF_OUT; pr->proto = fr->fw_proto; @@ -82,10 +82,10 @@ fr_to_pr(const struct fw_rule *fr, struct pf_rule *pr) pr->af = AF_INET; PFRA_ADDR(&pr->src) = fr->fw_src.addr_ip; addr_btom(fr->fw_src.addr_bits, &(PFRA_MASK(&pr->src)), IP_ADDR_LEN); - + PFRA_ADDR(&pr->dst) = fr->fw_dst.addr_ip; addr_btom(fr->fw_dst.addr_bits, &(PFRA_MASK(&pr->dst)), IP_ADDR_LEN); - + switch (fr->fw_proto) { case IP_PROTO_ICMP: if (fr->fw_sport[1]) @@ -118,7 +118,7 @@ static int pr_to_fr(const struct pf_rule *pr, struct fw_rule *fr) { memset(fr, 0, sizeof(*fr)); - + strlcpy(fr->fw_device, pr->ifname, sizeof(fr->fw_device)); if (pr->action == PF_DROP) @@ -127,21 +127,21 @@ pr_to_fr(const struct pf_rule *pr, struct fw_rule *fr) fr->fw_op = FW_OP_ALLOW; else return (-1); - + fr->fw_dir = pr->direction == PF_IN ? FW_DIR_IN : FW_DIR_OUT; fr->fw_proto = pr->proto; if (pr->af != AF_INET) return (-1); - + fr->fw_src.addr_type = ADDR_TYPE_IP; addr_mtob(&(PFRA_MASK(&pr->src)), IP_ADDR_LEN, &fr->fw_src.addr_bits); fr->fw_src.addr_ip = PFRA_ADDR(&pr->src); - + fr->fw_dst.addr_type = ADDR_TYPE_IP; addr_mtob(&(PFRA_MASK(&pr->dst)), IP_ADDR_LEN, &fr->fw_dst.addr_bits); fr->fw_dst.addr_ip = PFRA_ADDR(&pr->dst); - + switch (fr->fw_proto) { case IP_PROTO_ICMP: if (pr->type) { @@ -205,7 +205,7 @@ fw_add(fw_t *fw, const struct fw_rule *rule) #ifdef HAVE_PF_CHANGE_GET_TICKET { struct fw_rule fr; - + if (ioctl(fw->fd, DIOCGETRULES, &pcr) < 0) return (-1); while ((int)--pcr.nr >= 0) { @@ -222,7 +222,7 @@ fw_add(fw_t *fw, const struct fw_rule *rule) #ifdef DIOCBEGINADDRS { struct pfioc_pooladdr ppa; - + if (ioctl(fw->fd, DIOCBEGINADDRS, &ppa) < 0) return (-1); pcr.pool_ticket = ppa.ticket; @@ -230,7 +230,7 @@ fw_add(fw_t *fw, const struct fw_rule *rule) #endif pcr.action = PF_CHANGE_ADD_TAIL; fr_to_pr(rule, &pcr.newrule); - + return (ioctl(fw->fd, DIOCCHANGERULE, &pcr)); } @@ -238,14 +238,14 @@ int fw_delete(fw_t *fw, const struct fw_rule *rule) { struct pfioc_changerule pcr; - + assert(fw != NULL && rule != NULL); memset(&pcr, 0, sizeof(pcr)); #ifdef HAVE_PF_CHANGE_GET_TICKET { struct fw_rule fr; int found = 0; - + if (ioctl(fw->fd, DIOCGETRULES, &pcr) < 0) return (-1); while ((int)--pcr.nr >= 0) { @@ -266,7 +266,7 @@ fw_delete(fw_t *fw, const struct fw_rule *rule) #ifdef DIOCBEGINADDRS { struct pfioc_pooladdr ppa; - + if (ioctl(fw->fd, DIOCBEGINADDRS, &ppa) < 0) return (-1); pcr.pool_ticket = ppa.ticket; @@ -274,7 +274,7 @@ fw_delete(fw_t *fw, const struct fw_rule *rule) #endif pcr.action = PF_CHANGE_REMOVE; fr_to_pr(rule, &pcr.oldrule); - + return (ioctl(fw->fd, DIOCCHANGERULE, &pcr)); } @@ -289,10 +289,10 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg) memset(&pr, 0, sizeof(pr)); if (ioctl(fw->fd, DIOCGETRULES, &pr) < 0) return (-1); - + for (n = 0, max = pr.nr; n < max; n++) { pr.nr = n; - + if ((ret = ioctl(fw->fd, DIOCGETRULE, &pr)) < 0) break; #ifdef PF_TABLE_NAME_SIZE diff --git a/libs/libdnet/src/fw-pktfilter.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-pktfilter.c similarity index 98% rename from libs/libdnet/src/fw-pktfilter.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/fw-pktfilter.c index d378d7a446..1500caa48b 100644 --- a/libs/libdnet/src/fw-pktfilter.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/fw-pktfilter.c @@ -2,7 +2,7 @@ * fw-pktfilter.c * * Copyright (c) 2002 Dug Song - * Copyright (c) 2001 Jean-Baptiste Marchand, Herv Schauer Consultants. + * Copyright (c) 2001 Jean-Baptiste Marchand, Herv Schauer Consultants. * * $Id$ */ @@ -19,7 +19,7 @@ #include "dnet.h" -#define PKTFILTER_PIPE "\\\\.\\pipe\\PktFltPipe" +#define PKTFILTER_PIPE "\\\\.\\pipe\\PktFltPipe" #define MAX_RULE_LENGTH 256 #define FILTER_FAILURE 0 /* filter had a syntax error */ @@ -66,7 +66,7 @@ static int parse_portspec(char *str, uint16_t *ports) { char *p = strsep(&str, " "); - + if (p[0] == '=') { ports[0] = ports[1] = atoi(strsep(&str, " ")); } else if (p[0] == '<') { @@ -101,7 +101,7 @@ parse_icmpspec(char *str, uint16_t *type, uint16_t *code) } type[0] = i; type[1] = 0xff; - + p = strsep(&str, " "); if (p != NULL && strcmp(p, "code")) { p = strsep(&str, " "); @@ -125,9 +125,9 @@ static int parse_rule(char *str, struct fw_rule *rule) { char *p, *q; - + memset(rule, 0, sizeof(*rule)); - + /* action */ p = strsep(&str, " "); if (strcmp(p, "block") == 0) @@ -135,7 +135,7 @@ parse_rule(char *str, struct fw_rule *rule) else if (strcmp(p, "pass") == 0) rule->fw_op = FW_OP_ALLOW; else return (-1); - + /* direction */ p = strsep(&str, " "); if (strcmp(p, "in") == 0) @@ -153,7 +153,7 @@ parse_rule(char *str, struct fw_rule *rule) *q = '\0'; if (strcmp(p, "all") != 0) strlcpy(rule->fw_device, p, sizeof(rule->fw_device)); - + /* proto */ p = strsep(&str, " "); /* XXX - handle bug in pktfltsrv.c */ @@ -169,7 +169,7 @@ parse_rule(char *str, struct fw_rule *rule) else if (strcmp(p, "udp") == 0) rule->fw_proto = IP_PROTO_UDP; else rule->fw_proto = atoi(p); - + /* source */ p = strsep(&str, " "); if (strcmp(p, "all") == 0) @@ -179,7 +179,7 @@ parse_rule(char *str, struct fw_rule *rule) p = strsep(&str, " "); if (parse_addr(p, &rule->fw_src) < 0) return (-1); - + /* source port */ p = strsep(&str, " "); if (strcmp(p, "port") == 0) { @@ -191,7 +191,7 @@ parse_rule(char *str, struct fw_rule *rule) str = p + 3; } else if (strcmp(p, "to") != 0) return (-1); - + /* destination */ p = strsep(&str, " "); if (parse_addr(p, &rule->fw_dst) < 0) @@ -215,7 +215,7 @@ static int format_rule(const struct fw_rule *rule, char *buf, int len) { char tmp[128]; - + strlcpy(buf, (rule->fw_op == FW_OP_ALLOW) ? "pass " : "block ", len); strlcat(buf, (rule->fw_dir == FW_DIR_IN) ? "in " : "out ", len); snprintf(tmp, sizeof(tmp), "on %s ", rule->fw_device); @@ -231,7 +231,7 @@ format_rule(const struct fw_rule *rule, char *buf, int len) strlcat(buf, tmp, len); } else strlcat(buf, "from any ", len); - + /* sport */ if (rule->fw_proto == IP_PROTO_TCP || rule->fw_proto == IP_PROTO_UDP) { if (rule->fw_sport[0] == rule->fw_sport[1]) @@ -249,7 +249,7 @@ format_rule(const struct fw_rule *rule, char *buf, int len) strlcat(buf, tmp, len); } else strlcat(buf, "to any ", len); - + /* dport */ if (rule->fw_proto == IP_PROTO_TCP || rule->fw_proto == IP_PROTO_UDP) { if (rule->fw_dport[0] == rule->fw_dport[1]) @@ -280,14 +280,14 @@ call_pipe(const char *msg, int len) HANDLE *pipe; DWORD i; char *p, *reply, status; - + if (!WaitNamedPipe(PKTFILTER_PIPE, NMPWAIT_USE_DEFAULT_WAIT) || (pipe = CreateFile(PKTFILTER_PIPE, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) { return (NULL); } reply = NULL; - + if (WriteFile(pipe, msg, len, &i, NULL)) { if (ReadFile(pipe, &status, sizeof(status), &i, NULL)) { if (status == FILTER_FAILURE) { @@ -318,10 +318,10 @@ fw_open(void) fw_t *f; IP_ADAPTER_INFO *ifinfo; ULONG size; - + if ((f = calloc(1, sizeof(*f))) == NULL) return (NULL); - + size = sizeof(*f->ifinfo); f->ifinfo = malloc(size); if (GetAdaptersInfo(f->ifinfo, &size) != ERROR_SUCCESS) { @@ -344,7 +344,7 @@ fw_open(void) fmt = "tr"; else if (ifinfo->Type == MIB_IF_TYPE_FDDI) fmt = "fd"; - else + else fmt = "if"; sprintf(ifinfo->AdapterName, "%s%lu", fmt, ifinfo->ComboIndex); } @@ -356,9 +356,9 @@ fw_add(fw_t *f, const struct fw_rule *rule) { char *p, buf[MAX_RULE_LENGTH]; int len; - + len = format_rule(rule, buf, sizeof(buf)); - + if ((p = call_pipe(buf, len)) == NULL) return (-1); free(p); @@ -371,9 +371,9 @@ fw_delete(fw_t *f, const struct fw_rule *rule) struct fw_rule tmp; char *p, *line, *msg, cmd[128], buf[MAX_RULE_LENGTH]; int n, ruleno, len; - + format_rule(rule, buf, sizeof(buf)); - + len = snprintf(cmd, sizeof(cmd), "List on %s", rule->fw_device); if ((msg = call_pipe(cmd, len)) == NULL) return (-1); @@ -418,7 +418,7 @@ fw_loop(fw_t *f, fw_handler callback, void *arg) ifinfo->AdapterName); if ((msg = call_pipe(buf, len)) == NULL) return (-1); - + /* parse msg */ for (p = msg; (line = strsep(&p, "\r\n")) != NULL; ) { if (*line == '\0' || *line == '#' || isspace(*line)) diff --git a/libs/libdnet/src/intf-win32.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/intf-win32.c similarity index 99% rename from libs/libdnet/src/intf-win32.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/intf-win32.c index 0203c9e3c0..68907cfb7c 100644 --- a/libs/libdnet/src/intf-win32.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/intf-win32.c @@ -37,7 +37,7 @@ static char * _ifcombo_name(int type) { char *name = "eth"; /* XXX */ - + if (type == MIB_IF_TYPE_TOKENRING) { name = "tr"; } else if (type == MIB_IF_TYPE_FDDI) { @@ -58,7 +58,7 @@ static int _ifcombo_type(const char *device) { int type = INTF_TYPE_OTHER; - + if (strncmp(device, "eth", 3) == 0) { type = INTF_TYPE_ETH; } else if (strncmp(device, "tr", 2) == 0) { @@ -98,7 +98,7 @@ _ifrow_to_entry(intf_t *intf, MIB_IFROW *ifrow, struct intf_entry *entry) { struct addr *ap, *lap; int i; - + /* The total length of the entry may be passed in inside entry. Remember it and clear the entry. */ u_int intf_len = entry->intf_len; @@ -114,7 +114,7 @@ _ifrow_to_entry(intf_t *intf, MIB_IFROW *ifrow, struct intf_entry *entry) snprintf(entry->intf_name, sizeof(entry->intf_name), "%s%lu", _ifcombo_name(ifrow->dwType), i); entry->intf_type = (uint16_t)ifrow->dwType; - + /* Get interface flags. */ entry->intf_flags = 0; if (ifrow->dwAdminStatus == MIB_IF_ADMIN_STATUS_UP && @@ -125,10 +125,10 @@ _ifrow_to_entry(intf_t *intf, MIB_IFROW *ifrow, struct intf_entry *entry) entry->intf_flags |= INTF_FLAG_LOOPBACK; else entry->intf_flags |= INTF_FLAG_MULTICAST; - + /* Get interface MTU. */ entry->intf_mtu = ifrow->dwMtu; - + /* Get hardware address. */ if (ifrow->dwPhysAddrLen == ETH_ADDR_LEN) { entry->intf_link_addr.addr_type = ADDR_TYPE_ETH; @@ -212,7 +212,7 @@ _find_ifindex(intf_t *intf, const char *device) { char *p = (char *)device; int n, type = _ifcombo_type(device); - + while (isalpha((int) (unsigned char) *p)) p++; n = atoi(p); @@ -229,17 +229,17 @@ int intf_get(intf_t *intf, struct intf_entry *entry) { MIB_IFROW ifrow; - + if (_refresh_tables(intf) < 0) return (-1); - + ifrow.dwIndex = _find_ifindex(intf, entry->intf_name); - + if (GetIfEntry(&ifrow) != NO_ERROR) return (-1); _ifrow_to_entry(intf, &ifrow, entry); - + return (0); } @@ -256,7 +256,7 @@ intf_get_src(intf_t *intf, struct intf_entry *entry, struct addr *src) } if (_refresh_tables(intf) < 0) return (-1); - + for (i = 0; i < (int)intf->iptable->dwNumEntries; i++) { iprow = &intf->iptable->table[i]; if (iprow->dwAddr == src->addr_ip) { @@ -275,7 +275,7 @@ int intf_get_dst(intf_t *intf, struct intf_entry *entry, struct addr *dst) { MIB_IFROW ifrow; - + if (dst->addr_type != ADDR_TYPE_IP) { errno = EINVAL; return (-1); @@ -285,12 +285,12 @@ intf_get_dst(intf_t *intf, struct intf_entry *entry, struct addr *dst) if (GetIfEntry(&ifrow) != NO_ERROR) return (-1); - + if (_refresh_tables(intf) < 0) return (-1); - + _ifrow_to_entry(intf, &ifrow, entry); - + return (0); } @@ -310,7 +310,7 @@ intf_set(intf_t *intf, const struct intf_entry *entry) memcpy(&ip, &entry->intf_addr.addr_ip, IP_ADDR_LEN); addr_btom(entry->intf_addr.addr_bits, &mask, IP_ADDR_LEN); - + if (AddIPAddress(ip, mask, _find_ifindex(intf, entry->intf_name), &ctx, &inst) != NO_ERROR) { @@ -333,9 +333,9 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg) if (_refresh_tables(intf) < 0) return (-1); - + entry = (struct intf_entry *)ebuf; - + for (i = 0; i < (int)intf->iftable->dwNumEntries; i++) { entry->intf_len = sizeof(ebuf); _ifrow_to_entry(intf, &intf->iftable->table[i], entry); diff --git a/libs/libdnet/src/intf.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/intf.c similarity index 98% rename from libs/libdnet/src/intf.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/intf.c index 7c94324b87..2fe5be7802 100644 --- a/libs/libdnet/src/intf.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/intf.c @@ -115,7 +115,7 @@ intf_flags_to_iff(u_short flags, int iff) iff |= IFF_NOARP; else iff &= ~IFF_NOARP; - + return (iff); } @@ -125,7 +125,7 @@ intf_iff_to_flags(int iff) u_int n = 0; if (iff & IFF_UP) - n |= INTF_FLAG_UP; + n |= INTF_FLAG_UP; if (iff & IFF_LOOPBACK) n |= INTF_FLAG_LOOPBACK; if (iff & IFF_POINTOPOINT) @@ -145,10 +145,10 @@ intf_open(void) { intf_t *intf; int one = 1; - + if ((intf = calloc(1, sizeof(*intf))) != NULL) { intf->fd = intf->fd6 = -1; - + if ((intf->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) return (intf_close(intf)); @@ -167,7 +167,7 @@ _intf_delete_addrs(intf_t *intf, struct intf_entry *entry) { #if defined(SIOCDIFADDR) struct dnet_ifaliasreq ifra; - + memset(&ifra, 0, sizeof(ifra)); strlcpy(ifra.ifra_name, entry->intf_name, sizeof(ifra.ifra_name)); if (entry->intf_addr.addr_type == ADDR_TYPE_IP) { @@ -195,10 +195,10 @@ _intf_delete_aliases(intf_t *intf, struct intf_entry *entry) size_t i; #if defined(SIOCDIFADDR) && !defined(__linux__) /* XXX - see Linux below */ struct dnet_ifaliasreq ifra; - + memset(&ifra, 0, sizeof(ifra)); strlcpy(ifra.ifra_name, entry->intf_name, sizeof(ifra.ifra_name)); - + for (i = 0; i < entry->intf_alias_num; i++) { addr_ntos(&entry->intf_alias_addrs[i], &ifra.ifra_addr); ioctl(intf->fd, SIOCDIFADDR, &ifra); @@ -206,7 +206,7 @@ _intf_delete_aliases(intf_t *intf, struct intf_entry *entry) #else unsigned char n; struct ifreq ifr; - + for (i = 0; i < entry->intf_alias_num; i++) { n = i + 1; snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%.11s:%u", @@ -231,14 +231,14 @@ _intf_add_aliases(intf_t *intf, const struct intf_entry *entry) #ifdef SIOCAIFADDR struct dnet_ifaliasreq ifra; struct addr bcast; - + memset(&ifra, 0, sizeof(ifra)); strlcpy(ifra.ifra_name, entry->intf_name, sizeof(ifra.ifra_name)); - + for (i = 0; i < (int)entry->intf_alias_num; i++) { if (entry->intf_alias_addrs[i].addr_type != ADDR_TYPE_IP) continue; - + if (addr_ntos(&entry->intf_alias_addrs[i], &ifra.ifra_addr) < 0) return (-1); @@ -246,18 +246,18 @@ _intf_add_aliases(intf_t *intf, const struct intf_entry *entry) addr_ntos(&bcast, &ifra.ifra_brdaddr); addr_btos(entry->intf_alias_addrs[i].addr_bits, &ifra.ifra_mask); - + if (ioctl(intf->fd, SIOCAIFADDR, &ifra) < 0) return (-1); } #else struct ifreq ifr; unsigned char n = 1; - + for (i = 0; i < entry->intf_alias_num; i++) { if (entry->intf_alias_addrs[i].addr_type != ADDR_TYPE_IP) continue; - + snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%.11s:%u", entry->intf_name, n++); # ifdef SIOCLIFADDIF @@ -281,14 +281,14 @@ intf_set(intf_t *intf, const struct intf_entry *entry) struct intf_entry *orig; struct addr bcast; u_char buf[BUFSIZ]; - + orig = (struct intf_entry *)buf; orig->intf_len = sizeof(buf); strcpy(orig->intf_name, entry->intf_name); - + if (intf_get(intf, orig) < 0) return (-1); - + /* Delete any existing aliases. */ if (_intf_delete_aliases(intf, orig) < 0) return (-1); @@ -296,10 +296,10 @@ intf_set(intf_t *intf, const struct intf_entry *entry) /* Delete any existing addrs. */ if (_intf_delete_addrs(intf, orig) < 0) return (-1); - + memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, entry->intf_name, sizeof(ifr.ifr_name)); - + /* Set interface MTU. */ if (entry->intf_mtu != 0) { ifr.ifr_mtu = entry->intf_mtu; @@ -322,7 +322,7 @@ intf_set(intf_t *intf, const struct intf_entry *entry) return (-1); if (ioctl(intf->fd, SIOCSIFADDR, &ifr) < 0 && errno != EEXIST) return (-1); - + if (addr_btos(entry->intf_addr.addr_bits, &ifr.ifr_addr) == 0 #ifdef __linux__ && entry->intf_addr.addr_ip != 0 @@ -375,16 +375,16 @@ intf_set(intf_t *intf, const struct intf_entry *entry) /* Add aliases. */ if (_intf_add_aliases(intf, entry) < 0) return (-1); - + /* Set interface flags. */ if (ioctl(intf->fd, SIOCGIFFLAGS, &ifr) < 0) return (-1); - + ifr.ifr_flags = intf_flags_to_iff(entry->intf_flags, ifr.ifr_flags); - + if (ioctl(intf->fd, SIOCSIFFLAGS, &ifr) < 0) return (-1); - + return (0); } @@ -408,14 +408,14 @@ _intf_get_noalias(intf_t *intf, struct intf_entry *entry) struct ifreq ifr; strlcpy(ifr.ifr_name, entry->intf_name, sizeof(ifr.ifr_name)); - + /* Get interface flags. */ if (ioctl(intf->fd, SIOCGIFFLAGS, &ifr) < 0) return (-1); - + entry->intf_flags = intf_iff_to_flags(ifr.ifr_flags); _intf_set_type(entry); - + /* Get interface MTU. */ #ifdef SIOCGIFMTU if (ioctl(intf->fd, SIOCGIFMTU, &ifr) < 0) @@ -425,7 +425,7 @@ _intf_get_noalias(intf_t *intf, struct intf_entry *entry) entry->intf_addr.addr_type = entry->intf_dst_addr.addr_type = entry->intf_link_addr.addr_type = ADDR_TYPE_NONE; - + /* Get primary interface address. */ if (ioctl(intf->fd, SIOCGIFADDR, &ifr) == 0) { addr_ston(&ifr.ifr_addr, &entry->intf_addr); @@ -449,14 +449,14 @@ _intf_get_noalias(intf_t *intf, struct intf_entry *entry) #elif defined(SIOCRPHYSADDR) /* Tru64 */ struct ifdevea *ifd = (struct ifdevea *)𝔦 /* XXX */ - + if (ioctl(intf->fd, SIOCRPHYSADDR, ifd) < 0) return (-1); addr_pack(&entry->intf_link_addr, ADDR_TYPE_ETH, ETH_ADDR_BITS, ifd->current_pa, ETH_ADDR_LEN); #else eth_t *eth; - + if ((eth = eth_open(entry->intf_name)) != NULL) { if (!eth_get(eth, &entry->intf_link_addr.addr_eth)) { entry->intf_link_addr.addr_type = @@ -478,7 +478,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry) { struct dnet_ifaliasreq ifra; struct addr *ap, *lap; - + strlcpy(ifra.ifra_name, entry->intf_name, sizeof(ifra.ifra_name)); addr_ntos(&entry->intf_addr, &ifra.ifra_addr); addr_btos(entry->intf_addr.addr_bits, &ifra.ifra_mask); @@ -487,7 +487,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry) ap = entry->intf_alias_addrs; lap = (struct addr *)((u_char *)entry + entry->intf_len); - + while (ioctl(intf->fd, SIOCLIFADDR, &ifra) == 0 && ifra.ifra_cookie > 0 && (ap + 1) < lap) { if (addr_ston(&ifra.ifra_addr, ap) < 0) @@ -495,7 +495,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry) ap++, entry->intf_alias_num++; } entry->intf_len = (u_char *)ap - (u_char *)entry; - + return (0); } #else @@ -506,33 +506,33 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry) struct ifreq tmpifr; struct addr *ap, *lap; char *p; - + if (intf->ifc.ifc_len < (int)sizeof(*ifr)) { errno = EINVAL; return (-1); } entry->intf_alias_num = 0; ap = entry->intf_alias_addrs; - lifr = (struct ifreq *)intf->ifc.ifc_buf + + lifr = (struct ifreq *)intf->ifc.ifc_buf + (intf->ifc.ifc_len / sizeof(*lifr)); lap = (struct addr *)((u_char *)entry + entry->intf_len); - + /* Get addresses for this interface. */ for (ifr = intf->ifc.ifc_req; ifr < lifr && (ap + 1) < lap; ifr = NEXTIFR(ifr)) { /* XXX - Linux, Solaris ifaliases */ if ((p = strchr(ifr->ifr_name, ':')) != NULL) *p = '\0'; - + if (strcmp(ifr->ifr_name, entry->intf_name) != 0) { if (p) *p = ':'; continue; } - - if (p) *p = ':'; /* Fix the name back up */ + + if (p) *p = ':'; /* Fix the name back up */ if (addr_ston(&ifr->ifr_addr, ap) < 0) continue; - + /* XXX */ if (ap->addr_type == ADDR_TYPE_ETH) { memcpy(&entry->intf_link_addr, ap, sizeof(*ap)); @@ -552,7 +552,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry) /* XXX - sizeof(ifr) < sizeof(ifr6) */ memcpy(&ifr6, ifr, sizeof(ifr6)); - + if (ioctl(intf->fd6, SIOCGIFNETMASK_IN6, &ifr6) == 0) { addr_stob((struct sockaddr *)&ifr6.ifr_addr, &ap->addr_bits); @@ -568,7 +568,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry) FILE *f; char buf[256], s[8][5], name[INTF_NAME_LEN]; u_int idx, bits, scope, flags; - + if ((f = fopen(PROC_INET6_FILE, "r")) != NULL) { while ((ap +1) < lap && fgets(buf, sizeof(buf), f) != NULL) { @@ -587,7 +587,7 @@ _intf_get_aliases(intf_t *intf, struct intf_entry *entry) } #endif entry->intf_len = (u_char *)ap - (u_char *)entry; - + return (0); } #endif /* SIOCLIFADDR */ @@ -600,7 +600,7 @@ intf_get(intf_t *intf, struct intf_entry *entry) #ifndef SIOCLIFADDR intf->ifc.ifc_buf = (caddr_t)intf->ifcbuf; intf->ifc.ifc_len = sizeof(intf->ifcbuf); - + if (ioctl(intf->fd, SIOCGIFCONF, &intf->ifc) < 0) return (-1); #endif @@ -657,7 +657,7 @@ int intf_get_src(intf_t *intf, struct intf_entry *entry, struct addr *src) { memcpy(&entry->intf_addr, src, sizeof(*src)); - + if (intf_loop(intf, _match_intf_src, entry) != 1) { errno = ENXIO; return (-1); @@ -683,16 +683,16 @@ intf_get_dst(intf_t *intf, struct intf_entry *entry, struct addr *dst) fd = dst->addr_type == ADDR_TYPE_IP6 ? intf->fd6 : intf->fd; if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) < 0) return (-1); - + n = sizeof(sun); if (getsockname(fd, (struct sockaddr *)&sun, &n) < 0) return (-1); - + addr_ston((struct sockaddr *)&sun, &entry->intf_addr); - + if (intf_loop(intf, _match_intf_src, entry) != 1) return (-1); - + return (0); } @@ -708,13 +708,13 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg) int ret; entry = (struct intf_entry *)ebuf; - + if ((fp = fopen(PROC_DEV_FILE, "r")) == NULL) return (-1); - + intf->ifc.ifc_buf = (caddr_t)intf->ifcbuf; intf->ifc.ifc_len = sizeof(intf->ifcbuf); - + if (ioctl(intf->fd, SIOCGIFCONF, &intf->ifc) < 0) { fclose(fp); return (-1); @@ -731,7 +731,7 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg) memset(ebuf, 0, sizeof(ebuf)); strlcpy(entry->intf_name, p, sizeof(entry->intf_name)); entry->intf_len = sizeof(ebuf); - + if (_intf_get_noalias(intf, entry) < 0) { ret = -1; break; @@ -745,9 +745,9 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg) } if (ferror(fp)) ret = -1; - + fclose(fp); - + return (ret); } #else @@ -763,19 +763,19 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg) intf->ifc.ifc_buf = (caddr_t)intf->ifcbuf; intf->ifc.ifc_len = sizeof(intf->ifcbuf); - + if (ioctl(intf->fd, SIOCGIFCONF, &intf->ifc) < 0) return (-1); pifr = NULL; lifr = (struct ifreq *)intf->ifc.ifc_buf + (intf->ifc.ifc_len / sizeof(*lifr)); - + for (ifr = intf->ifc.ifc_req; ifr < lifr; ifr = NEXTIFR(ifr)) { /* XXX - Linux, Solaris ifaliases */ if ((p = strchr(ifr->ifr_name, ':')) != NULL) *p = '\0'; - + if (pifr != NULL && strcmp(ifr->ifr_name, pifr->ifr_name) == 0) { if (p) *p = ':'; continue; @@ -792,7 +792,7 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg) return (-1); if (_intf_get_aliases(intf, entry) < 0) return (-1); - + if ((ret = (*callback)(entry, arg)) != 0) return (ret); diff --git a/libs/libdnet/src/ip-cooked.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip-cooked.c similarity index 99% rename from libs/libdnet/src/ip-cooked.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/ip-cooked.c index 5455f7d004..075ba8e6a5 100644 --- a/libs/libdnet/src/ip-cooked.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip-cooked.c @@ -35,7 +35,7 @@ struct ip_handle { route_t *route; int fd; struct sockaddr_in sin; - + LIST_HEAD(, ip_intf) ip_intf_list; }; @@ -50,10 +50,10 @@ _add_ip_intf(const struct intf_entry *entry, void *arg) entry->intf_mtu >= ETH_LEN_MIN && entry->intf_addr.addr_type == ADDR_TYPE_IP && entry->intf_link_addr.addr_type == ADDR_TYPE_ETH) { - + if ((ipi = calloc(1, sizeof(*ipi))) == NULL) return (-1); - + strlcpy(ipi->name, entry->intf_name, sizeof(ipi->name)); memcpy(&ipi->ha, &entry->intf_link_addr, sizeof(ipi->ha)); memcpy(&ipi->pa, &entry->intf_addr, sizeof(ipi->pa)); @@ -71,19 +71,19 @@ ip_open(void) if ((ip = calloc(1, sizeof(*ip))) != NULL) { ip->fd = -1; - + if ((ip->arp = arp_open()) == NULL || (ip->intf = intf_open()) == NULL || (ip->route = route_open()) == NULL) return (ip_close(ip)); - + if ((ip->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) return (ip_close(ip)); memset(&ip->sin, 0, sizeof(ip->sin)); ip->sin.sin_family = AF_INET; ip->sin.sin_port = htons(666); - + LIST_INIT(&ip->ip_intf_list); if (intf_loop(ip->intf, _add_ip_intf, ip) != 0) @@ -100,7 +100,7 @@ _lookup_ip_intf(ip_t *ip, ip_addr_t dst) ip->sin.sin_addr.s_addr = dst; n = sizeof(ip->sin); - + if (connect(ip->fd, (struct sockaddr *)&ip->sin, n) < 0) return (NULL); @@ -148,7 +148,7 @@ ip_send(ip_t *ip, const void *buf, size_t len) int i, usec; iph = (struct ip_hdr *)buf; - + if ((ipi = _lookup_ip_intf(ip, iph->ip_dst)) == NULL) { errno = EHOSTUNREACH; return (-1); @@ -161,7 +161,7 @@ ip_send(ip_t *ip, const void *buf, size_t len) for (i = 0, usec = 10; i < 3; i++, usec *= 100) { if (arp_get(ip->arp, &arpent) == 0) break; - + if (route_get(ip->route, &rtent) == 0 && rtent.route_gw.addr_ip != ipi->pa.addr_ip) { memcpy(&arpent.arp_pa, &rtent.route_gw, @@ -175,14 +175,14 @@ ip_send(ip_t *ip, const void *buf, size_t len) } if (i == 3) memset(&arpent.arp_ha.addr_eth, 0xff, ETH_ADDR_LEN); - + eth_pack_hdr(frame, arpent.arp_ha.addr_eth, ipi->ha.addr_eth, ETH_TYPE_IP); if (len > ipi->mtu) { u_char *p, *start, *end, *ip_data; int ip_hl, fraglen; - + ip_hl = iph->ip_hl << 2; fraglen = ipi->mtu - ip_hl; @@ -192,10 +192,10 @@ ip_send(ip_t *ip, const void *buf, size_t len) start = (u_char *)buf + ip_hl; end = (u_char *)buf + len; - + for (p = start; p < end; ) { memcpy(ip_data, p, fraglen); - + iph->ip_len = htons(ip_hl + fraglen); iph->ip_off = htons(((p + fraglen < end) ? IP_MF : 0) | ((p - start) >> 3)); @@ -215,7 +215,7 @@ ip_send(ip_t *ip, const void *buf, size_t len) i = ETH_HDR_LEN + len; if (eth_send(ipi->eth, frame, i) != i) return (-1); - + return (len); } diff --git a/libs/libdnet/src/ip-util.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip-util.c similarity index 99% rename from libs/libdnet/src/ip-util.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/ip-util.c index 7cbe44d3aa..6be6e3881b 100644 --- a/libs/libdnet/src/ip-util.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip-util.c @@ -46,7 +46,7 @@ ip_add_option(void *buf, size_t len, int proto, struct tcp_hdr *tcp = NULL; u_char *p; int hl, datalen, padlen; - + if (proto != IP_PROTO_IP && proto != IP_PROTO_TCP) { errno = EINVAL; return (-1); @@ -54,14 +54,14 @@ ip_add_option(void *buf, size_t len, int proto, ip = (struct ip_hdr *)buf; hl = ip->ip_hl << 2; p = (u_char *)buf + hl; - + if (proto == IP_PROTO_TCP) { tcp = (struct tcp_hdr *)p; hl = tcp->th_off << 2; p = (u_char *)tcp + hl; } datalen = ntohs(ip->ip_len) - (p - (u_char *)buf); - + /* Compute padding to next word boundary. */ if ((padlen = 4 - (optlen % 4)) == 4) padlen = 0; @@ -75,7 +75,7 @@ ip_add_option(void *buf, size_t len, int proto, /* XXX - IP_OPT_TYPEONLY() == TCP_OPT_TYPEONLY */ if (IP_OPT_TYPEONLY(((struct ip_opt *)optbuf)->opt_type)) optlen = 1; - + /* Shift any existing data. */ if (datalen) { memmove(p + optlen + padlen, p, datalen); @@ -88,14 +88,14 @@ ip_add_option(void *buf, size_t len, int proto, memmove(p, optbuf, optlen); p += optlen; optlen += padlen; - + if (proto == IP_PROTO_IP) ip->ip_hl = (p - (u_char *)ip) >> 2; else if (proto == IP_PROTO_TCP) tcp->th_off = (p - (u_char *)tcp) >> 2; ip->ip_len = htons(ntohs(ip->ip_len) + optlen); - + return (optlen); } @@ -107,7 +107,7 @@ ip_checksum(void *buf, size_t len) if (len < IP_HDR_LEN) return; - + ip = (struct ip_hdr *)buf; hl = ip->ip_hl << 2; ip->ip_sum = 0; @@ -115,15 +115,15 @@ ip_checksum(void *buf, size_t len) ip->ip_sum = ip_cksum_carry(sum); off = htons(ip->ip_off); - + if ((off & IP_OFFMASK) != 0 || (off & IP_MF) != 0) return; - + len -= hl; - + if (ip->ip_p == IP_PROTO_TCP) { struct tcp_hdr *tcp = (struct tcp_hdr *)((u_char *)ip + hl); - + if (len >= TCP_HDR_LEN) { tcp->th_sum = 0; sum = ip_cksum_add(tcp, len, 0) + @@ -152,7 +152,7 @@ ip_checksum(void *buf, size_t len) } } else if (ip->ip_p == IP_PROTO_ICMP || ip->ip_p == IP_PROTO_IGMP) { struct icmp_hdr *icmp = (struct icmp_hdr *)((u_char *)ip + hl); - + if (len >= ICMP_HDR_LEN) { icmp->icmp_cksum = 0; sum = ip_cksum_add(icmp, len, 0); @@ -166,7 +166,7 @@ ip_cksum_add(const void *buf, size_t len, int cksum) { uint16_t *sp = (uint16_t *)buf; int n, sn; - + sn = len / 2; n = (sn + 15) / 16; diff --git a/libs/libdnet/src/ip-win32.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip-win32.c similarity index 99% rename from libs/libdnet/src/ip-win32.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/ip-win32.c index f1bba07627..bead2a67d7 100644 --- a/libs/libdnet/src/ip-win32.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip-win32.c @@ -35,7 +35,7 @@ ip_open(void) if ((ip->fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) == INVALID_SOCKET) return (ip_close(ip)); - + on = TRUE; if (setsockopt(ip->fd, IPPROTO_IP, IP_HDRINCL, (const char *)&on, sizeof(on)) == SOCKET_ERROR) { @@ -52,13 +52,13 @@ ssize_t ip_send(ip_t *ip, const void *buf, size_t len) { struct ip_hdr *hdr = (struct ip_hdr *)buf; - + ip->sin.sin_addr.s_addr = hdr->ip_src; - + if ((len = sendto(ip->fd, (const char *)buf, len, 0, (struct sockaddr *)&ip->sin, sizeof(ip->sin))) != SOCKET_ERROR) return (len); - + return (-1); } diff --git a/libs/libdnet/src/ip.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip.c similarity index 97% rename from libs/libdnet/src/ip.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/ip.c index d5940a6539..53e0bfd640 100644 --- a/libs/libdnet/src/ip.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip.c @@ -69,19 +69,19 @@ ip_send(ip_t *i, const void *buf, size_t len) ip = (struct ip_hdr *)buf; memset(&sin, 0, sizeof(sin)); -#ifdef HAVE_SOCKADDR_SA_LEN +#ifdef HAVE_SOCKADDR_SA_LEN sin.sin_len = sizeof(sin); #endif sin.sin_family = AF_INET; sin.sin_addr.s_addr = ip->ip_dst; - + #ifdef HAVE_RAWIP_HOST_OFFLEN ip->ip_len = ntohs(ip->ip_len); ip->ip_off = ntohs(ip->ip_off); len = sendto(i->fd, buf, len, 0, (struct sockaddr *)&sin, sizeof(sin)); - + ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); diff --git a/libs/libdnet/src/ip6.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip6.c similarity index 99% rename from libs/libdnet/src/ip6.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/ip6.c index 2618a0b714..c973d41400 100644 --- a/libs/libdnet/src/ip6.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/ip6.c @@ -23,9 +23,9 @@ ip6_checksum(void *buf, size_t len) struct ip6_ext_hdr *ext; u_char *p, nxt; int i, sum; - + nxt = ip6->ip6_nxt; - + for (i = IP6_HDR_LEN; IP6_IS_EXT(nxt); i += (ext->ext_len + 1) << 3) { if (i >= (int)len) return; ext = (struct ip6_ext_hdr *)((u_char *)buf + i); @@ -33,10 +33,10 @@ ip6_checksum(void *buf, size_t len) } p = (u_char *)buf + i; len -= i; - + if (nxt == IP_PROTO_TCP) { struct tcp_hdr *tcp = (struct tcp_hdr *)p; - + if (len >= TCP_HDR_LEN) { tcp->th_sum = 0; sum = ip_cksum_add(tcp, len, 0) + htons(nxt + len); @@ -61,10 +61,10 @@ ip6_checksum(void *buf, size_t len) sum = ip_cksum_add(icmp, len, 0) + htons(nxt + len); sum = ip_cksum_add(&ip6->ip6_src, 32, sum); icmp->icmp_cksum = ip_cksum_carry(sum); - } + } } else if (nxt == IP_PROTO_ICMP || nxt == IP_PROTO_IGMP) { struct icmp_hdr *icmp = (struct icmp_hdr *)p; - + if (len >= ICMP_HDR_LEN) { icmp->icmp_cksum = 0; sum = ip_cksum_add(icmp, len, 0); diff --git a/libs/libdnet/src/memcmp.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/memcmp.c similarity index 100% rename from libs/libdnet/src/memcmp.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/memcmp.c diff --git a/libs/libdnet/src/ndisc-linux.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/ndisc-linux.c similarity index 98% rename from libs/libdnet/src/ndisc-linux.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/ndisc-linux.c index daa4851d6f..10c99deda4 100644 --- a/libs/libdnet/src/ndisc-linux.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/ndisc-linux.c @@ -106,14 +106,14 @@ ndisc_modify(ndisc_t *n, const struct ndisc_entry *entry, int type, int flags) ndm = (struct ndmsg *)(nmsg + 1); ndm->ndm_family = af; - ndm->ndm_state = NUD_PERMANENT; + ndm->ndm_state = NUD_PERMANENT; ndm->ndm_ifindex = entry->intf_index; netlink_addattr(nmsg, NDA_DST, &entry->ndisc_pa.addr_data8[0], alen); if (type == RTM_NEWNEIGH) { - netlink_addattr(nmsg, NDA_LLADDR, + netlink_addattr(nmsg, NDA_LLADDR, &entry->ndisc_ha.addr_data8[0], ETH_ADDR_LEN); } diff --git a/libs/libdnet/src/ndisc-none.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/ndisc-none.c similarity index 100% rename from libs/libdnet/src/ndisc-none.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/ndisc-none.c diff --git a/libs/libdnet/src/rand.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/rand.c similarity index 99% rename from libs/libdnet/src/rand.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/rand.c index 23bdbc180c..d67b93c312 100644 --- a/libs/libdnet/src/rand.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/rand.c @@ -40,7 +40,7 @@ static inline void rand_init(rand_t *rand) { int i; - + for (i = 0; i < 256; i++) rand->s[i] = i; rand->i = rand->j = 0; @@ -51,7 +51,7 @@ rand_addrandom(rand_t *rand, u_char *buf, int len) { int i; uint8_t si; - + rand->i--; for (i = 0; i < 256; i++) { rand->i = (rand->i + 1); @@ -179,19 +179,19 @@ rand_shuffle(rand_t *r, void *base, size_t nmemb, size_t size) if (nmemb < 2) return (0); - + if ((u_int)r->tmplen < size) { if (r->tmp == NULL) { if ((save = malloc(size)) == NULL) return (-1); } else if ((save = realloc(r->tmp, size)) == NULL) return (-1); - + r->tmp = save; r->tmplen = size; } else save = r->tmp; - + for (i = 0; i < nmemb; i++) { if ((j = rand_uint32(r) % (nmemb - 1)) != i) { src = start + (size * i); diff --git a/libs/libdnet/src/route-bsd.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-bsd.c similarity index 99% rename from libs/libdnet/src/route-bsd.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/route-bsd.c index 88fbd8f161..c9ae614b16 100644 --- a/libs/libdnet/src/route-bsd.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-bsd.c @@ -3,7 +3,7 @@ * * Copyright (c) 2001 Dug Song * Copyright (c) 1999 Masaki Hirabaru - * + * * $Id$ */ @@ -113,7 +113,7 @@ route_msg(route_t *r, int type, struct addr *dst, struct addr *gw) sa = NEXTSA(sa); } else rtm->rtm_flags |= RTF_HOST; - + rtm->rtm_msglen = (u_char *)sa - buf; #ifdef DEBUG route_msg_print(rtm); @@ -126,7 +126,7 @@ route_msg(route_t *r, int type, struct addr *dst, struct addr *gw) return (-1); pid = getpid(); - + while (type == RTM_GET && (len = read(r->fd, buf, sizeof(buf))) > 0) { if (len < (int)sizeof(*rtm)) { return (-1); @@ -145,7 +145,7 @@ route_msg(route_t *r, int type, struct addr *dst, struct addr *gw) (RTA_DST|RTA_GATEWAY)) { sa = (struct sockaddr *)(rtm + 1); sa = NEXTSA(sa); - + if (addr_ston(sa, gw) < 0 || gw->addr_type != ADDR_TYPE_IP) { errno = ESRCH; return (-1); @@ -158,7 +158,7 @@ route_t * route_open(void) { route_t *r; - + if ((r = calloc(1, sizeof(*r))) != NULL) { r->fd = -1; #ifdef HAVE_STREAMS_MIB2 @@ -179,12 +179,12 @@ int route_add(route_t *r, const struct route_entry *entry) { struct route_entry rtent; - + memcpy(&rtent, entry, sizeof(rtent)); - + if (route_msg(r, RTM_ADD, &rtent.route_dst, &rtent.route_gw) < 0) return (-1); - + return (0); } @@ -192,15 +192,15 @@ int route_delete(route_t *r, const struct route_entry *entry) { struct route_entry rtent; - + memcpy(&rtent, entry, sizeof(rtent)); - + if (route_get(r, &rtent) < 0) return (-1); - + if (route_msg(r, RTM_DELETE, &rtent.route_dst, &rtent.route_gw) < 0) return (-1); - + return (0); } @@ -209,7 +209,7 @@ route_get(route_t *r, struct route_entry *entry) { if (route_msg(r, RTM_GET, &entry->route_dst, &entry->route_gw) < 0) return (-1); - + return (0); } @@ -225,16 +225,16 @@ route_loop(route_t *r, route_handler callback, void *arg) #ifdef HAVE_SYS_SYSCTL_H int mib[6] = { CTL_NET, PF_ROUTE, 0, 0 /* XXX */, NET_RT_DUMP, 0 }; size_t len; - + if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) return (-1); if (len == 0) return (0); - + if ((buf = malloc(len)) == NULL) return (-1); - + if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { free(buf); return (-1); @@ -275,10 +275,10 @@ route_loop(route_t *r, route_handler callback, void *arg) continue; sa = NEXTSA(sa); - + if (addr_ston(sa, &entry.route_gw) < 0) continue; - + if (entry.route_dst.addr_type != entry.route_gw.addr_type || (entry.route_dst.addr_type != ADDR_TYPE_IP && entry.route_dst.addr_type != ADDR_TYPE_IP6)) @@ -293,7 +293,7 @@ route_loop(route_t *r, route_handler callback, void *arg) break; } free(buf); - + return (ret); } #elif defined(HAVE_STREAMS_MIB2) @@ -326,21 +326,21 @@ route_loop(route_t *r, route_handler callback, void *arg) tor->OPT_offset = sizeof(*tor); tor->OPT_length = sizeof(*opt); tor->MGMT_flags = T_CURRENT; - + opt = (struct opthdr *)(tor + 1); opt->level = MIB2_IP; opt->name = opt->len = 0; - + msg.maxlen = sizeof(buf); msg.len = sizeof(*tor) + sizeof(*opt); msg.buf = buf; - + if (putmsg(r->ip_fd, &msg, NULL, 0) < 0) return (-1); - + opt = (struct opthdr *)(toa + 1); msg.maxlen = sizeof(buf); - + for (;;) { flags = 0; if ((rc = getmsg(r->ip_fd, &msg, NULL, &flags)) < 0) @@ -355,27 +355,27 @@ route_loop(route_t *r, route_handler callback, void *arg) if (msg.len >= sizeof(*tea) && tea->PRIM_type == T_ERROR_ACK) return (-1); - + if (rc != MOREDATA || msg.len < (int)sizeof(*toa) || toa->PRIM_type != T_OPTMGMT_ACK || toa->MGMT_flags != T_SUCCESS) return (-1); - + rtable = (opt->level == MIB2_IP && opt->name == MIB2_IP_21); - + msg.maxlen = sizeof(buf) - (sizeof(buf) % sizeof(*rt)); msg.len = 0; flags = 0; - + do { rc = getmsg(r->ip_fd, NULL, &msg, &flags); - + if (rc != 0 && rc != MOREDATA) return (-1); - + if (!rtable) continue; - + rt = (mib2_ipRouteEntry_t *)msg.buf; rtend = (mib2_ipRouteEntry_t *)(msg.buf + msg.len); @@ -387,19 +387,19 @@ route_loop(route_t *r, route_handler callback, void *arg) IRE_LOCAL|IRE_ROUTE)) != 0 || rt->ipRouteNextHop == IP_ADDR_ANY) continue; - + sin.sin_addr.s_addr = rt->ipRouteNextHop; addr_ston((struct sockaddr *)&sin, &entry.route_gw); - + sin.sin_addr.s_addr = rt->ipRouteDest; addr_ston((struct sockaddr *)&sin, &entry.route_dst); - + sin.sin_addr.s_addr = rt->ipRouteMask; addr_stob((struct sockaddr *)&sin, &entry.route_dst.addr_bits); - + if ((ret = callback(&entry, arg)) != 0) return (ret); } @@ -465,11 +465,11 @@ route_loop(route_t *r, route_handler callback, void *arg) memset(nl, 0, sizeof(nl)); nl[0].n_name = "radix_node_head"; - + if (knlist(nl) < 0 || nl[0].n_type == 0 || (fd = open("/dev/kmem", O_RDONLY, 0)) < 0) return (-1); - + for (_kread(fd, (void *)nl[0].n_value, &rnh, sizeof(rnh)); rnh != NULL; rnh = head.rnh_next) { _kread(fd, rnh, &head, sizeof(head)); diff --git a/libs/libdnet/src/route-hpux.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-hpux.c similarity index 99% rename from libs/libdnet/src/route-hpux.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/route-hpux.c index b68ea92dac..88b01bc9fa 100644 --- a/libs/libdnet/src/route-hpux.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-hpux.c @@ -49,7 +49,7 @@ route_add(route_t *r, const struct route_entry *entry) { struct rtentry rt; struct addr dst; - + memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP | RTF_GATEWAY; @@ -64,7 +64,7 @@ route_add(route_t *r, const struct route_entry *entry) addr_btom(entry->route_dst.addr_bits, &rt.rt_subnetmask, IP_ADDR_LEN) < 0) return (-1); - + return (ioctl(r->fd, SIOCADDRT, &rt)); } @@ -76,18 +76,18 @@ route_delete(route_t *r, const struct route_entry *entry) memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP; - + if (ADDR_ISHOST(&entry->route_dst)) { rt.rt_flags |= RTF_HOST; memcpy(&dst, &entry->route_dst, sizeof(dst)); } else addr_net(&entry->route_dst, &dst); - + if (addr_ntos(&dst, &rt.rt_dst) < 0 || addr_btom(entry->route_dst.addr_bits, &rt.rt_subnetmask, IP_ADDR_LEN) < 0) return (-1); - + return (ioctl(r->fd, SIOCDELRT, &rt)); } @@ -119,7 +119,7 @@ route_get(route_t *r, struct route_entry *entry) entry->route_gw.addr_type = ADDR_TYPE_IP; entry->route_gw.addr_bits = IP_ADDR_BITS; memcpy(&entry->route_gw.addr_ip, &rtr.rtr_gwayaddr, IP_ADDR_LEN); - + return (0); } @@ -132,15 +132,15 @@ route_loop(route_t *r, route_handler callback, void *arg) struct route_entry entry; mib_ipRouteEnt rtentries[MAX_RTENTRIES]; int fd, i, n, ret; - + if ((fd = open_mib("/dev/ip", O_RDWR, 0 /* XXX */, 0)) < 0) return (-1); - + nm.objid = ID_ipRouteTable; nm.buffer = rtentries; n = sizeof(rtentries); nm.len = &n; - + if (get_mib_info(fd, &nm) < 0) { close_mib(fd); return (-1); @@ -151,12 +151,12 @@ route_loop(route_t *r, route_handler callback, void *arg) entry.route_dst.addr_bits = entry.route_gw.addr_bits = IP_ADDR_BITS; n /= sizeof(*rtentries); ret = 0; - + for (i = 0; i < n; i++) { if (rtentries[i].Type != NMDIRECT && rtentries[i].Type != NMREMOTE) continue; - + entry.route_dst.addr_ip = rtentries[i].Dest; addr_mtob(&rtentries[i].Mask, IP_ADDR_LEN, &entry.route_dst.addr_bits); diff --git a/libs/libdnet/src/route-linux.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-linux.c similarity index 99% rename from libs/libdnet/src/route-linux.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/route-linux.c index 45b5c2e44e..9a0f9c03f2 100644 --- a/libs/libdnet/src/route-linux.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-linux.c @@ -51,20 +51,20 @@ route_open(void) if ((r = calloc(1, sizeof(*r))) != NULL) { r->fd = r->fd6 = r->nlfd = -1; - + if ((r->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) return (route_close(r)); if ((r->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) return (route_close(r)); - + if ((r->nlfd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) < 0) return (route_close(r)); - + memset(&snl, 0, sizeof(snl)); snl.nl_family = AF_NETLINK; - + if (bind(r->nlfd, (struct sockaddr *)&snl, sizeof(snl)) < 0) return (route_close(r)); } @@ -85,12 +85,12 @@ route_add(route_t *r, const struct route_entry *entry) memcpy(&dst, &entry->route_dst, sizeof(dst)); } else addr_net(&entry->route_dst, &dst); - + if (addr_ntos(&dst, &rt.rt_dst) < 0 || addr_ntos(&entry->route_gw, &rt.rt_gateway) < 0 || addr_btos(entry->route_dst.addr_bits, &rt.rt_genmask) < 0) return (-1); - + return (ioctl(r->fd, SIOCADDRT, &rt)); } @@ -160,7 +160,7 @@ route_delete(route_t *r, const struct route_entry *entry) { struct rtentry rt; struct addr dst; - + memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP; @@ -169,11 +169,11 @@ route_delete(route_t *r, const struct route_entry *entry) memcpy(&dst, &entry->route_dst, sizeof(dst)); } else addr_net(&entry->route_dst, &dst); - + if (addr_ntos(&dst, &rt.rt_dst) < 0 || addr_btos(entry->route_dst.addr_bits, &rt.rt_genmask) < 0) return (-1); - + return (ioctl(r->fd, SIOCDELRT, &rt)); } @@ -240,7 +240,7 @@ route_get(route_t *r, struct route_entry *entry) rmsg = (struct rtmsg *)(nmsg + 1); rmsg->rtm_family = af; rmsg->rtm_dst_len = entry->route_dst.addr_bits; - + rta = RTM_RTA(rmsg); rta->rta_type = RTA_DST; rta->rta_len = RTA_LENGTH(alen); @@ -251,25 +251,25 @@ route_get(route_t *r, struct route_entry *entry) memcpy(RTA_DATA(rta), &i, alen); } else memcpy(RTA_DATA(rta), entry->route_dst.addr_data8, alen); - + memset(&snl, 0, sizeof(snl)); snl.nl_family = AF_NETLINK; iov.iov_base = nmsg; iov.iov_len = nmsg->nlmsg_len; - + memset(&msg, 0, sizeof(msg)); msg.msg_name = &snl; msg.msg_namelen = sizeof(snl); msg.msg_iov = &iov; msg.msg_iovlen = 1; - + if (sendmsg(r->nlfd, &msg, 0) < 0) return (-1); iov.iov_base = buf; iov.iov_len = sizeof(buf); - + if ((i = recvmsg(r->nlfd, &msg, 0)) <= 0) return (-1); @@ -280,9 +280,9 @@ route_get(route_t *r, struct route_entry *entry) } if (nmsg->nlmsg_type == NLMSG_ERROR) return (-1); - + i -= NLMSG_LENGTH(sizeof(*nmsg)); - + while (RTA_OK(rta, i)) { if (rta->rta_type == RTA_GATEWAY) { entry->route_gw.addr_type = entry->route_dst.addr_type; @@ -293,7 +293,7 @@ route_get(route_t *r, struct route_entry *entry) rta = RTA_NEXT(rta, i); } errno = ESRCH; - + return (-1); } @@ -309,28 +309,28 @@ route_loop(route_t *r, route_handler callback, void *arg) char ifbuf[17]; int i, iflags, refcnt, use, metric, mss, win, irtt; uint32_t mask; - + while (fgets(buf, sizeof(buf), fp) != NULL) { i = sscanf(buf, "%16s %X %X %X %d %d %d %X %d %d %d\n", ifbuf, &entry.route_dst.addr_ip, &entry.route_gw.addr_ip, &iflags, &refcnt, &use, &metric, &mask, &mss, &win, &irtt); - + if (i < 10 || !(iflags & RTF_UP)) continue; - + if (entry.route_gw.addr_ip == IP_ADDR_ANY) continue; - + entry.route_dst.addr_type = entry.route_gw.addr_type = ADDR_TYPE_IP; - + if (addr_mtob(&mask, IP_ADDR_LEN, &entry.route_dst.addr_bits) < 0) continue; - + entry.route_gw.addr_bits = IP_ADDR_BITS; - + if ((ret = callback(&entry, arg)) != 0) break; } @@ -339,7 +339,7 @@ route_loop(route_t *r, route_handler callback, void *arg) if (ret == 0 && (fp = fopen(PROC_IPV6_ROUTE_FILE, "r")) != NULL) { char s[33], d[8][5], n[8][5]; u_int slen, dlen; - + while (fgets(buf, sizeof(buf), fp) != NULL) { sscanf(buf, "%04s%04s%04s%04s%04s%04s%04s%04s %02x " "%32s %02x %04s%04s%04s%04s%04s%04s%04s%04s ", @@ -354,7 +354,7 @@ route_loop(route_t *r, route_handler callback, void *arg) n[0], n[1], n[2], n[3], n[4], n[5], n[6], n[7], IP6_ADDR_BITS); addr_aton(buf, &entry.route_gw); - + if ((ret = callback(&entry, arg)) != 0) break; } diff --git a/libs/libdnet/src/route-none.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-none.c similarity index 100% rename from libs/libdnet/src/route-none.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/route-none.c diff --git a/libs/libdnet/src/route-win32.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-win32.c similarity index 97% rename from libs/libdnet/src/route-win32.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/route-win32.c index ff04e583c1..ac7b23f9f6 100644 --- a/libs/libdnet/src/route-win32.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/route-win32.c @@ -42,17 +42,17 @@ route_add(route_t *route, const struct route_entry *entry) if (addr_net(&entry->route_dst, &net) < 0 || net.addr_type != ADDR_TYPE_IP) return (-1); - + ipfrow.dwForwardDest = net.addr_ip; addr_btom(entry->route_dst.addr_bits, &ipfrow.dwForwardMask, IP_ADDR_LEN); ipfrow.dwForwardNextHop = entry->route_gw.addr_ip; ipfrow.dwForwardType = 4; /* XXX - next hop != final dest */ ipfrow.dwForwardProto = 3; /* XXX - MIB_PROTO_NETMGMT */ - + if (CreateIpForwardEntry(&ipfrow) != NO_ERROR) return (-1); - + return (0); } @@ -61,14 +61,14 @@ route_delete(route_t *route, const struct route_entry *entry) { MIB_IPFORWARDROW ipfrow; DWORD mask; - + if (entry->route_dst.addr_type != ADDR_TYPE_IP || GetBestRoute(entry->route_dst.addr_ip, IP_ADDR_ANY, &ipfrow) != NO_ERROR) return (-1); addr_btom(entry->route_dst.addr_bits, &mask, IP_ADDR_LEN); - + if (ipfrow.dwForwardDest != entry->route_dst.addr_ip || ipfrow.dwForwardMask != mask) { errno = ENXIO; @@ -77,7 +77,7 @@ route_delete(route_t *route, const struct route_entry *entry) } if (DeleteIpForwardEntry(&ipfrow) != NO_ERROR) return (-1); - + return (0); } @@ -95,17 +95,17 @@ route_get(route_t *route, struct route_entry *entry) if (ipfrow.dwForwardProto == 2 && /* XXX - MIB_IPPROTO_LOCAL */ (ipfrow.dwForwardNextHop|IP_CLASSA_NET) != (IP_ADDR_LOOPBACK|IP_CLASSA_NET) && - !IP_LOCAL_GROUP(ipfrow.dwForwardNextHop)) { + !IP_LOCAL_GROUP(ipfrow.dwForwardNextHop)) { errno = ENXIO; SetLastError(ERROR_NO_DATA); return (-1); } addr_btom(entry->route_dst.addr_bits, &mask, IP_ADDR_LEN); - + entry->route_gw.addr_type = ADDR_TYPE_IP; entry->route_gw.addr_bits = IP_ADDR_BITS; entry->route_gw.addr_ip = ipfrow.dwForwardNextHop; - + return (0); } @@ -115,7 +115,7 @@ route_loop(route_t *r, route_handler callback, void *arg) struct route_entry entry; ULONG len; int i, ret; - + for (len = sizeof(r->ipftable[0]); ; ) { if (r->ipftable) free(r->ipftable); @@ -128,17 +128,17 @@ route_loop(route_t *r, route_handler callback, void *arg) } entry.route_dst.addr_type = ADDR_TYPE_IP; entry.route_dst.addr_bits = IP_ADDR_BITS; - + entry.route_gw.addr_type = ADDR_TYPE_IP; entry.route_gw.addr_bits = IP_ADDR_BITS; - + for (i = 0; i < (int)r->ipftable->dwNumEntries; i++) { entry.route_dst.addr_ip = r->ipftable->table[i].dwForwardDest; addr_mtob(&r->ipftable->table[i].dwForwardMask, IP_ADDR_LEN, &entry.route_dst.addr_bits); entry.route_gw.addr_ip = r->ipftable->table[i].dwForwardNextHop; - + if ((ret = (*callback)(&entry, arg)) != 0) return (ret); } diff --git a/libs/libdnet/src/strlcat.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/strlcat.c similarity index 100% rename from libs/libdnet/src/strlcat.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/strlcat.c diff --git a/libs/libdnet/src/strlcpy.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/strlcpy.c similarity index 100% rename from libs/libdnet/src/strlcpy.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/strlcpy.c diff --git a/libs/libdnet/src/strsep.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/strsep.c similarity index 98% rename from libs/libdnet/src/strsep.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/strsep.c index b69b715fc5..724e353492 100644 --- a/libs/libdnet/src/strsep.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/strsep.c @@ -46,7 +46,7 @@ static char *rcsid = "$OpenBSD: strsep.c,v 1.3 1997/08/20 04:28:14 millert Exp $ /* * Get next token from string *stringp, where tokens are possibly-empty - * strings separated by characters from delim. + * strings separated by characters from delim. * * Writes NULs into the string at *stringp to end tokens. * delim need not remain constant from call to call. diff --git a/libs/libdnet/src/tun-bsd.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/tun-bsd.c similarity index 98% rename from libs/libdnet/src/tun-bsd.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/tun-bsd.c index b6613f74da..d1f040b6aa 100644 --- a/libs/libdnet/src/tun-bsd.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/tun-bsd.c @@ -49,22 +49,22 @@ tun_open(struct addr *src, struct addr *dst, int mtu) memset(&ifent, 0, sizeof(ifent)); ifent.intf_len = sizeof(ifent); - + for (i = 0; i < MAX_DEVS; i++) { snprintf(dev, sizeof(dev), "/dev/tun%d", i); strlcpy(ifent.intf_name, dev + 5, sizeof(ifent.intf_name)); tun->save = ifent; - + if ((tun->fd = open(dev, O_RDWR, 0)) != -1 && intf_get(tun->intf, &tun->save) == 0) { route_t *r; struct route_entry entry; - + ifent.intf_flags = INTF_FLAG_UP|INTF_FLAG_POINTOPOINT; ifent.intf_addr = *src; - ifent.intf_dst_addr = *dst; + ifent.intf_dst_addr = *dst; ifent.intf_mtu = mtu; - + if (intf_set(tun->intf, &ifent) < 0) tun = tun_close(tun); @@ -106,7 +106,7 @@ tun_send(tun_t *tun, const void *buf, size_t size) iov[0].iov_len = sizeof(af); iov[1].iov_base = (void *)buf; iov[1].iov_len = size; - + return (writev(tun->fd, iov, 2)); #else return (write(tun->fd, buf, size)); @@ -119,12 +119,12 @@ tun_recv(tun_t *tun, void *buf, size_t size) #ifdef __OpenBSD__ struct iovec iov[2]; uint32_t af; - + iov[0].iov_base = ⁡ iov[0].iov_len = sizeof(af); iov[1].iov_base = (void *)buf; iov[1].iov_len = size; - + return (readv(tun->fd, iov, 2) - sizeof(af)); #else return (read(tun->fd, buf, size)); diff --git a/libs/libdnet/src/tun-linux.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/tun-linux.c similarity index 97% rename from libs/libdnet/src/tun-linux.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/tun-linux.c index eb8975556b..448c54b432 100644 --- a/libs/libdnet/src/tun-linux.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/tun-linux.c @@ -37,14 +37,14 @@ tun_open(struct addr *src, struct addr *dst, int mtu) { tun_t *tun; struct intf_entry ifent; - + if ((tun = calloc(1, sizeof(*tun))) == NULL) return (NULL); if ((tun->fd = open("/dev/net/tun", O_RDWR, 0)) < 0 || (tun->intf = intf_open()) == NULL) return (tun_close(tun)); - + tun->ifr.ifr_flags = IFF_TUN; if (ioctl(tun->fd, TUNSETIFF, (void *) &tun->ifr) < 0) @@ -54,12 +54,12 @@ tun_open(struct addr *src, struct addr *dst, int mtu) strlcpy(ifent.intf_name, tun->ifr.ifr_name, sizeof(ifent.intf_name)); ifent.intf_flags = INTF_FLAG_UP|INTF_FLAG_POINTOPOINT; ifent.intf_addr = *src; - ifent.intf_dst_addr = *dst; + ifent.intf_dst_addr = *dst; ifent.intf_mtu = mtu; - + if (intf_set(tun->intf, &ifent) < 0) return (tun_close(tun)); - + return (tun); } @@ -80,12 +80,12 @@ tun_send(tun_t *tun, const void *buf, size_t size) { struct iovec iov[2]; uint32_t etype = htonl(ETH_TYPE_IP); - + iov[0].iov_base = &etype; iov[0].iov_len = sizeof(etype); iov[1].iov_base = (void *)buf; iov[1].iov_len = size; - + return (writev(tun->fd, iov, 2)); } @@ -99,7 +99,7 @@ tun_recv(tun_t *tun, void *buf, size_t size) iov[0].iov_len = sizeof(type); iov[1].iov_base = (void *)buf; iov[1].iov_len = size; - + return (readv(tun->fd, iov, 2) - sizeof(type)); } diff --git a/libs/libdnet/src/tun-none.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/tun-none.c similarity index 100% rename from libs/libdnet/src/tun-none.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/tun-none.c diff --git a/libs/libdnet/src/tun-solaris.c b/libs/libdnet/libdnet-libdnet-1.18.0/src/tun-solaris.c similarity index 99% rename from libs/libdnet/src/tun-solaris.c rename to libs/libdnet/libdnet-libdnet-1.18.0/src/tun-solaris.c index 3fae850bdb..0e93d524ed 100644 --- a/libs/libdnet/src/tun-solaris.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/src/tun-solaris.c @@ -47,13 +47,13 @@ tun_open(struct addr *src, struct addr *dst, int mtu) return (NULL); tun->fd = tun->ip_fd = tun->if_fd = -1; - + if ((tun->fd = open(DEV_TUN, O_RDWR, 0)) < 0) return (tun_close(tun)); if ((tun->ip_fd = open(DEV_IP, O_RDWR, 0)) < 0) return (tun_close(tun)); - + if ((ppa = ioctl(tun->fd, TUNNEWPPA, ppa)) < 0) return (tun_close(tun)); @@ -62,7 +62,7 @@ tun_open(struct addr *src, struct addr *dst, int mtu) if (ioctl(tun->if_fd, I_PUSH, "ip") < 0) return (tun_close(tun)); - + if (ioctl(tun->if_fd, IF_UNITSEL, (char *)&ppa) < 0) return (tun_close(tun)); @@ -70,13 +70,13 @@ tun_open(struct addr *src, struct addr *dst, int mtu) return (tun_close(tun)); snprintf(tun->name, sizeof(tun->name), "tun%d", ppa); - + snprintf(cmd, sizeof(cmd), "ifconfig %s %s/32 %s mtu %d up", tun->name, addr_ntoa(src), addr_ntoa(dst), mtu); - + if (system(cmd) < 0) return (tun_close(tun)); - + return (tun); } @@ -107,7 +107,7 @@ tun_recv(tun_t *tun, void *buf, size_t size) { struct strbuf sbuf; int flags = 0; - + sbuf.buf = buf; sbuf.maxlen = size; return (getmsg(tun->fd, NULL, &sbuf, &flags) >= 0 ? sbuf.len : -1); diff --git a/libs/libdnet/test/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/test/Makefile.am similarity index 98% rename from libs/libdnet/test/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/test/Makefile.am index 392d7c5efc..dde631287b 100644 --- a/libs/libdnet/test/Makefile.am +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/Makefile.am @@ -3,4 +3,3 @@ include $(top_srcdir)/Makefile.am.common SUBDIRS = check dnet - diff --git a/libs/libdnet/test/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/test/Makefile.in similarity index 99% rename from libs/libdnet/test/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/test/Makefile.in index 0d48206e62..4223a6901a 100644 --- a/libs/libdnet/test/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/Makefile.in @@ -107,11 +107,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = diff --git a/libs/libdnet/test/check/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/Makefile.am similarity index 100% rename from libs/libdnet/test/check/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/Makefile.am diff --git a/libs/libdnet/test/check/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/Makefile.in similarity index 98% rename from libs/libdnet/test/check/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/Makefile.in index fac597b918..913a39fb67 100644 --- a/libs/libdnet/test/check/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/Makefile.in @@ -120,7 +120,7 @@ check_addr_DEPENDENCIES = $(top_builddir)/src/libdnet.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent -am__v_lt_1 = +am__v_lt_1 = am_check_arp_OBJECTS = check_arp.$(OBJEXT) check_arp_OBJECTS = $(am_check_arp_OBJECTS) check_arp_LDADD = $(LDADD) @@ -160,11 +160,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = am__maybe_remake_depfiles = @@ -177,7 +177,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -185,7 +185,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = +am__v_CCLD_1 = SOURCES = $(check_addr_SOURCES) $(check_arp_SOURCES) \ $(check_blob_SOURCES) $(check_eth_SOURCES) $(check_fw_SOURCES) \ $(check_intf_SOURCES) $(check_ip_SOURCES) \ @@ -615,39 +615,39 @@ clean-noinstPROGRAMS: echo " rm -f" $$list; \ rm -f $$list -check_addr$(EXEEXT): $(check_addr_OBJECTS) $(check_addr_DEPENDENCIES) $(EXTRA_check_addr_DEPENDENCIES) +check_addr$(EXEEXT): $(check_addr_OBJECTS) $(check_addr_DEPENDENCIES) $(EXTRA_check_addr_DEPENDENCIES) @rm -f check_addr$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_addr_OBJECTS) $(check_addr_LDADD) $(LIBS) -check_arp$(EXEEXT): $(check_arp_OBJECTS) $(check_arp_DEPENDENCIES) $(EXTRA_check_arp_DEPENDENCIES) +check_arp$(EXEEXT): $(check_arp_OBJECTS) $(check_arp_DEPENDENCIES) $(EXTRA_check_arp_DEPENDENCIES) @rm -f check_arp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_arp_OBJECTS) $(check_arp_LDADD) $(LIBS) -check_blob$(EXEEXT): $(check_blob_OBJECTS) $(check_blob_DEPENDENCIES) $(EXTRA_check_blob_DEPENDENCIES) +check_blob$(EXEEXT): $(check_blob_OBJECTS) $(check_blob_DEPENDENCIES) $(EXTRA_check_blob_DEPENDENCIES) @rm -f check_blob$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_blob_OBJECTS) $(check_blob_LDADD) $(LIBS) -check_eth$(EXEEXT): $(check_eth_OBJECTS) $(check_eth_DEPENDENCIES) $(EXTRA_check_eth_DEPENDENCIES) +check_eth$(EXEEXT): $(check_eth_OBJECTS) $(check_eth_DEPENDENCIES) $(EXTRA_check_eth_DEPENDENCIES) @rm -f check_eth$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_eth_OBJECTS) $(check_eth_LDADD) $(LIBS) -check_fw$(EXEEXT): $(check_fw_OBJECTS) $(check_fw_DEPENDENCIES) $(EXTRA_check_fw_DEPENDENCIES) +check_fw$(EXEEXT): $(check_fw_OBJECTS) $(check_fw_DEPENDENCIES) $(EXTRA_check_fw_DEPENDENCIES) @rm -f check_fw$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_fw_OBJECTS) $(check_fw_LDADD) $(LIBS) -check_intf$(EXEEXT): $(check_intf_OBJECTS) $(check_intf_DEPENDENCIES) $(EXTRA_check_intf_DEPENDENCIES) +check_intf$(EXEEXT): $(check_intf_OBJECTS) $(check_intf_DEPENDENCIES) $(EXTRA_check_intf_DEPENDENCIES) @rm -f check_intf$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_intf_OBJECTS) $(check_intf_LDADD) $(LIBS) -check_ip$(EXEEXT): $(check_ip_OBJECTS) $(check_ip_DEPENDENCIES) $(EXTRA_check_ip_DEPENDENCIES) +check_ip$(EXEEXT): $(check_ip_OBJECTS) $(check_ip_DEPENDENCIES) $(EXTRA_check_ip_DEPENDENCIES) @rm -f check_ip$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_ip_OBJECTS) $(check_ip_LDADD) $(LIBS) -check_rand$(EXEEXT): $(check_rand_OBJECTS) $(check_rand_DEPENDENCIES) $(EXTRA_check_rand_DEPENDENCIES) +check_rand$(EXEEXT): $(check_rand_OBJECTS) $(check_rand_DEPENDENCIES) $(EXTRA_check_rand_DEPENDENCIES) @rm -f check_rand$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_rand_OBJECTS) $(check_rand_LDADD) $(LIBS) -check_route$(EXEEXT): $(check_route_OBJECTS) $(check_route_DEPENDENCIES) $(EXTRA_check_route_DEPENDENCIES) +check_route$(EXEEXT): $(check_route_OBJECTS) $(check_route_DEPENDENCIES) $(EXTRA_check_route_DEPENDENCIES) @rm -f check_route$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_route_OBJECTS) $(check_route_LDADD) $(LIBS) @@ -844,7 +844,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -854,7 +854,7 @@ check-TESTS: log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ exit $$?; -recheck: all +recheck: all @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @set +e; $(am__set_TESTS_bases); \ bases=`for i in $$bases; do echo $$i; done \ diff --git a/libs/libdnet/test/check/check_addr.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_addr.c similarity index 99% rename from libs/libdnet/test/check/check_addr.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_addr.c index 7fbfe9536c..351099ba0b 100644 --- a/libs/libdnet/test/check/check_addr.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_addr.c @@ -46,7 +46,7 @@ START_TEST(test_addr_pack) fail_unless(memcmp(&a, &b, sizeof(a)) == 0, "got different address"); } END_TEST - + START_TEST(test_addr_cmp) { struct addr a, b; @@ -141,7 +141,7 @@ START_TEST(test_addr_ntop) "00:0d:0e:0a:0d:00") == 0, "b0rked"); a.addr_bits = 16; fail_unless(addr_ntop(&a, buf, sizeof(buf)) == NULL, "took /16 mask"); - + for (ntop = ntop_ip6; ntop->n != NULL; ntop++) { addr_pack(&a, ADDR_TYPE_IP6, IP6_ADDR_BITS, ntop->n, IP6_ADDR_LEN); @@ -263,7 +263,7 @@ START_TEST(test_addr_ston) memcpy(&b, &a, sizeof(&b)); SIN_PACK(&s, htonl(0x01020304), 0); memcpy(&t, &s, sizeof(&t)); - + addr_ston((SA *)&s, &b); fail_unless(memcmp(&a, &b, sizeof(a)) == 0, "bad addr"); #ifdef HAVE_SOCKADDR_SA_LEN @@ -280,7 +280,7 @@ START_TEST(test_addr_btos) { struct sockaddr s; struct addr a; - + ADDR_PACK(&a, htonl(0xffffff00)); a.addr_bits = 24; fail_unless(addr_btos(a.addr_bits, &s) == 0, "b0rked"); @@ -345,7 +345,7 @@ addr_suite(void) tcase_add_test(tc_core, test_addr_stob); tcase_add_test(tc_core, test_addr_btom); tcase_add_test(tc_core, test_addr_mtob); - + return (s); } @@ -355,10 +355,10 @@ main(void) Suite *s = addr_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_arp.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_arp.c similarity index 99% rename from libs/libdnet/test/check/check_arp.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_arp.c index 85f2bbde48..bf7e10d34c 100644 --- a/libs/libdnet/test/check/check_arp.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_arp.c @@ -25,7 +25,7 @@ END_TEST START_TEST(test_arp_add) { - + } END_TEST @@ -57,7 +57,7 @@ arp_suite(void) tcase_add_test(tc_core, test_arp_delete); tcase_add_test(tc_core, test_arp_get); tcase_add_test(tc_core, test_arp_loop); - + return (s); } @@ -67,10 +67,10 @@ main(void) Suite *s = arp_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_blob.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_blob.c similarity index 99% rename from libs/libdnet/test/check/check_blob.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_blob.c index 72931cb25b..624c1958e6 100644 --- a/libs/libdnet/test/check/check_blob.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_blob.c @@ -12,7 +12,7 @@ START_TEST(test_blob_newfree) { blob_t *b; - + fail_unless((b = blob_new()) != NULL, "new failed"); fail_unless((b = blob_free(b)) == NULL, "free failed"); } @@ -22,7 +22,7 @@ START_TEST(test_blob_readwrite) { blob_t *b; char tmp[32]; - + b = blob_new(); blob_write(b, "foobar", 7); blob_write(b, "spazzo", 7); @@ -43,7 +43,7 @@ START_TEST(test_blob_insertdelete) { blob_t *b, bf; char tmp[32]; - + b = blob_new(); fail_unless(blob_insert(b, "foo", 3) == 3, "insert1 failed"); blob_rewind(b); @@ -58,7 +58,7 @@ START_TEST(test_blob_insertdelete) blob_read(b, tmp, 3); tmp[3] = 0; fail_unless(strcmp(tmp,"foo") == 0, "read failed"); - + fail_unless(blob_delete(b, NULL, 4) < 0, "deleted more than size"); b = blob_free(b); @@ -67,7 +67,7 @@ START_TEST(test_blob_insertdelete) bf.off = bf.size = 0; fail_unless(blob_insert(&bf, "foobar", 6) < 0, "inserted into fixed"); - fail_unless(blob_delete(&bf, NULL, 3) < 0, "deleted from fixed"); + fail_unless(blob_delete(&bf, NULL, 3) < 0, "deleted from fixed"); } END_TEST @@ -89,14 +89,14 @@ START_TEST(test_blob_packunpack) d = 555; h = 666; strcpy(s, "donkey"); -#if 0 +#if 0 printf("D: 0x%x H: 0x%x c: %c d: %d h: %d s: %s\n", D, H, c, d, h, s); #endif fail_unless(blob_pack(b, "whee:%D%H%*b%c%d%h%s\r\n", D, H, sizeof(buf), buf, c, d, h, s) == 0, "pack failed"); - + blob_rewind(b); #if 0 blob_print(b, "hexl", blob_left(b)); @@ -112,7 +112,7 @@ START_TEST(test_blob_packunpack) memcmp(buf, "f\x00\x00bar", 6) != 0 || c != 'c' || d != 555 || h != 666 || strcmp(s, "donkey") != 0) fail("unpacked weird crap"); - + blob_free(b); } END_TEST @@ -166,7 +166,7 @@ blob_suite(void) tcase_add_test(tc_core, test_blob_packunpack); tcase_add_test(tc_core, test_blob_seek); tcase_add_test(tc_core, test_blob_index); - + return (s); } @@ -182,6 +182,6 @@ main(void) srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_eth.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_eth.c similarity index 99% rename from libs/libdnet/test/check/check_eth.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_eth.c index cc6d0fa0cd..f56fbd51c3 100644 --- a/libs/libdnet/test/check/check_eth.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_eth.c @@ -46,7 +46,7 @@ eth_suite(void) tcase_add_test(tc_core, test_eth_get); tcase_add_test(tc_core, test_eth_set); tcase_add_test(tc_core, test_eth_send); - + return (s); } @@ -56,10 +56,10 @@ main(void) Suite *s = eth_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_fw.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_fw.c similarity index 99% rename from libs/libdnet/test/check/check_fw.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_fw.c index 2e3106b7c7..80c00b4e90 100644 --- a/libs/libdnet/test/check/check_fw.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_fw.c @@ -56,7 +56,7 @@ fw_suite(void) tcase_add_test(tc_core, test_fw_delete); tcase_add_test(tc_core, test_fw_loop); tcase_add_test(tc_core, test_fw_close); - + return (s); } @@ -66,10 +66,10 @@ main(void) Suite *s = fw_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_intf.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_intf.c similarity index 99% rename from libs/libdnet/test/check/check_intf.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_intf.c index fa1b329b07..5748b04974 100644 --- a/libs/libdnet/test/check/check_intf.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_intf.c @@ -65,7 +65,7 @@ intf_suite(void) tcase_add_test(tc_core, test_intf_get_dst); tcase_add_test(tc_core, test_intf_set); tcase_add_test(tc_core, test_intf_loop); - + return (s); } @@ -75,10 +75,10 @@ main(void) Suite *s = intf_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_ip.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_ip.c similarity index 99% rename from libs/libdnet/test/check/check_ip.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_ip.c index 5428644efa..5ecf95f999 100644 --- a/libs/libdnet/test/check/check_ip.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_ip.c @@ -62,7 +62,7 @@ ip_suite(void) tcase_add_test(tc_core, test_ip_aton); tcase_add_test(tc_core, test_ip_add_option); tcase_add_test(tc_core, test_ip_checksum); - + return (s); } @@ -72,10 +72,10 @@ main(void) Suite *s = ip_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_rand.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_rand.c similarity index 99% rename from libs/libdnet/test/check/check_rand.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_rand.c index 08f74ebbd0..0ad1542c32 100644 --- a/libs/libdnet/test/check/check_rand.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_rand.c @@ -65,7 +65,7 @@ START_TEST(test_rand_shuffle) r = rand_close(r); } END_TEST - + Suite * rand_suite(void) { @@ -77,7 +77,7 @@ rand_suite(void) tcase_add_test(tc_core, test_rand_get); tcase_add_test(tc_core, test_rand_set); tcase_add_test(tc_core, test_rand_shuffle); - + return (s); } @@ -87,10 +87,10 @@ main(void) Suite *s = rand_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/check/check_route.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_route.c similarity index 99% rename from libs/libdnet/test/check/check_route.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_route.c index 73a8491e0a..1002a6998c 100644 --- a/libs/libdnet/test/check/check_route.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/check/check_route.c @@ -50,7 +50,7 @@ route_suite(void) tcase_add_test(tc_core, test_route_delete); tcase_add_test(tc_core, test_route_get); tcase_add_test(tc_core, test_route_loop); - + return (s); } @@ -60,10 +60,10 @@ main(void) Suite *s = route_suite(); SRunner *sr = srunner_create(s); int nf; - + srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed(sr); srunner_free(sr); - + return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/libs/libdnet/test/dnet/Makefile.am b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/Makefile.am similarity index 99% rename from libs/libdnet/test/dnet/Makefile.am rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/Makefile.am index 2c5f5537bc..e167809233 100644 --- a/libs/libdnet/test/dnet/Makefile.am +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/Makefile.am @@ -15,4 +15,3 @@ dnet_LDADD = $(top_builddir)/src/libdnet.la dnet.8.txt: dnet.8 groff -t -e -mdoc -Tascii dnet.8 | col -bx > $@ - diff --git a/libs/libdnet/test/dnet/Makefile.in b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/Makefile.in similarity index 99% rename from libs/libdnet/test/dnet/Makefile.in rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/Makefile.in index b6902a1d2a..d18421f27c 100644 --- a/libs/libdnet/test/dnet/Makefile.in +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/Makefile.in @@ -113,7 +113,7 @@ dnet_DEPENDENCIES = $(top_builddir)/src/libdnet.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent -am__v_lt_1 = +am__v_lt_1 = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -121,11 +121,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = am__maybe_remake_depfiles = @@ -138,7 +138,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -146,7 +146,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = +am__v_CCLD_1 = SOURCES = $(dnet_SOURCES) DIST_SOURCES = $(dnet_SOURCES) am__can_run_installinfo = \ @@ -430,7 +430,7 @@ clean-sbinPROGRAMS: echo " rm -f" $$list; \ rm -f $$list -dnet$(EXEEXT): $(dnet_OBJECTS) $(dnet_DEPENDENCIES) $(EXTRA_dnet_DEPENDENCIES) +dnet$(EXEEXT): $(dnet_OBJECTS) $(dnet_DEPENDENCIES) $(EXTRA_dnet_DEPENDENCIES) @rm -f dnet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dnet_OBJECTS) $(dnet_LDADD) $(LIBS) diff --git a/libs/libdnet/test/dnet/addr.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/addr.c similarity index 98% rename from libs/libdnet/test/dnet/addr.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/addr.c index 1c44e34e5c..5544413ec8 100644 --- a/libs/libdnet/test/dnet/addr.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/addr.c @@ -30,16 +30,16 @@ addr_main(int argc, char *argv[]) { struct addr addr; int c, len; - + if (argc == 1 || *(argv[1]) == '-') addr_usage(); - + for (c = 1; c < argc; c++) { if (addr_aton(argv[c], &addr) < 0) addr_usage(); - + len = addr.addr_bits / 8; - + if (write(STDOUT_FILENO, addr.addr_data8, len) != len) err(1, "write"); } diff --git a/libs/libdnet/test/dnet/arp.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/arp.c similarity index 98% rename from libs/libdnet/test/dnet/arp.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/arp.c index 067c120c75..81da167d57 100644 --- a/libs/libdnet/test/dnet/arp.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/arp.c @@ -49,12 +49,12 @@ arp_kern_main(int argc, char *argv[]) if (argc < 2) arp_usage(); - + cmd = argv[1]; if ((arp = arp_open()) == NULL) err(1, "arp_open"); - + if (strcmp(cmd, "show") == 0) { if (arp_loop(arp, print_arp, NULL) < 0) err(1, "arp_loop"); @@ -79,7 +79,7 @@ arp_kern_main(int argc, char *argv[]) printf("%s deleted\n", addr_ntoa(&entry.arp_pa)); } else arp_usage(); - + arp_close(arp); return (0); @@ -97,13 +97,13 @@ arp_main(int argc, char *argv[]) if (argc == 1 || *(argv[1]) == '-') arp_usage(); - + /* XXX - total trash */ if (argc > 1 && (strcmp(argv[1], "show") == 0 || strcmp(argv[1], "get") == 0 || strcmp(argv[1], "add") == 0 || strcmp(argv[1], "delete") == 0)) return (arp_kern_main(argc, argv)); - + srand(time(NULL)); arp = (struct arp_hdr *)buf; @@ -119,7 +119,7 @@ arp_main(int argc, char *argv[]) for (c = 1; c + 1 < argc; c += 2) { name = argv[c]; value = argv[c + 1]; - + if (strcmp(name, "op") == 0) { if (op_aton(value, &arp->ar_op) < 0) arp_usage(); @@ -127,7 +127,7 @@ arp_main(int argc, char *argv[]) if (addr_aton(value, &addr) < 0) arp_usage(); memcpy(ethip->ar_sha, &addr.addr_eth, ETH_ADDR_LEN); - } else if (strcmp(name, "spa") == 0) { + } else if (strcmp(name, "spa") == 0) { if (addr_aton(value, &addr) < 0) arp_usage(); memcpy(ethip->ar_spa, &addr.addr_ip, IP_ADDR_LEN); @@ -150,7 +150,7 @@ arp_main(int argc, char *argv[]) arp_usage(); p = buf + ARP_HDR_LEN + ARP_ETHIP_LEN; - + if (!isatty(STDIN_FILENO)) { len = sizeof(buf) - (p - buf); while ((c = read(STDIN_FILENO, p, len)) > 0) { @@ -159,7 +159,7 @@ arp_main(int argc, char *argv[]) } } len = p - buf; - + if (write(STDOUT_FILENO, buf, len) != len) err(1, "write"); diff --git a/libs/libdnet/test/dnet/aton.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/aton.c similarity index 99% rename from libs/libdnet/test/dnet/aton.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/aton.c index 97e05c4710..e3f5b5b1ac 100644 --- a/libs/libdnet/test/dnet/aton.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/aton.c @@ -62,7 +62,7 @@ proto_aton(char *string, uint8_t *proto) { struct protoent *pp; u_int i; - + if ((pp = getprotobyname(string)) != NULL) *proto = pp->p_proto; else { @@ -98,7 +98,7 @@ port_aton(char *string, uint16_t *port) { struct servent *sp; u_int i; - + /* XXX */ if ((sp = getservbyname(string, "tcp")) != NULL) { *port = sp->s_port; @@ -116,7 +116,7 @@ int seq_aton(char *string, uint32_t *seq) { char *p; - + *seq = strtoul(string, &p, 10); if (*string == '\0' || *p != '\0') return (-1); @@ -132,12 +132,12 @@ flags_aton(char *string, uint8_t *flags) u_int i; *flags = 0; - + if (strncmp(string, "0x", 2) == 0) { if (sscanf(string, "%i", &i) != 1 || i > 0xff) return (-1); *flags = i & 0xff; - + return (0); } for (p = string; *p != '\0'; p++) { @@ -171,21 +171,21 @@ static u_char hex2num(char ch, char cl) { ch = tolower(ch), cl = tolower(cl); - + if (ch >= '0' && ch <= '9') ch -= '0'; else if (ch >= 'a' && ch <= 'f') ch -= 'a' - 10; else return (0); - + if (cl >= '0' && cl <= '9') cl -= '0'; else if (cl >= 'a' && cl <= 'f') cl -= 'a' - 10; else return (0); - + return ((u_char)((ch << 4) | cl)); } diff --git a/libs/libdnet/test/dnet/aton.h b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/aton.h similarity index 100% rename from libs/libdnet/test/dnet/aton.h rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/aton.h diff --git a/libs/libdnet/test/dnet/dnet.8 b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/dnet.8 similarity index 100% rename from libs/libdnet/test/dnet/dnet.8 rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/dnet.8 diff --git a/libs/libdnet/test/dnet/dnet.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/dnet.c similarity index 99% rename from libs/libdnet/test/dnet/dnet.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/dnet.c index 5ebcba3966..5763812564 100644 --- a/libs/libdnet/test/dnet/dnet.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/dnet.c @@ -46,7 +46,7 @@ print_modules(int type, char *string) { struct mod **m; int i; - + fprintf(stderr, "%s commands:\n", string); for (i = 1, m = modules; *m != NULL; m++) { if ((m[0]->type & type) != 0) { diff --git a/libs/libdnet/test/dnet/eth.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/eth.c similarity index 99% rename from libs/libdnet/test/dnet/eth.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/eth.c index 5c2688de31..e1c7ab2080 100644 --- a/libs/libdnet/test/dnet/eth.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/eth.c @@ -63,22 +63,22 @@ eth_main(int argc, char *argv[]) if (argc != 0) eth_usage(); - + if (isatty(STDIN_FILENO)) errx(1, "can't read Ethernet payload from tty"); - + p = buf + ETH_HDR_LEN; len = sizeof(buf) - (p - buf); - + while ((c = read(STDIN_FILENO, p, len)) > 0) { p += c; len -= c; } len = p - buf; - + if (write(STDOUT_FILENO, buf, len) != len) err(1, "write"); - + return (0); } diff --git a/libs/libdnet/test/dnet/fw.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/fw.c similarity index 98% rename from libs/libdnet/test/dnet/fw.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/fw.c index a948c48b04..656956620e 100644 --- a/libs/libdnet/test/dnet/fw.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/fw.c @@ -44,10 +44,10 @@ print_rule(const struct fw_rule *fr, void *arg) snprintf(proto, sizeof(proto), "%s ", pr->p_name); sport[0] = dport[0] = typecode[0] = '\0'; - + switch (fr->fw_proto) { case IP_PROTO_ICMP: - if (fr->fw_sport[1] && fr->fw_dport[1]) + if (fr->fw_sport[1] && fr->fw_dport[1]) snprintf(typecode, sizeof(typecode), " %d/%d", fr->fw_sport[0], fr->fw_dport[0]); else if (fr->fw_sport[1]) @@ -61,7 +61,7 @@ print_rule(const struct fw_rule *fr, void *arg) } else snprintf(sport, sizeof(sport), ":%d-%d", fr->fw_sport[0], fr->fw_sport[1]); - + if (fr->fw_dport[0] == fr->fw_dport[1]) { snprintf(dport, sizeof(dport), ":%d", fr->fw_dport[0]); } else @@ -96,19 +96,19 @@ arg_to_fr(int argc, char *argv[], struct fw_rule *fr) memset(fr, 0, sizeof(*fr)); fr->fw_op = strcmp(argv[0], "allow") ? FW_OP_BLOCK : FW_OP_ALLOW; - + fr->fw_dir = strcmp(argv[1], "in") ? FW_DIR_OUT : FW_DIR_IN; if (strcmp(argv[2], "any") != 0) strncpy(fr->fw_device, argv[2], sizeof(fr->fw_device)-1); - + if ((pr = getprotobyname(argv[3])) != NULL) fr->fw_proto = pr->p_proto; else fr->fw_proto = atoi(argv[3]); p = strtok(argv[4], ":"); - + if (!p || addr_aton(p, &fr->fw_src) < 0) return (-1); @@ -123,7 +123,7 @@ arg_to_fr(int argc, char *argv[], struct fw_rule *fr) fr->fw_sport[1] = TCP_PORT_MAX; } p = strtok(argv[5], ":"); - + if (addr_aton(p, &fr->fw_dst) < 0) return (-1); @@ -136,7 +136,7 @@ arg_to_fr(int argc, char *argv[], struct fw_rule *fr) } else if (fr->fw_proto == IP_PROTO_TCP || fr->fw_proto == IP_PROTO_UDP) { fr->fw_dport[0] = 0; fr->fw_dport[1] = TCP_PORT_MAX; - } + } if (argc > 6) { if (fr->fw_proto != IP_PROTO_ICMP && fr->fw_proto != IP_PROTO_IGMP) { @@ -158,13 +158,13 @@ fw_main(int argc, char *argv[]) { struct fw_rule fr; fw_t *fw; - + if (argc < 2 || *(argv[1]) == '-') usage(); if ((fw = fw_open()) == NULL) err(1, "fw_open"); - + if (argc == 2 && strcmp(argv[1], "show") == 0) { if (fw_loop(fw, print_rule, NULL) < 0) err(1, "fw_loop"); @@ -184,7 +184,7 @@ fw_main(int argc, char *argv[]) err(1, "fw_delete"); } else usage(); - + fw_close(fw); exit(0); diff --git a/libs/libdnet/test/dnet/hex.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/hex.c similarity index 95% rename from libs/libdnet/test/dnet/hex.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/hex.c index 79e0226210..911258a7b1 100644 --- a/libs/libdnet/test/dnet/hex.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/hex.c @@ -31,14 +31,14 @@ hex_main(int argc, char *argv[]) { char buf[IP_LEN_MAX], *p = buf; int c, len; - + if (argc == 1 || *(argv[1]) == '-') hex_usage(); - + for (c = 1; c < argc; c++) { if ((len = fmt_aton(argv[c], (u_char *)argv[c])) < 0) hex_usage(); - + if (write(STDOUT_FILENO, argv[c], len) != len) err(1, "write"); } @@ -51,7 +51,7 @@ hex_main(int argc, char *argv[]) len = p - buf; if (write(STDOUT_FILENO, buf, len) != len) err(1, "write"); - } + } return (0); } diff --git a/libs/libdnet/test/dnet/icmp.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/icmp.c similarity index 99% rename from libs/libdnet/test/dnet/icmp.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/icmp.c index 3207c8383d..834fc44cea 100644 --- a/libs/libdnet/test/dnet/icmp.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/icmp.c @@ -36,11 +36,11 @@ icmp_main(int argc, char *argv[]) int c, len; icmp = (struct icmp_hdr *)buf; - + memset(icmp, 0, sizeof(*icmp)); icmp->icmp_type = ICMP_ECHO; icmp->icmp_code = 0; - + for (c = 1; c + 1 < argc; c += 2) { name = argv[c]; value = argv[c + 1]; @@ -59,7 +59,7 @@ icmp_main(int argc, char *argv[]) icmp_usage(); p = buf + ICMP_HDR_LEN; - + if (!isatty(STDIN_FILENO)) { len = sizeof(buf) - (p - buf); while ((c = read(STDIN_FILENO, p, len)) > 0) { @@ -68,7 +68,7 @@ icmp_main(int argc, char *argv[]) } } len = p - buf; - + if (write(STDOUT_FILENO, buf, len) != len) err(1, "write"); diff --git a/libs/libdnet/test/dnet/intf.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/intf.c similarity index 99% rename from libs/libdnet/test/dnet/intf.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/intf.c index 3c9f6a7849..88a1c4514f 100644 --- a/libs/libdnet/test/dnet/intf.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/intf.c @@ -41,7 +41,7 @@ flags2string(u_short flags) static char buf[256]; buf[0] = '\0'; - + if (flags & INTF_FLAG_UP) strlcat(buf, ",UP", sizeof(buf)); if (flags & INTF_FLAG_LOOPBACK) @@ -54,7 +54,7 @@ flags2string(u_short flags) strlcat(buf, ",BROADCAST", sizeof(buf)); if (flags & INTF_FLAG_MULTICAST) strlcat(buf, ",MULTICAST", sizeof(buf)); - + if (buf[0] != '\0') return (buf + 1); @@ -65,17 +65,17 @@ static int print_intf(const struct intf_entry *entry, void *arg) { int i; - + printf("%s:", entry->intf_name); - + printf(" flags=0x%x<%s>", entry->intf_flags, flags2string(entry->intf_flags)); - + if (entry->intf_mtu != 0) printf(" mtu %d", entry->intf_mtu); printf("\n"); - + if (entry->intf_addr.addr_type == ADDR_TYPE_IP) { if (entry->intf_dst_addr.addr_type == ADDR_TYPE_IP) { printf("\tinet %s --> %s\n", @@ -89,7 +89,7 @@ print_intf(const struct intf_entry *entry, void *arg) for (i = 0; i < entry->intf_alias_num; i++) printf("\talias %s\n", addr_ntoa(&entry->intf_alias_addrs[i])); - + return (0); } @@ -99,12 +99,12 @@ intf_main(int argc, char *argv[]) struct intf_entry *entry; struct addr *ap, addr; char *cmd, buf[1024]; - + if (argc < 2) usage(); cmd = argv[1]; - + entry = (struct intf_entry *)buf; memset(entry, 0, sizeof(*entry)); entry->intf_len = sizeof(buf); @@ -137,7 +137,7 @@ intf_main(int argc, char *argv[]) } else if (strcmp(cmd, "set") == 0) { if (argc < 4) usage(); - + strlcpy(entry->intf_name, argv[2], sizeof(entry->intf_name)); for (argv += 3, argc -= 3; argc > 1; argv += 2, argc -= 2) { @@ -152,7 +152,7 @@ intf_main(int argc, char *argv[]) ap = &entry->intf_link_addr; } else break; - + if (addr_pton(argv[1], ap) < 0) err(1, "invalid address: %s", argv[1]); } @@ -172,7 +172,7 @@ intf_main(int argc, char *argv[]) err(1, "intf_set"); } else usage(); - + intf_close(intf); exit(0); diff --git a/libs/libdnet/test/dnet/ip.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/ip.c similarity index 99% rename from libs/libdnet/test/dnet/ip.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/ip.c index 3c60d7f5c5..d8e027ea06 100644 --- a/libs/libdnet/test/dnet/ip.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/ip.c @@ -37,7 +37,7 @@ ip_main(int argc, char *argv[]) u_char *p, buf[IP_LEN_MAX]; /* XXX */ char *name, *value; int c, len; - + srand(time(NULL)); ip = (struct ip_hdr *)buf; @@ -55,7 +55,7 @@ ip_main(int argc, char *argv[]) for (c = 1; c + 1 < argc; c += 2) { name = argv[c]; value = argv[c + 1]; - + if (strcmp(name, "tos") == 0) ip->ip_tos = atoi(value); else if (strcmp(name, "id") == 0) @@ -81,26 +81,26 @@ ip_main(int argc, char *argv[]) } argc -= c; argv += c; - + if (argc != 0) ip_usage(); - + if (isatty(STDIN_FILENO)) errx(1, "can't read IP payload from tty"); - + p = buf + IP_HDR_LEN; len = sizeof(buf) - (p - buf); - + while ((c = read(STDIN_FILENO, p, len)) > 0) { p += c; len -= c; } len = p - buf; - + ip->ip_len = htons(len); - + ip_checksum(buf, len); - + if (write(STDOUT_FILENO, buf, len) != len) err(1, "write"); diff --git a/libs/libdnet/test/dnet/mod.h b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/mod.h similarity index 100% rename from libs/libdnet/test/dnet/mod.h rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/mod.h diff --git a/libs/libdnet/test/dnet/rand.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/rand.c similarity index 99% rename from libs/libdnet/test/dnet/rand.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/rand.c index 51820e4204..87b8cb9c09 100644 --- a/libs/libdnet/test/dnet/rand.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/rand.c @@ -31,10 +31,10 @@ rand_main(int argc, char *argv[]) rand_t *r; int len; u_char *p; - + if (argc != 2 || *(argv[1]) == '-') rand_usage(); - + if ((len = atoi(argv[1])) == 0) rand_usage(); @@ -46,10 +46,10 @@ rand_main(int argc, char *argv[]) if (rand_get(r, p, len) < 0) err(1, "rand_get"); - + if (write(STDOUT_FILENO, p, len) != len) err(1, "write"); - + return (0); } diff --git a/libs/libdnet/test/dnet/route.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/route.c similarity index 99% rename from libs/libdnet/test/dnet/route.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/route.c index 36d1b91f54..5196545f45 100644 --- a/libs/libdnet/test/dnet/route.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/route.c @@ -49,7 +49,7 @@ route_main(int argc, char *argv[]) usage(); cmd = argv[1]; - + if ((r = route_open()) == NULL) err(1, "route_open"); @@ -87,9 +87,9 @@ route_main(int argc, char *argv[]) "net" : "host", addr_ntoa(&entry.route_dst)); } else usage(); - + route_close(r); - + exit(0); } diff --git a/libs/libdnet/test/dnet/send.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/send.c similarity index 99% rename from libs/libdnet/test/dnet/send.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/send.c index 78cbbc0813..7db764f064 100644 --- a/libs/libdnet/test/dnet/send.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/send.c @@ -38,19 +38,19 @@ send_main(int argc, char *argv[]) if (argc == 2 && *(argv[1]) == '-') send_usage(); - + if (isatty(STDIN_FILENO)) errx(1, "can't read packet to send from tty"); p = buf; len = sizeof(buf) - (p - buf); - + while ((c = read(STDIN_FILENO, p, len)) > 0) { p += c; len -= c; } len = p - buf; - + if (argc == 1) { if ((ip = ip_open()) == NULL) err(1, "ip_open"); @@ -65,7 +65,7 @@ send_main(int argc, char *argv[]) eth_close(eth); } else send_usage(); - + exit(0); } diff --git a/libs/libdnet/test/dnet/tcp.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/tcp.c similarity index 99% rename from libs/libdnet/test/dnet/tcp.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/tcp.c index a724a9e823..db5f76e135 100644 --- a/libs/libdnet/test/dnet/tcp.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/tcp.c @@ -36,11 +36,11 @@ tcp_main(int argc, char *argv[]) u_char *p, buf[IP_LEN_MAX]; /* XXX */ char *name, *value; int c, len; - + srand(time(NULL)); - + tcp = (struct tcp_hdr *)buf; - + memset(tcp, 0, sizeof(*tcp)); tcp->th_sport = rand() & 0xffff; tcp->th_dport = rand() & 0xffff; @@ -54,7 +54,7 @@ tcp_main(int argc, char *argv[]) for (c = 1; c + 1 < argc; c += 2) { name = argv[c]; value = argv[c + 1]; - + if (strcmp(name, "sport") == 0) { if (port_aton(value, &tcp->th_sport) < 0) tcp_usage(); @@ -81,12 +81,12 @@ tcp_main(int argc, char *argv[]) } argc -= c; argv += c; - + if (argc != 0) tcp_usage(); p = buf + TCP_HDR_LEN; - + if (!isatty(STDIN_FILENO)) { len = sizeof(buf) - (p - buf); while ((c = read(STDIN_FILENO, p, len)) > 0) { @@ -95,7 +95,7 @@ tcp_main(int argc, char *argv[]) } } len = p - buf; - + if (write(STDOUT_FILENO, buf, len) != len) err(1, "write"); diff --git a/libs/libdnet/test/dnet/udp.c b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/udp.c similarity index 99% rename from libs/libdnet/test/dnet/udp.c rename to libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/udp.c index ab2fdea233..92f7bb3ed2 100644 --- a/libs/libdnet/test/dnet/udp.c +++ b/libs/libdnet/libdnet-libdnet-1.18.0/test/dnet/udp.c @@ -37,13 +37,13 @@ udp_main(int argc, char *argv[]) int c, len; srand(time(NULL)); - + udp = (struct udp_hdr *)buf; - + memset(udp, 0, sizeof(*udp)); udp->uh_sport = rand() & 0xffff; udp->uh_dport = rand() & 0xffff; - + for (c = 1; c + 1 < argc; c += 2) { name = argv[c]; value = argv[c + 1]; @@ -64,7 +64,7 @@ udp_main(int argc, char *argv[]) udp_usage(); p = buf + UDP_HDR_LEN; - + if (!isatty(STDIN_FILENO)) { len = sizeof(buf) - (p - buf); while ((c = read(STDIN_FILENO, p, len)) > 0) { @@ -74,7 +74,7 @@ udp_main(int argc, char *argv[]) } len = p - buf; udp->uh_ulen = htons(len); - + if (write(STDOUT_FILENO, buf, len) != len) err(1, "write"); diff --git a/libs/mipmap/CMakeLists.txt b/libs/mipmap/CMakeLists.txt index cb1a185dee..4aa31cb03b 100644 --- a/libs/mipmap/CMakeLists.txt +++ b/libs/mipmap/CMakeLists.txt @@ -37,8 +37,8 @@ if( NOT QT_ANDROID) if (NOT MSVC) set_property(TARGET MIPMAP PROPERTY COMPILE_FLAGS "-fvisibility=hidden -O3") if (NOT APPLE) - set_source_files_properties( - src/mipmap.c PROPERTIES COMPILE_FLAGS "-march=native") + # set_source_files_properties( + # src/mipmap.c PROPERTIES COMPILE_FLAGS "-march=native") endif() if (HAVE_MSSE) message(STATUS "mipmap SSE support enabled") diff --git a/libs/mipmap/cmake/CompilerSupport.cmake b/libs/mipmap/cmake/CompilerSupport.cmake index e02d8dec78..8a32876090 100644 --- a/libs/mipmap/cmake/CompilerSupport.cmake +++ b/libs/mipmap/cmake/CompilerSupport.cmake @@ -12,7 +12,7 @@ if(HAVE_ARM_NEON) endif() #set(CMAKE_REQUIRED_INCLUDES /usr/lib/gcc/x86_64-redhat-linux/13/include/) -set(CMAKE_REQUIRED_FLAGS "-march=native") +#set(CMAKE_REQUIRED_FLAGS "-march=native") include(CheckCSourceCompiles) check_c_source_compiles( diff --git a/libs/sound/CMakeLists.txt b/libs/sound/CMakeLists.txt index 881824d059..fa413f0e35 100644 --- a/libs/sound/CMakeLists.txt +++ b/libs/sound/CMakeLists.txt @@ -1,3 +1,13 @@ +# Sound library +# +# Parameters: +# SOUND_WX_LIBS - wxWidgets libraries +# SOUND_WX_INCLUDE_DIR - wxWidgets headers location +# Numerous configuration variables, see cmake/SoundConfig.cmake +# +# Exports +# ocpn::sound transitive link target +# cmake_minimum_required(VERSION 3.5.0) # Debug junk @@ -9,6 +19,19 @@ endif () set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) + +set(SOUND_WX_INCLUDE_DIR "" + CACHE STRING "wxWidgets header location (mandatory)" +) +set(SOUND_WX_LIBS "" CACHE STRING "wxWidgets libraries (mandatory)") + +if ("${SOUND_WX_LIBS}" STREQUAL "") + message(FATAL_ERROR "Sound parameter SOUND_WX_LIBS is undefined") +endif () +if ("${SOUND_WX_INCLUDE_DIR}" STREQUAL "") + message(FATAL_ERROR "Sound parameter SOUND_WX_LINCLUDE_DIR is undefined") +endif () + set(PORTAUDIO_MSG "Use portaudio(3) to play sounds if available") if (WIN32 OR APPLE OR QT_ANDROID) option(OCPN_ENABLE_PORTAUDIO ${PORTAUDIO_MSG} OFF) @@ -75,9 +98,9 @@ target_include_directories(SOUND ${CMAKE_CURRENT_SOURCE_DIR}/include PRIVATE ${CMAKE_BINARY_DIR}/include - ${wxWidgets_INCLUDE_DIRS} + ${SOUND_WX_INCLUDE_DIRS} ) -target_link_libraries(SOUND PRIVATE ${wxWidgets_LIBRARIES}) +target_link_libraries(SOUND PRIVATE ${SOUND_WX_LIBS}) if (QT_ANDROID) target_link_libraries(SOUND PRIVATE ocpn::java-jvm) diff --git a/libs/sqlite/CMakeLists.txt b/libs/sqlite/CMakeLists.txt index 80e4a86bcb..81e3347a8d 100644 --- a/libs/sqlite/CMakeLists.txt +++ b/libs/sqlite/CMakeLists.txt @@ -22,6 +22,8 @@ if (NOT SQLITE_FOUND OR APPLE OR WIN32 OR QT_ANDROID) _SQLITE INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include ) + add_definitions(" -DSQLITE_THREADSAFE=1") + # We do not need extensions, and using them in a static library causes # trouble with libdl linking order. if (UNIX AND NOT APPLE) diff --git a/manual/Doxyfile b/manual/Doxyfile index 6ddbda4bb1..05ce89e1ff 100644 --- a/manual/Doxyfile +++ b/manual/Doxyfile @@ -1424,7 +1424,7 @@ HTML_COLORSTYLE_GAMMA = 80 # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_TIMESTAMP = NO +HTML_TIMESTAMP = YES # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML # documentation will contain a main index with vertical navigation menus that diff --git a/manual/modules/ROOT/pages/code-formatting.adoc b/manual/modules/ROOT/pages/code-formatting.adoc index be667fef54..1949529bf2 100644 --- a/manual/modules/ROOT/pages/code-formatting.adoc +++ b/manual/modules/ROOT/pages/code-formatting.adoc @@ -2,24 +2,27 @@ == C/C++ -After resolving https://github.com/OpenCPN/OpenCPN/issues/1118[Bug 1118] -and https://github.com/OpenCPN/OpenCPN/issues/2357[Bug 2357] the sources -have a uniform coding formatting based on the +The sources have a uniform coding formatting based on the https://google.github.io/styleguide/cppguide.html#Formatting[Google Style]. -The style is also defined in the _.clang-format_ file which when used +The style is defined in the _.clang-format_ file which when used by https://clang.llvm.org/docs/ClangFormat.html[clang-format] produces a -correctly formatted source file. +correctly formatted source file. -Some short notes: +Since the 5.10 release all source file modifications must be processed by +clang-format to be accepted. The recommended way to do this is using a git +pre-commit hook which applies formatting when committing changes - - Indentation: two spaces per level, no hard tabs. - - The two-spaces indentation also applies to headers despite standard - Google style here is one space. - - 80 characters max line length. - - Unix-style lf line endings are used in the git repository. - - No trailing space or hard tabs in sources. - - Sources should use 7-bit ascii. Use for example "\x00b0" rather than "°" +To do this, just install the pre-commit program from https://pre-commit.com/: + + $ pip install pre-commit + +and then, in the project top directory + + $ pre-commit install + +which will pick up the configuration from _.pre-commit-config.yaml_ which is +part of the project. == CMake @@ -45,21 +48,10 @@ https://github.com/cheshirekow/cmake_format[]. To format a single file use cmake-format -i -== Using the git pre-commit hook - -The standard git pre-commit hook avoids committing trailing whitespace, bogus -line-endings etc. It needs to be activated by - - cp .git/hooks/pre-commit.sample .git/hooks/pre-commit - -Windows users uses `copy` instead of `cp`. Using the hook is strongly -recommended. - == Editor and IDE configuration -There is an https://github.com/OpenCPN/OpenCPN/issues/1416[open bug] for -creating an _.editorconfig_ file. This file could be used by most -editors to define basic settings. +There is a _.editorconfig_ file in the top directory. +This file could be used by most editors to define basic settings. There are no standard configurations available for IDEs like Visual Studio Code, Eclipse or CLion. diff --git a/manual/modules/ROOT/pages/create-deb-package.adoc b/manual/modules/ROOT/pages/create-deb-package.adoc index 51928a700b..af7c9c188f 100644 --- a/manual/modules/ROOT/pages/create-deb-package.adoc +++ b/manual/modules/ROOT/pages/create-deb-package.adoc @@ -8,22 +8,48 @@ You have been warned! This page describes how to create .deb packages usable on Debian based distros like vanilla Debian, Ubuntu, Raspbian, Mint, etc. -Work is done on a Debian or Ubuntu host. The big picture - -1. Install necessary tools. -2. Make a fresh OpenCPN clone. -3. Update at least debian/changelog to create a new version -4. Import the current master branch into upstream/latest -5. Install build dependencies -6. Create testable packages -7. (Optional) Upload packages to an Ubuntu PPA. - - -== Install tools +Work is done on a Debian or Ubuntu host. +Uploading an ubuntu package must be done from an Ubuntu host. + +Here are five main tasks: + + - <>. + - <>. + - <> + - <> + - <> + +Here, the term "downstream release" refers to a release based on the +same opencpn release but where the packaging has been modified. + +There is also some support tasks, see the right panel. + +[#setup] +== Setting up the environment + +1. Creating releases requires a working gpg secret key including the + password is available. + Verify using something like + `gpg --export-secret-keys E2EA41DCE2F8A99AD17A1E463A67D5D966D15C5C`. + This key must be registered on the PPA about the be used. +2. Create a file _~/.devscripts_ with contents like: + + DEBSIGN_KEYID=E2EA41DCE2F8A99AD17A1E463A67D5D966D15C5C + DEBEMAIL="leamas.alec@gmail.com" + DEBFULLNAME="Alec Leamas" ++ +Of course, all values here are personal. +DEBSIGN_KEYID is the secret key verified above. +This key is only required when uploading source packages to an ubuntu +PPA. +[#install-tools] +3. Install development tools $ sudo apt install devscripts git-buildpackage equivs +[#create-clone] == Make a fresh OpenCPN clone. The Debian tools creates things in the parent directory. To handle this, @@ -42,31 +68,41 @@ get all necessary three branches: `ubuntu/numbat` is the branch to use when building Ubuntu Numbat (24.04) packages. -Other alternatives are `ubuntu/jammy`, `ubuntu/focal` and `debian/master`. +Alternatives includes `ubuntu/jammy`, `ubuntu/focal` and `debian/master`. The latter builds packages for the rolling Sid distribution. +To update an existing clone: -== Update debian/changelog with a new version + $ git fetch upstream upstream/latest:upstream/latest + $ git fetch upstream pristine-tar:pristine-tar + $ git checkout ubuntu/numbat + $ git pull upstream ubuntu/numbat -_debian/changelog_ is picky about the format. Editing by hand is hard. Instead, -use the `dch` tool. It has a multitude of options. The simplest is to create -a new, minor release using `dch -i`. -dch throws you in an editor loaded with debian/changelog. Complete the entry -as you consider best (there are many conventions here, but for a local build -it's not that important). +[#import-version] +== Import a new opencpn version into packaging branches. + +=== Initiate the changelog with a new version +_debian/changelog_ is picky about the format. Editing by hand is hard. Instead, +use the `dch` tool. It has a multitude of options.In preparation of importing a +new version, first update *debian/changelog* with a new version, something like +`dch -v 1:5.9.3-beta3+dfsg` -== Import the current master branch into upstream/latest +`dch` throws you in an editor loaded with _debian/changelog_. +Complete the entry as you consider best. +The standard message for a new version is "New upstream Release". + +=== Import a release tag into upstream/latest For now, the debian directory needs to be removed. After that, create a -tarball based on HEAD: +tarball based on HEAD. Using v5.9.3-beta3 as example: - $ git checkout master + $ git checkout git checkout v5.9.3-beta3 $ git switch -c tmp-build $ git rm -r debian $ git commit -m "Remove unused debian/ dir" - $ git archive --prefix opencpn-1.2.3/ --output ../opencpn.tar.gz HEAD + $ git archive --prefix opencpn-5.9.3-beta3/ --output ../opencpn.tar.gz HEAD The `--prefix` part should be modified to reflect current version, but is not critical. Note the trailing slash! @@ -81,40 +117,172 @@ Where _../opencpn.tar.gz_ is the file created by `git archive` above. This creates something like _../opencpn_.5.10.920.orig.tar.gz_. The version in the filename is taken from debian/changelog. -`ubuntu/numbat` is just an example, see Make a fresh clone above. +`ubuntu/numbat` is just an example, +see Make a fresh clone <>. + +Nest step is to import this tarball into upstream/latest. Using the +tarball created by git-archive above do: + + $ gbp import-orig ../opencpn_5.9.3~beta3+dfsg.orig.tar.xz + +=== Push upstream changes + +Final step is to push these changes: + + $ gbp push + + +[#src-release] +== Create a downstream release + +Assuming the new upstream (opencpn) release is available as of <> creating a downstream release goes like: + +1. Initiate the environment as described <>. +2. Clone and checkout all branches, see <>. +3. Create a orig.tar.xz tarball in .. + + $ gbp export-orig + +This is a one time setup, the results can be used in various branches like +ubuntu/jammy and debian/bookworm. + +For each release do: -The final step is to import this tarball into upstream/latest. Using the -above do: +1. Checkout the actual branch like ubuntu/jammy. + Work on ubuntu branches must be done on an ubuntu host +2. Create a provisional version entry in _debian/changelog_ using `dch -R`. +3. Merge upstream changes using `gbp import-ref -u5.9.3-beta3`. The -u argument is + the last part of an upstream tag like `upstream/5.9.3-beta3` + This command fails in some branch(es), see below. +4. Do possible changes in the new release. + Note that only files in the _debian/_ directory can be modified; + changes in other files are handled using patches in _debian/patches_. + See Modifying Sources <> +5. Commit all changes. +6. Finalize the changelog entry using `dch -r`. +7. Commit the change in _debian/changelog_ +8. Push the actual branch, for example `git push upstream ubuntu/jammy` - $ gbp import-orig ../opencpn_.5.10.920.orig.tar.gz +If `gbp import-ref` fails, use the tarball created by `gbp export-orig` +instead. For this to work, the corresponding tag should be deleted. +Something like -== Install build dependencies + $ git tag -d upstream/5.8.4+dfsg + $ gbp import-orig ../opencpn_5.8.4~beta4+dfsg.orig.tar.xz + +[#publish] +== Publish existing downstream release to PPA + +1. Initiate the environment as described <>. +2. Clone and checkout all branches, or update existing clone. + See <>. +3. Make sure the repo is synchronized: `git clean -fxd; git checkout .` +4. Create the upstream source tarball: `gbp export-orig` +5. Create the source package: `debuild --no-lintian -S` +6. List all available source packages using `ls -lt ../*source.changes`. +7. Push the most recent package to a PPA using something like: ++ +``` + $ dput ppa:leamas-alec/opencpn \ + ../opencpn_5.9.4~beta4+dfsg-1ubuntu1~bpo24.04+1_source.changes +``` +Or, a more generic oneliner pushing the most recent _source.changes_ file: ++ +``` + $ dput ppa:leamas-alec/opencpn $(ls -t ../*source.changes | head -1) +``` + +[#test-build] +== Local test build from existing upstream tag. + +First step is to setup the environment, see <>. +However, no gpg key is required. + +Then, create a fresh clone as described <>. + +Install build dependencies: $ mk-build-deps $ sudo dpkg -i *deb # Expect error messages, ignore them $ sudo apt install -f $ git clean -fxd -== Build packages - -The step above creates a tag named like `upstream/5.10.920` or so. Use -`git tag -l | grep upstream/` to find out the tag name. Then do +List available upstream tags using `git tag -l | grep upstream/`. +Normally use the most recent one like: $ git clean -fxd; git checkout . - $ gbp buildpackage --git-upstream-tag=upstream/whatever + $ gbp buildpackage --git-upstream-tag=upstream/whatever -us -uc This builds testable .deb packages in _.._. +[#master-build] +== Local test build from master +First step is to setup the environment, see <>. +However, no gpg key is required. + +Make sure the build dependencies are in place, see <> + +Work is done in a clean clone of the master branch. +Make sure the remote "upstream" exists and update it: + + $ git config remote.upstream.url > /dev/null || \ + git remote add upstream https://github.com/OpenCPN/OpenCPN.git + $ git remote update upstream + +Checkout the debian/ directory from the packaging branch. At the time of +writing, this is only possible for Bookworm: + + $ git fetch upstream ci/bookworm-backports:ci/bookworm-backports + $ git checkout ci/bookworm-backports debian + $ git commit -m "Add debian/ packaging directory from ci/bookworm-backports" + +Create a debian changelog entry. This is an example of building a post 5.10 package +for the bookworm release, YMMV: + + $ version="1:5.11.0~$(date "+%Y%m%d%H%m").$(git rev-parse --short HEAD)-1" + $ dch --distribution bookworm -v "$version" "Test build from master" + $ git add debian/changelog + $ git commit -m "d/changelog: $version" + +Create orig tarball. +The name of the orig tarball created by `mk-origtargz` reflects the changelog +version. + + $ git archive --prefix opencpn-5.11.0/ --output ../opencpn.tar.gz HEAD + $ mk-origtargz ../opencpn.tar.gz + +Extract the orig tarball and work in the sources it provides: + + $ cd .. + $ tar xf opencpn-5.11.0*orig*xz + $ cd opencpn-5.11.0* + +And build package. -j4 builds in four parallel pipes, depending on processor +you might want to use another value (I typically use -j12). + + $ debuild -us -uc -j4 + +[#edit-src] +== Modifying sources in a downstream release. -== Upload to PPA +One cannot change the opencpn sources when creating a release. +However, it is possible to add or modify a patch in _debian/patches_. +These patches are applied when building the opencpn package. -The artifact uploaded to an Ubuntu ppa is a _.source.changes_ file. This -is created using +The basic workflow starts in a fresh, clean clone and goes like - $ debuild -S + $ gbp pq import --force + # All the patches in debian/patches are applied. + # Edit sources as desired and do: + $ git commit -am "Reason for this change" + $ gbp pq export + $ git add debian/patches/* + $ git commit -m "d/patches: new patch: patch description" -This requires that gpg signing keys is configured which is outside the scope -of this document. The command creates something like -_../opencpn.1.2.3.source.changes_. Upload to a PPA using something like +After `gbp pq import` actually all sorts of changes can be done. +As usual, several small changes can and should be committed one +by one rather than as a big patch. - $ dput ppa:leamas-alec/opencpn ../opencpn.1.2.3.source.changes +It is also possible to edit existing patches using the standard +git tools, in particular `git rebase -i` diff --git a/manual/modules/ROOT/pages/troubleshooting.adoc b/manual/modules/ROOT/pages/troubleshooting.adoc index 3d0bbe3017..53a3598a83 100644 --- a/manual/modules/ROOT/pages/troubleshooting.adoc +++ b/manual/modules/ROOT/pages/troubleshooting.adoc @@ -3,20 +3,41 @@ For trouble shooting and lower level nitty gritty details, the command line, configuration files and debuggers are your friends. -== OpenCPN has a minimal command line interface (CLI) - Usage: opencpn [-h] [-p] [-fullscreen] [-no_opengl] [-rebuild_gl_raster_cache] [-parse_all_enc] [-l ] [-unit_test_1 ] [-unit_test_2] [--unit_test_2] [-safe_mode] [import GPX files...] - -h, --help Show usage syntax. - -p Run in portable mode. - -fullscreen Switch to full screen mode on start. - -no_opengl Disable OpenGL video acceleration. This setting will be remembered. - -rebuild_gl_raster_cache Rebuild OpenGL raster cache on start. - -parse_all_enc Convert all S-57 charts to OpenCPN's internal format on start. - -l, --loglevel= Amount of logging: error, warning, message, info, debug or trace - -unit_test_1: Display a slideshow of charts and then exit. Zero or negative specifies no limit. - -unit_test_2 - --unit_test_2 - -safe_mode - +== OpenCPN command line interface (CLI) +---- + $ ./opencpn --help + Usage: + opencpn -h | --help + opencpn [-p] [-f] [-G] [-g] [-P] [-l ] [-u ] [-U] [-s] [GPX file ...] + opencpn --remote [-R] | -q] | -e] |-o ] + + Options for starting opencpn + + -c, --configdir= Use alternative configuration directory. + -p, --portable Run in portable mode. + -f, --fullscreen Switch to full screen mode on start. + -G, --no_opengl Disable OpenGL video acceleration. This setting will + be remembered. + -g, --rebuild_gl_raster_cache Rebuild OpenGL raster cache on start. + -D, --rebuild_chart_db Rescan chart directories and rebuild the chart database + -P, --parse_all_enc Convert all S-57 charts to OpenCPN's internal format on start. + -l, --loglevel= Amount of logging: error, warning, message, info, debug or trace + -u, --unit_test_1= Display a slideshow of charts and then exit. + Zero or negative specifies no limit. + -U, --unit_test_2 + -s, --safe_mode Run without plugins, opengl and other "dangerous" stuff + -W, --config_wizard Start with initial configuration wizard + + Options manipulating already started opencpn + -r, --remote Execute commands on already running instance + -R, --raise Make running OpenCPN visible if hidden + -q, --quit Terminate already running opencpn + -e, --get_rest_endpoint Print rest server endpoint and exit. + -o, --open= Open file in running opencpn + + Arguments: + GPX file GPX-formatted file with waypoints or routes. +---- === -l, --loglevel= Set the amount of logged information. The source code contains @@ -25,15 +46,16 @@ to `info`, the default, only prints wxLogInfo() messages in the log. Setting it to `debug` makes the wxLogDebug() messages appear, and likewise for `trace` and wxLogTrace() -=== -unit_test_1 +=== -u, --unit_test_1 -This command test cycles through all possible charts in the currently -loaded chart database, adjusting the viewport to show the loaded chart -automatically. The value of this test is clear: it provide an unattended -stress test of OpenCPN, It is most fun to watch in quilt mode… +Test cycles through all possible charts in the currently loaded chart database, +adjusting the viewport to show the loaded chart automatically. +The value of this test is clear: it provides an unattended stress test +of OpenCPN. +It is most fun to watch in quilt mode. The test runs until all charts in the database have been visited once. -Lets think of this as a Beta test tool. +Let's think of this as a Beta test tool. A side-effect of this switch is that it can be used to process a set of ENC charts into SENC files. The first, time consuming processing of ENC @@ -44,20 +66,12 @@ charts, can this way be done unattended. The portable option is explained in. https://opencpn.org/wiki/dokuwiki/doku.php?id=opencpn:opencpn_user_manual:advanced_features:portable_opencpn_v2/ Basically, it allows OpenCPN to run just using local data directories for -example on a USB stick. +example on a USB stick or in an IDE. === -no_opengl A total switch-off of OpenGL, in a more thorough way than in "Options". -=== -fullscreen - -Starts OpenCPN in FullScreen mode - -=== -safe_mode - -Start OpenCPN without OpenGL and without loading any plugins. - == Debugging Output Settings for Logfile The _config or ini_ file contains a lot of settings that are saved @@ -94,8 +108,8 @@ requirement for the port to be a TTY is relaxed. == wxWidgets -OpenCPN uses wxWidgets, currently version 3.0.2 on Linux packages, -and 3.1.2 for other platforms. See +OpenCPN uses wxWidgets, currently version 3.2.x on Linux packages, +and 3.2.5 for other platforms. See https://www.wxwidgets.org/docs/[wxWidgets Reference Manuals] wxWidgets uses a tick-tock release schedule where even-numbered versions @@ -103,16 +117,17 @@ are stable including a stable ABI. Odd-numbered version are unstable, development versions. On Linux platforms OpenCPN normally uses the current stable version, -at the time of writing 3.0. This is partly a practical issue since +at the time of writing 3.2. This is partly a practical issue since conservative distributions like Debian don't package unstable, odd versions. -One other platforms unstable, odd versions are occasionally used. At -the time of writing pre-built 3.1.2 binaries for MacOS and Windows are -distributed and used by OpenCPN builds. +One other platforms unstable, odd versions are occasionally used. Changing wxWidgets version leads to a ABI break for plugins, which -must be re-compiled against the new version. +must be re-compiled against the new version. However, wxWidgets has +strong ABI compatiblity promise for minor updates, so for example +updating from 3.2.3 to 3.2.4 should not affect plugins as long as +nothing which only exists in 3.2.4 is used. This PDF diff --git a/manual/package-lock.json b/manual/package-lock.json index 1a72af2367..3b29974e7d 100644 --- a/manual/package-lock.json +++ b/manual/package-lock.json @@ -389,11 +389,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -806,9 +806,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -5020,11 +5020,11 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "buffer": { @@ -5329,9 +5329,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "requires": { "to-regex-range": "^5.0.1" } diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt index 2b0d10f336..0a86cea8df 100644 --- a/model/CMakeLists.txt +++ b/model/CMakeLists.txt @@ -18,7 +18,10 @@ #************************************************************************* set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) -message(STATUS "CMAKE_MODULE_PATH : ${CMAKE_MODULE_PATH}") + +if (UNIX AND NOT APPLE AND NOT QT_ANDROID) + set(LINUX "1") +endif () set(MODEL_HDR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/model) set( @@ -81,6 +84,7 @@ set( ${MODEL_HDR_DIR}/logger.h ${MODEL_HDR_DIR}/MarkIcon.h ${MODEL_HDR_DIR}/mDNS_query.h + ${MODEL_HDR_DIR}/mdns_cache.h ${MODEL_HDR_DIR}/mDNS_service.h ${MODEL_HDR_DIR}/meteo_points.h ${MODEL_HDR_DIR}/multiplexer.h @@ -168,6 +172,7 @@ set(SRC ${MODEL_SRC_DIR}/local_api.cpp ${MODEL_SRC_DIR}/logger.cpp ${MODEL_SRC_DIR}/mDNS_query.cpp + ${MODEL_SRC_DIR}/mdns_cache.cpp ${MODEL_SRC_DIR}/mDNS_service.cpp ${MODEL_SRC_DIR}/multiplexer.cpp ${MODEL_SRC_DIR}/nav_object_database.cpp @@ -257,6 +262,114 @@ target_include_directories( ${CMAKE_BINARY_DIR}/include ) +if (LINUX) + find_package(LIBUDEV) + if (LIBUDEV_FOUND) + target_link_libraries(_OCPN_MODEL INTERFACE ocpn::libudev) + set(HAVE_LIBUDEV 1) + endif () +endif () + +if (OCPN_USE_CURL) + + if (NOT CMAKE_HOST_WIN32) + set(OCPN_USE_EXTERN_CURL ON) + endif () + + if (NOT QT_ANDROID) + if (OCPN_USE_EXTERN_CURL) + find_package(CURL REQUIRED) + message(STATUS "ocpn: using external curl libraries...") + message(STATUS " curl includes: " ${CURL_INCLUDE_DIRS}) + message(STATUS " curl libraries: " ${CURL_LIBRARIES}) + + target_include_directories(_OCPN_MODEL INTERFACE ${CURL_INCLUDE_DIRS}) + else () + include("Curl") + message(STATUS "Using bundled curl library...") + endif () + + pkg_search_module(SYS_WXCURL libwxcurl wxcurl) + use_bundled_lib(USE_BUNDLED_WXCURL wxcurl) + if (SYS_WXCURL_FOUND AND NOT USE_BUNDLED_WXCURL) + message(STATUS "Building with system wxcurl") + target_include_directories( + _OCPN_MODEL INTERFACE ${CURL_INCLUDE_DIRS} ${SYS_WXCURL_INCLUDE_DIR} + ) + target_link_libraries(_OCPN_MODEL INTERFACE ${SYS_WXCURL_LIBRARIES}) + else () + message(STATUS "Building with bundled wxcurl") + include("Curl") + add_subdirectory("${CMAKE_SOURCE_DIR}/libs/wxcurl" ${CMAKE_BINARY_DIR}/curl2) + target_link_libraries(_OCPN_MODEL INTERFACE ocpn::wxcurl) + endif () + + target_link_libraries(_OCPN_MODEL INTERFACE ${CURL_LIBRARIES}) + + if (WIN32 AND OCPN_USE_EXTERN_CURL) + find_library( + CURL_LIBRARY_DLL + NAMES curl curllib libcurl_imp curllib_static libcurl + PATH_SUFFIXES dll + ) + install(FILES ${CURL_LIBRARY_DLL} DESTINATION ".") + endif () + else () + target_include_directories( + _OCPN_MODEL + INTERFACE ${CMAKE_SOURCE_DIR}/buildandroid/libcurl/${ARCH}/include + ) + target_link_libraries( + _OCPN_MODEL + INTERFACE + ${CMAKE_SOURCE_DIR}/buildandroid/libcurl/${ARCH}/lib/libcurl.a + ) + endif () +endif () + +if (NOT WIN32) + if(APPLE AND OCPN_USE_DEPS_BUNDLE) + set(OPENSSL_ROOT_DIR ${OCPN_DEPS_BUNDLE_PATH}) + endif() + find_package(OpenSSL) + if (OPENSSL_FOUND) + message(STATUS + "OpenSSL found ${OPENSSL_INCLUDE_DIR} ${OPENSSL_LIBRARIES}" + ) + target_include_directories(_OCPN_MODEL INTERFACE ${OPENSSL_INCLUDE_DIR}) + target_include_directories(_OCPN_MODEL INTERFACE ${OPENSSL_INCLUDE_DIR}) + target_link_libraries(_OCPN_MODEL INTERFACE ${OPENSSL_LIBRARIES}) + elseif (APPLE) + message(STATUS "Model: APPLE: Hardwiring /usr/local OpenSSL...") + target_include_directories( + _OCPN_MODEL INTERFACE /usr/local/opt/openssl@3/include + ) + target_link_libraries( + _OCPN_MODEL + INTERFACE + /usr/local/opt/openssl@3/lib/libcrypto.3.dylib + /usr/local/opt/openssl@3/lib/libssl.3.dylib + ) + + endif () +else () + target_include_directories( + _OCPN_MODEL + INTERFACE ${CMAKE_SOURCE_DIR}/cache/buildwin/include/openssl + ) + target_link_libraries( + _OCPN_MODEL + INTERFACE ${CMAKE_SOURCE_DIR}/cache/buildwin/libssl.lib + ) + target_link_libraries( + _OCPN_MODEL + INTERFACE ${CMAKE_SOURCE_DIR}/cache/buildwin/libcrypto.lib + ) +endif () + + + + # check for lzma support for reading compressed charts if (OCPN_USE_LZMA) find_package(LibLZMA) @@ -296,7 +409,10 @@ if (UNIX AND NOT APPLE) endif () endif () -find_package(LIBUSB) +if (NOT QT_ANDROID) + find_package(LIBUSB) +endif () + if (LIBUSB_FOUND) target_link_libraries(_OCPN_MODEL INTERFACE ocpn::libusb) add_compile_definitions(_OCPN_MODEL INTERFACE HAVE_LIBUSB_10) @@ -352,7 +468,6 @@ if (QT_ANDROID) ${CMAKE_SOURCE_DIR}/buildandroid/libopenssl/${ARCH}/openssl/lib/libssl.a ${CMAKE_SOURCE_DIR}/buildandroid/libopenssl/${ARCH}/openssl/lib/libcrypto.a ) - target_compile_definitions(_OCPN_MODEL INTERFACE -DMG_ENABLE_OPENSSL) target_include_directories(_OCPN_MODEL INTERFACE ${CMAKE_SOURCE_DIR}/buildandroid/libcurl/${ARCH}/include ${CMAKE_SOURCE_DIR}/android diff --git a/cmake/Curl.cmake b/model/cmake/Curl.cmake similarity index 56% rename from cmake/Curl.cmake rename to model/cmake/Curl.cmake index b3e0ffec02..2938b63ce9 100644 --- a/cmake/Curl.cmake +++ b/model/cmake/Curl.cmake @@ -14,41 +14,38 @@ # configure curl library -IF (CURL_FOUND) +if (CURL_FOUND) return() -ENDIF () +endif () -IF(CMAKE_HOST_WIN32) +if (CMAKE_HOST_WIN32) if (NOT EXISTS ${PROJECT_SOURCE_DIR}/cache/buildwin/libcurl.lib) message(FATAL_ERROR "Cannot find bundled windows files.") endif () - ADD_LIBRARY(WIN32_LIBCURL SHARED IMPORTED) - SET_TARGET_PROPERTIES(WIN32_LIBCURL PROPERTIES + add_library(WIN32_LIBCURL SHARED IMPORTED) + set_target_properties(WIN32_LIBCURL PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/cache/buildwin/libcurl.lib IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/cache/buildwin/libcurl.dll ) - ADD_LIBRARY(WIN32_ZLIB1 SHARED IMPORTED) - SET_TARGET_PROPERTIES(WIN32_ZLIB1 PROPERTIES + add_library(WIN32_ZLIB1 SHARED IMPORTED) + set_target_properties(WIN32_ZLIB1 PROPERTIES IMPORTED_IMPLIB ${PROJECT_SOURCE_DIR}/cache/buildwin/zlib1.lib IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/cache/buildwin/zlib1.dll ) - IF(MSVC) - INSTALL(FILES "cache/buildwin/libcurl.dll" DESTINATION ".") - INSTALL(FILES "cache/buildwin/zlib1.dll" DESTINATION ".") - #INSTALL(FILES "cache/buildwin/libeay32.dll" DESTINATION ".") - #INSTALL(FILES "cache/buildwin/ssleay32.dll" DESTINATION ".") - #INSTALL(FILES "cache/buildwin/curl-ca-bundle.crt" DESTINATION ".") - SET(CURL_LIBRARIES WIN32_LIBCURL WIN32_ZLIB1) - ELSE(MSVC) - # mingw - SET(CURL_LIBRARIES WIN32_LIBCURL) - INSTALL(FILES "cache/buildwin/libcurl.dll" DESTINATION ".") - ENDIF(MSVC) - + set(CURL_LIBRARIES WIN32_LIBCURL WIN32_ZLIB1) set(CURL_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/cache/buildwin/include) - SET(CURL_FOUND 1) -ENDIF(CMAKE_HOST_WIN32) + set(CURL_FOUND 1) + install( + FILES + "${CMAKE_SOURCE_DIR}/cache/buildwin/curl-ca-bundle.crt" + "${CMAKE_SOURCE_DIR}/cache/buildwin/libeay32.dll" + "${CMAKE_SOURCE_DIR}/cache/buildwin/ssleay32.dll" + "${CMAKE_SOURCE_DIR}/cache/buildwin/libcurl.dll" + DESTINATION "." + ) + +endif () -IF(UNIX) - FIND_PACKAGE(CURL REQUIRED) -ENDIF(UNIX) +if (UNIX) + find_package(CURL REQUIRED) +endif() diff --git a/cmake/FindLIBUDEV.cmake b/model/cmake/FindLIBUDEV.cmake similarity index 100% rename from cmake/FindLIBUDEV.cmake rename to model/cmake/FindLIBUDEV.cmake diff --git a/model/include/model/ais_decoder.h b/model/include/model/ais_decoder.h index 1003a2ecd7..5b534e5ac0 100644 --- a/model/include/model/ais_decoder.h +++ b/model/include/model/ais_decoder.h @@ -44,13 +44,13 @@ #include "model/track.h" #include "observable_evtvar.h" -class AisDecoder; // forward +class AisDecoder; // forward class ArrayOfMmsiProperties; // forward // AISTargetAlertDialog in gui layer -extern wxEvtHandler* g_pais_alert_dialog_active; +extern wxEvtHandler *g_pais_alert_dialog_active; -extern Select* pSelectAIS; +extern Select *pSelectAIS; extern wxString AISTargetNameFileName; extern AisDecoder *g_pAIS; extern ArrayOfMmsiProperties g_MMSI_Props_Array; @@ -64,7 +64,7 @@ enum AISAudioSoundType { class MmsiProperties { public: - MmsiProperties(){}; + MmsiProperties() {}; MmsiProperties(int mmsi) { Init(); MMSI = mmsi; @@ -88,13 +88,12 @@ class MmsiProperties { WX_DEFINE_ARRAY_PTR(MmsiProperties *, ArrayOfMmsiProperties); - struct AisDecoderCallbacks { - std::function confirm_stop_track; - std::function get_target_mmsi; - AisDecoderCallbacks() - : confirm_stop_track([]() { return true; } ), - get_target_mmsi([]() { return 0; }) {} + std::function confirm_stop_track; + std::function get_target_mmsi; + AisDecoderCallbacks() + : confirm_stop_track([]() { return true; }), + get_target_mmsi([]() { return 0; }) {} }; class AisDecoder : public wxEvtHandler { @@ -104,10 +103,11 @@ class AisDecoder : public wxEvtHandler { ~AisDecoder(void); AisError DecodeN0183(const wxString &str); - std::unordered_map> &GetTargetList(void) { + std::unordered_map> &GetTargetList(void) { return AISTargetList; } - std::unordered_map> &GetAreaNoticeSourcesList(void) { + std::unordered_map> & + GetAreaNoticeSourcesList(void) { return AIS_AreaNotice_Sources; } std::shared_ptr Get_Target_Data_From_MMSI(int mmsi); @@ -115,7 +115,7 @@ class AisDecoder : public wxEvtHandler { bool IsAISSuppressed(void) { return m_bSuppressed; } bool IsAISAlertGeneral(void) { return m_bGeneralAlert; } AisError DecodeSingleVDO(const wxString &str, GenericPosDatEx *pos, - wxString *acc); + wxString *acc); void DeletePersistentTrack(Track *track); std::map m_persistent_tracks; bool AIS_AlertPlaying(void) { return m_bAIS_AlertPlaying; }; @@ -147,42 +147,45 @@ class AisDecoder : public wxEvtHandler { void OnTimerDSC(wxTimerEvent &event); bool NMEACheckSumOK(const wxString &str); - bool Parse_VDXBitstring(AisBitstring *bstr, std::shared_ptr ptd); + bool Parse_VDXBitstring(AisBitstring *bstr, + std::shared_ptr ptd); void UpdateAllCPA(void); void UpdateOneCPA(AisTargetData *ptarget); void UpdateAllAlarms(void); void UpdateAllTracks(void); void UpdateOneTrack(AisTargetData *ptarget); void BuildERIShipTypeHash(void); - std::shared_ptr ProcessDSx(const wxString &str, bool b_take_dsc = false); + std::shared_ptr ProcessDSx(const wxString &str, + bool b_take_dsc = false); wxString DecodeDSEExpansionCharacters(wxString dseData); void getAISTarget(long mmsi, std::shared_ptr &pTargetData, - std::shared_ptr &pStaleTarget, bool &bnewtarget, - int &last_report_ticks, wxDateTime &now); + std::shared_ptr &pStaleTarget, + bool &bnewtarget, int &last_report_ticks, wxDateTime &now); void getMmsiProperties(std::shared_ptr &pTargetData); void handleUpdate(std::shared_ptr pTargetData, bool bnewtarget, const rapidjson::Value &update); void updateItem(std::shared_ptr pTargetData, bool bnewtarget, const rapidjson::Value &item, wxString &sfixtime) const; - void CommitAISTarget( std::shared_ptr pTargetData, - const wxString &str, bool message_valid, - bool new_target); + void CommitAISTarget(std::shared_ptr pTargetData, + const wxString &str, bool message_valid, + bool new_target); void InitCommListeners(void); - bool HandleN0183_AIS( std::shared_ptr n0183_msg ); + bool HandleN0183_AIS(std::shared_ptr n0183_msg); void HandleSignalK(std::shared_ptr sK_msg); - bool HandleN2K_129038( std::shared_ptr n2k_msg ); - bool HandleN2K_129039( std::shared_ptr n2k_msg ); - bool HandleN2K_129041( std::shared_ptr n2k_msg ); - bool HandleN2K_129794( std::shared_ptr n2k_msg ); - bool HandleN2K_129809( std::shared_ptr n2k_msg ); - bool HandleN2K_129810( std::shared_ptr n2k_msg ); - bool HandleN2K_129793( std::shared_ptr n2k_msg ); + bool HandleN2K_129038(std::shared_ptr n2k_msg); + bool HandleN2K_129039(std::shared_ptr n2k_msg); + bool HandleN2K_129041(std::shared_ptr n2k_msg); + bool HandleN2K_129794(std::shared_ptr n2k_msg); + bool HandleN2K_129809(std::shared_ptr n2k_msg); + bool HandleN2K_129810(std::shared_ptr n2k_msg); + bool HandleN2K_129793(std::shared_ptr n2k_msg); wxString m_signalk_selfid; std::unordered_map> AISTargetList; - std::unordered_map> AIS_AreaNotice_Sources; + std::unordered_map> + AIS_AreaNotice_Sources; AIS_Target_Name_Hash *AISTargetNamesC; AIS_Target_Name_Hash *AISTargetNamesNC; @@ -230,4 +233,4 @@ class AisDecoder : public wxEvtHandler { DECLARE_EVENT_TABLE() }; -#endif // _AIS_DECODER_H__ +#endif // _AIS_DECODER_H__ diff --git a/model/include/model/ais_defs.h b/model/include/model/ais_defs.h index bdd66b30ff..a5750582a4 100644 --- a/model/include/model/ais_defs.h +++ b/model/include/model/ais_defs.h @@ -47,7 +47,6 @@ typedef enum AisError { WX_DECLARE_HASH_MAP(int, wxString, wxIntegerHash, wxIntegerEqual, AIS_Target_Name_Hash); - #define TIMER_AIS_MSEC 998 #define TIMER_AIS_AUDIO_MSEC 2000 diff --git a/model/include/model/ais_target_data.h b/model/include/model/ais_target_data.h index 4be2b44b5a..0ec4689054 100644 --- a/model/include/model/ais_target_data.h +++ b/model/include/model/ais_target_data.h @@ -73,7 +73,6 @@ typedef enum ais_nav_status { } _ais_nav_status; - // Describe Transponder Class typedef enum ais_transponder_class { AIS_CLASS_A = 0, @@ -88,7 +87,6 @@ typedef enum ais_transponder_class { AIS_METEO // Meteorological and Hydrographic data } _ais_transponder_class; - // Describe AIS Alert state typedef enum ais_alert_type { AIS_NO_ALERT = 0, @@ -147,12 +145,11 @@ struct Ais8_001_22 { struct AisTargetCallbacks { std::function get_mag; - AisTargetCallbacks(): get_mag([](double a) { return toMagnetic(a); }) {} + AisTargetCallbacks() : get_mag([](double a) { return toMagnetic(a); }) {} }; - class AisTargetData { -friend class AisTargetDataMaker; + friend class AisTargetDataMaker; public: AisTargetData(AisTargetCallbacks callbacks); @@ -227,16 +224,16 @@ friend class AisTargetDataMaker; bool b_positionOnceValid; bool b_nameValid; bool b_isFollower; - bool b_isDSCtarget; // DSC flag to a possible simultaneous AIS target - int m_dscNature; - int m_dscTXmmsi; // MMSI for the DSC relay issuer + bool b_isDSCtarget; // DSC flag to a possible simultaneous AIS target + int m_dscNature; + int m_dscTXmmsi; // MMSI for the DSC relay issuer long dsc_NatureOfDistress; - // MMSI Properties + // MMSI Properties bool b_NoTrack; bool b_OwnShip; - bool b_PersistTrack; // For AIS target query - bool b_mPropPersistTrack; // For mmsi_prop + bool b_PersistTrack; // For AIS target query + bool b_mPropPersistTrack; // For mmsi_prop int m_utc_hour; int m_utc_min; @@ -251,10 +248,10 @@ friend class AisTargetDataMaker; wxString MSG_14_text; - // Per target collision parameters + // Per target collision parameters bool bCPA_Valid; - double TCPA; // Minutes - double CPA; // Nautical Miles + double TCPA; // Minutes + double CPA; // Nautical Miles bool b_show_AIS_CPA; // TR 2012.06.28: Show AIS-CPA bool b_show_track; @@ -289,8 +286,9 @@ class AisTargetDataMaker { AisTargetDataMaker(const AisTargetDataMaker&) = delete; AisTargetDataMaker& operator=(const AisTargetDataMaker&) = delete; - - std::shared_ptr GetTargetData() { return std::make_shared(m_callbacks); } + std::shared_ptr GetTargetData() { + return std::make_shared(m_callbacks); + } void SetCallbacks(AisTargetCallbacks callbacks) { m_callbacks = callbacks; } private: @@ -298,8 +296,7 @@ class AisTargetDataMaker { AisTargetCallbacks m_callbacks; }; - -wxString trimAISField(char *data); +wxString trimAISField(char* data); wxString ais_get_status(int index); wxString ais_get_type(int index); diff --git a/model/include/model/base_platform.h b/model/include/model/base_platform.h index a0a4671c6f..8af4b992cd 100644 --- a/model/include/model/base_platform.h +++ b/model/include/model/base_platform.h @@ -42,11 +42,10 @@ #include #include - #define PLATFORM_CAP_PLUGINS 1 #define PLATFORM_CAP_FASTPAN 2 -class BasePlatform; // forward +class BasePlatform; // forward /// points to g_platform, handles brain-dead MS linker. extern BasePlatform* g_BasePlatform; @@ -60,8 +59,8 @@ typedef struct { void appendOSDirSlash(wxString* path); struct OCPN_OSDetail { - OCPN_OSDetail(){}; - ~OCPN_OSDetail(){}; + OCPN_OSDetail() {}; + ~OCPN_OSDetail() {}; std::string osd_name; std::string osd_version; @@ -73,7 +72,7 @@ struct OCPN_OSDetail { class AbstractPlatform { public: AbstractPlatform() = default; - virtual ~AbstractPlatform() = default; + virtual ~AbstractPlatform() = default; /** Return dir path for opencpn.log, etc., respecting -c cli option. */ wxString& GetPrivateDataDir(); @@ -81,7 +80,6 @@ class AbstractPlatform { /** Return dir path for opencpn.log, etc., does not respect -c option. */ wxString& DefaultPrivateDataDir(); - wxString* GetPluginDirPtr(); wxString* GetSharedDataDirPtr(); @@ -133,7 +131,7 @@ class AbstractPlatform { virtual double GetDisplaySizeMM() { return 1.0; } virtual double GetDisplayDPmm() { return 1.0; } virtual unsigned int GetSelectRadiusPix(); - double GetDisplayDIPMult(wxWindow *win); + double GetDisplayDIPMult(wxWindow* win); static void ShowBusySpinner(); static void HideBusySpinner(); @@ -160,9 +158,8 @@ class AbstractPlatform { std::vector m_displaySizeMMOverride; - #ifdef _MSC_VER - bool GetWindowsMonitorSize(int *width, int *height); + bool GetWindowsMonitorSize(int* width, int* height); #endif int m_monitorWidth, m_monitorHeight; bool m_bdisableWindowsDisplayEnum; diff --git a/model/include/model/catalog_handler.h b/model/include/model/catalog_handler.h index 962a2f1bc7..a0e96d28e8 100644 --- a/model/include/model/catalog_handler.h +++ b/model/include/model/catalog_handler.h @@ -114,7 +114,7 @@ class CatalogHandler { void ClearCatalogData(); /** Return a pointer to the currently active plugin catalog context */ - CatalogCtx *GetActiveCatalogContext(); + CatalogCtx* GetActiveCatalogContext(); /** Retrieve status of currently active plugin catalog */ ServerStatus GetCatalogStatus(); diff --git a/model/include/model/catalog_parser.h b/model/include/model/catalog_parser.h index 559750b34c..35d0276870 100644 --- a/model/include/model/catalog_parser.h +++ b/model/include/model/catalog_parser.h @@ -73,11 +73,14 @@ struct PluginMetadata { return name + version + release + target + target_version; } - std::string to_string(); ///< Return printable XML representation. + std::string to_string(); ///< Return printable XML representation. PluginMetadata() - : is_imported(false), is_orphan(false), openSource(true), - readonly(true), ix(-1) {} + : is_imported(false), + is_orphan(false), + openSource(true), + readonly(true), + ix(-1) {} }; /** diff --git a/model/include/model/comm_ais.h b/model/include/model/comm_ais.h index e40c14ba90..fb1fe54fd5 100644 --- a/model/include/model/comm_ais.h +++ b/model/include/model/comm_ais.h @@ -36,6 +36,6 @@ bool Parse_VDXBitstring(AisBitstring *bstr, AisTargetData *ptd); AisError DecodeSingleVDO(const wxString &str, GenericPosDatEx *pos); -bool NMEA_AISCheckSumOK(const wxString& str); +bool NMEA_AISCheckSumOK(const wxString &str); -#endif // _COMM_AIS_H__ +#endif // _COMM_AIS_H__ diff --git a/model/include/model/comm_appmsg.h b/model/include/model/comm_appmsg.h index 1de90ea9c2..81873c2bf6 100644 --- a/model/include/model/comm_appmsg.h +++ b/model/include/model/comm_appmsg.h @@ -54,14 +54,13 @@ class Position { /** Construct a (0,0) position, type == Undef. */ Position(); - - bool IsValid() const { return type != Type::Undef; } + bool IsValid() const { return type != Type::Undef; } /** Return utf string like 65°25,11N 21°12,01E */ std::string to_string() const; - const double lat; // signed value - const double lon; // signed value + const double lat; // signed value + const double lon; // signed value const Type type; /** @@ -82,15 +81,13 @@ class Position { /** Returned signed long deduced from t. */ double TypeToLong(Type t, double lon); - }; - class AppMsg : public KeyProvider { public: enum class Type; AppMsg(AppMsg::Type t) - : type(t), name(TypeToString(t)), source(NavAddr()), prio(0){}; + : type(t), name(TypeToString(t)), source(NavAddr()), prio(0) {}; virtual std::string key() const { return std::string("@!appmsg-") + name; } @@ -105,7 +102,7 @@ class AppMsg : public KeyProvider { protected: AppMsg(AppMsg::Type tp, const std::string& nm, NavAddr src) - : type(tp), name(nm), source(src), prio(0){}; + : type(tp), name(nm), source(src), prio(0) {}; }; enum class AppMsg::Type { @@ -138,7 +135,7 @@ class GnssFix : public AppMsg { pos(p), time(t), quality(q), - satellites_used(s_used){}; + satellites_used(s_used) {}; virtual ~GnssFix() = default; std::string to_string() const { @@ -154,12 +151,12 @@ class GnssFix : public AppMsg { }; // bitmask defining update validity of BasicNavDataMsg members -#define POS_UPDATE (int)(1) -#define COG_UPDATE (int)(1 << 1) -#define SOG_UPDATE (int)(1 << 2) -#define VAR_UPDATE (int)(1 << 3) -#define HDT_UPDATE (int)(1 << 4) -#define POS_VALID (int)(1 << 5) +#define POS_UPDATE (int)(1) +#define COG_UPDATE (int)(1 << 1) +#define SOG_UPDATE (int)(1 << 2) +#define VAR_UPDATE (int)(1 << 3) +#define HDT_UPDATE (int)(1 << 4) +#define POS_VALID (int)(1 << 5) class BasicNavDataMsg : public AppMsg { public: @@ -172,7 +169,7 @@ class BasicNavDataMsg : public AppMsg { var(VAR), hdt(HDT), vflag(valid_flag), - time(t){}; + time(t) {}; BasicNavDataMsg() : AppMsg(AppMsg::Type::BasicNavData, "basic-nav-data", NavAddr()), @@ -181,7 +178,7 @@ class BasicNavDataMsg : public AppMsg { var(0), hdt(0), vflag(0), - time(0){}; + time(0) {}; virtual ~BasicNavDataMsg() = default; @@ -201,7 +198,7 @@ class GPSWatchdogMsg : public AppMsg { GPSWatchdogMsg(WDSource _source, int value) : AppMsg(AppMsg::Type::GPSWatchdog, "gps-watchdog", NavAddr()), gps_watchdog(value), - wd_source(_source){}; + wd_source(_source) {}; virtual ~GPSWatchdogMsg() = default; diff --git a/model/include/model/comm_bridge.h b/model/include/model/comm_bridge.h index 9e02b1d0cc..7af4881602 100644 --- a/model/include/model/comm_bridge.h +++ b/model/include/model/comm_bridge.h @@ -38,8 +38,7 @@ #include "model/comm_decoder.h" #include "model/comm_navmsg.h" - -typedef struct{ +typedef struct { std::string pcclass; int active_priority; std::string active_source; @@ -85,18 +84,18 @@ class CommBridge : public wxEvtHandler { void OnDriverStateChange(); - void OnWatchdogTimer(wxTimerEvent& event); - bool EvalPriority(std::shared_ptr msg, - PriorityContainer& active_priority, - std::unordered_map& priority_map); - std::string GetPriorityKey(std::shared_ptr msg); + void OnWatchdogTimer(wxTimerEvent &event); + bool EvalPriority(std::shared_ptr msg, + PriorityContainer &active_priority, + std::unordered_map &priority_map); + std::string GetPriorityKey(std::shared_ptr msg); std::vector GetPriorityMaps(); - PriorityContainer& GetPriorityContainer(const std::string category); + PriorityContainer &GetPriorityContainer(const std::string category); void UpdateAndApplyMaps(std::vector new_maps); - bool LoadConfig( void ); - bool SaveConfig( void ); + bool LoadConfig(void); + bool SaveConfig(void); Watchdogs m_watchdogs; wxTimer m_watchdog_timer; @@ -131,15 +130,16 @@ class CommBridge : public wxEvtHandler { void PresetPriorityContainers(); std::string GetPriorityMap(std::unordered_map &map); - void ApplyPriorityMap(std::unordered_map& priority_map, + void ApplyPriorityMap(std::unordered_map &priority_map, wxString &new_prio, int category); void ApplyPriorityMaps(std::vector new_maps); void ClearPriorityMaps(); - void PresetPriorityContainer(PriorityContainer &pc, - const std::unordered_map &priority_map); + void PresetPriorityContainer( + PriorityContainer &pc, + const std::unordered_map &priority_map); void SelectNextLowerPriority(const std::unordered_map &map, - PriorityContainer &pc); + PriorityContainer &pc); PriorityContainer active_priority_position; PriorityContainer active_priority_velocity; diff --git a/model/include/model/comm_can_util.h b/model/include/model/comm_can_util.h index c389b28221..40fac51c01 100644 --- a/model/include/model/comm_can_util.h +++ b/model/include/model/comm_can_util.h @@ -40,31 +40,30 @@ #define CAN_MAX_DLEN 8 struct can_frame { - uint32_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ - uint8_t can_dlc; /* frame payload length in byte (0 .. 8) */ - uint8_t data[CAN_MAX_DLEN]; + uint32_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ + uint8_t can_dlc; /* frame payload length in byte (0 .. 8) */ + uint8_t data[CAN_MAX_DLEN]; }; #endif -#if defined (__WXMAC__) +#if defined(__WXMAC__) #define CAN_MAX_DLEN 8 struct can_frame { - uint32_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ - uint8_t can_dlc; /* frame payload length in byte (0 .. 8) */ - uint8_t data[CAN_MAX_DLEN]; + uint32_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ + uint8_t can_dlc; /* frame payload length in byte (0 .. 8) */ + uint8_t data[CAN_MAX_DLEN]; }; #endif unsigned long BuildCanID(int priority, int source, int destination, int pgn); bool IsFastMessagePGN(unsigned pgn); - /// CAN v2.0 29 bit header as used by NMEA 2000 class CanHeader { public: CanHeader(); - /** Construct a CanHeader by parsing a frame */ + /** Construct a CanHeader by parsing a frame */ CanHeader(can_frame frame); /** Return true if header reflects a multipart fast message. */ @@ -83,8 +82,9 @@ class FastMessageMap { public: Entry() : time_arrived(wxDateTime::Now()), - sid(0), expected_length(0), cursor(0) {} - + sid(0), + expected_length(0), + cursor(0) {} wxDateTime time_arrived; ///< time of last fragment. @@ -100,8 +100,7 @@ class FastMessageMap { std::vector data; ///< Received data }; - FastMessageMap() : dropped_frames(0), - last_gc_run(wxDateTime::Now()) {} + FastMessageMap() : dropped_frames(0), last_gc_run(wxDateTime::Now()) {} Entry operator[](int i) const { return entries[i]; } /// Getter Entry& operator[](int i) { return entries[i]; } /// Setter @@ -134,5 +133,4 @@ class FastMessageMap { wxDateTime dropped_frame_time; }; - #endif // guard diff --git a/model/include/model/comm_decoder.h b/model/include/model/comm_decoder.h index 6eb19e7c3a..416539d881 100644 --- a/model/include/model/comm_decoder.h +++ b/model/include/model/comm_decoder.h @@ -40,8 +40,7 @@ #include "nmea0183.h" #include "N2KParser.h" - -typedef struct{ +typedef struct { double gLat; double gLon; double gSog; @@ -53,11 +52,10 @@ typedef struct{ int SID; } NavData; - class CommDecoder { public: CommDecoder() : m_NMEA0183(NmeaCtxFactory()) {}; - ~CommDecoder(){}; + ~CommDecoder() {}; // NMEA0183 decoding, by sentence. bool DecodeRMC(std::string s, NavData& temp_data); @@ -74,32 +72,36 @@ class CommDecoder { NMEA0183 m_NMEA0183; // Used to parse messages from NMEA threads // NMEA2000 decoding, by PGN - bool DecodePGN129025(std::vector v, NavData& temp_data); - bool DecodePGN129026(std::vector v, NavData& temp_data); - bool DecodePGN129029(std::vector v, NavData& temp_data); - bool DecodePGN127250(std::vector v, NavData& temp_data); - bool DecodePGN129540(std::vector v, NavData& temp_data); + bool DecodePGN129025(std::vector v, NavData& temp_data); + bool DecodePGN129026(std::vector v, NavData& temp_data); + bool DecodePGN129029(std::vector v, NavData& temp_data); + bool DecodePGN127250(std::vector v, NavData& temp_data); + bool DecodePGN129540(std::vector v, NavData& temp_data); // SignalK bool DecodeSignalK(std::string s, NavData& temp_data); - void handleUpdate(const rapidjson::Value &update, NavData& temp_data); - void updateItem(const rapidjson::Value &item, wxString &sfixtime, NavData& temp_data); - bool updateNavigationPosition(const rapidjson::Value &value, - const wxString &sfixtime, NavData& temp_data); - void updateNavigationSpeedOverGround(const rapidjson::Value &value, - const wxString &sfixtime, NavData& temp_data); - void updateNavigationCourseOverGround(const rapidjson::Value &value, - const wxString &sfixtime, NavData& temp_data); - void updateGnssSatellites(const rapidjson::Value &value, const wxString &sfixtime, NavData& temp_data); - void updateHeadingTrue(const rapidjson::Value &value, const wxString &sfixtime, NavData& temp_data); - void updateHeadingMagnetic(const rapidjson::Value &value, - const wxString &sfixtime, NavData& temp_data); - void updateMagneticVariance(const rapidjson::Value &value, - const wxString &sfixtime, NavData& temp_data); + void handleUpdate(const rapidjson::Value& update, NavData& temp_data); + void updateItem(const rapidjson::Value& item, wxString& sfixtime, + NavData& temp_data); + bool updateNavigationPosition(const rapidjson::Value& value, + const wxString& sfixtime, NavData& temp_data); + void updateNavigationSpeedOverGround(const rapidjson::Value& value, + const wxString& sfixtime, + NavData& temp_data); + void updateNavigationCourseOverGround(const rapidjson::Value& value, + const wxString& sfixtime, + NavData& temp_data); + void updateGnssSatellites(const rapidjson::Value& value, + const wxString& sfixtime, NavData& temp_data); + void updateHeadingTrue(const rapidjson::Value& value, + const wxString& sfixtime, NavData& temp_data); + void updateHeadingMagnetic(const rapidjson::Value& value, + const wxString& sfixtime, NavData& temp_data); + void updateMagneticVariance(const rapidjson::Value& value, + const wxString& sfixtime, NavData& temp_data); std::string src_string; std::unordered_map GNSS_quality_map; - }; #endif // _COMM_DECODER_H diff --git a/model/include/model/comm_driver.h b/model/include/model/comm_driver.h index ddf82f25b3..184e7545ea 100644 --- a/model/include/model/comm_driver.h +++ b/model/include/model/comm_driver.h @@ -57,7 +57,7 @@ class DriverListener { class AbstractCommDriver : public std::enable_shared_from_this { public: - AbstractCommDriver() : bus(NavAddr::Bus::Undef), iface("nil"){}; + AbstractCommDriver() : bus(NavAddr::Bus::Undef), iface("nil") {}; virtual bool SendMessage(std::shared_ptr msg, std::shared_ptr addr) = 0; @@ -89,15 +89,17 @@ class AbstractCommDriver const std::string iface; /**< Physical device for 0183, else a unique string */ - virtual std::unordered_map GetAttributes() const { return attributes;} + virtual std::unordered_map GetAttributes() const { + return attributes; + } std::unordered_map attributes; protected: - AbstractCommDriver(NavAddr::Bus b) : bus(b){ + AbstractCommDriver(NavAddr::Bus b) : bus(b) { attributes["protocol"] = NavAddr::BusToString(bus); }; - AbstractCommDriver(NavAddr::Bus b, const std::string& s) : bus(b), iface(s){ + AbstractCommDriver(NavAddr::Bus b, const std::string& s) : bus(b), iface(s) { attributes["protocol"] = NavAddr::BusToString(bus); }; }; diff --git a/model/include/model/comm_drv_file.h b/model/include/model/comm_drv_file.h index 204fbaca97..32bd53dc56 100644 --- a/model/include/model/comm_drv_file.h +++ b/model/include/model/comm_drv_file.h @@ -33,7 +33,6 @@ #include "model/comm_driver.h" - /** Read and write data to/from files test driver */ class FileCommDriver : public AbstractCommDriver { public: diff --git a/model/include/model/comm_drv_n0183.h b/model/include/model/comm_drv_n0183.h index 19798df634..228ced88e9 100644 --- a/model/include/model/comm_drv_n0183.h +++ b/model/include/model/comm_drv_n0183.h @@ -43,7 +43,8 @@ class CommDriverN0183 : public AbstractCommDriver { void SetListener(DriverListener& l) override {} virtual std::shared_ptr GetAddress() { - return std::make_shared(NavAddr0183(iface)); } + return std::make_shared(NavAddr0183(iface)); + } void Activate() override; }; diff --git a/model/include/model/comm_drv_n0183_android_bt.h b/model/include/model/comm_drv_n0183_android_bt.h index ec15e58b59..62211e8421 100644 --- a/model/include/model/comm_drv_n0183_android_bt.h +++ b/model/include/model/comm_drv_n0183_android_bt.h @@ -36,7 +36,7 @@ class CommDriverN0183AndroidBTEvent : public wxEvent { public: - CommDriverN0183AndroidBTEvent( wxEventType commandType, int id); + CommDriverN0183AndroidBTEvent(wxEventType commandType, int id); ~CommDriverN0183AndroidBTEvent(); // accessors @@ -45,12 +45,13 @@ class CommDriverN0183AndroidBTEvent : public wxEvent { // required for sending with wxPostEvent() wxEvent* Clone() const; + private: std::shared_ptr> m_payload; }; -wxDECLARE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_BT, CommDriverN0183AndroidBTEvent); - +wxDECLARE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_BT, + CommDriverN0183AndroidBTEvent); class CommDriverN0183AndroidBT : public CommDriverN0183, public wxEvtHandler { public: @@ -75,7 +76,6 @@ class CommDriverN0183AndroidBT : public CommDriverN0183, public wxEvtHandler { std::string m_BaudRate; int m_handshake; - ConnectionParams m_params; DriverListener& m_listener; void handle_N0183_MSG(CommDriverN0183AndroidBTEvent& event); diff --git a/model/include/model/comm_drv_n0183_android_int.h b/model/include/model/comm_drv_n0183_android_int.h index dc3ba89dde..e8f2e2bfdd 100644 --- a/model/include/model/comm_drv_n0183_android_int.h +++ b/model/include/model/comm_drv_n0183_android_int.h @@ -36,7 +36,7 @@ class CommDriverN0183AndroidIntEvent : public wxEvent { public: - CommDriverN0183AndroidIntEvent( wxEventType commandType, int id); + CommDriverN0183AndroidIntEvent(wxEventType commandType, int id); ~CommDriverN0183AndroidIntEvent(); // accessors @@ -45,12 +45,13 @@ class CommDriverN0183AndroidIntEvent : public wxEvent { // required for sending with wxPostEvent() wxEvent* Clone() const; + private: std::shared_ptr> m_payload; }; -wxDECLARE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_INT, CommDriverN0183AndroidIntEvent); - +wxDECLARE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_INT, + CommDriverN0183AndroidIntEvent); class CommDriverN0183AndroidInt : public CommDriverN0183, public wxEvtHandler { public: @@ -75,7 +76,6 @@ class CommDriverN0183AndroidInt : public CommDriverN0183, public wxEvtHandler { std::string m_BaudRate; int m_handshake; - ConnectionParams m_params; DriverListener& m_listener; void handle_N0183_MSG(CommDriverN0183AndroidIntEvent& event); diff --git a/model/include/model/comm_drv_n0183_net.h b/model/include/model/comm_drv_n0183_net.h index b6f36cd1d6..b5af7a31f7 100644 --- a/model/include/model/comm_drv_n0183_net.h +++ b/model/include/model/comm_drv_n0183_net.h @@ -43,7 +43,7 @@ // newer versions of glib define its own GSocket but we unfortunately use this // name in our own (semi-)public header and so can't change it -- rename glib // one instead -//#include +// #include #define GSocket GlibGSocket #include #undef GSocket @@ -131,7 +131,7 @@ class CommDriverN0183Net : public CommDriverN0183, public wxEvtHandler { wxSocketBase* m_tsock; wxSocketServer* m_socket_server; bool m_is_multicast; - MrqContainer *m_mrq_container; + MrqContainer* m_mrq_container; int m_txenter; int m_dog_value; diff --git a/model/include/model/comm_drv_n0183_serial.h b/model/include/model/comm_drv_n0183_serial.h index 376f4732ef..fcb6052f06 100644 --- a/model/include/model/comm_drv_n0183_serial.h +++ b/model/include/model/comm_drv_n0183_serial.h @@ -1,4 +1,4 @@ - /************************************************************************** +/************************************************************************** * Copyright (C) 2022 by David Register, Alec Leamas * * * * This program is free software; you can redistribute it and/or modify * @@ -36,7 +36,7 @@ class CommDriverN0183SerialThread; // Internal class CommDriverN0183SerialEvent : public wxEvent { public: - CommDriverN0183SerialEvent( wxEventType commandType, int id); + CommDriverN0183SerialEvent(wxEventType commandType, int id); ~CommDriverN0183SerialEvent(); // accessors @@ -45,13 +45,13 @@ class CommDriverN0183SerialEvent : public wxEvent { // required for sending with wxPostEvent() wxEvent* Clone() const; + private: std::shared_ptr> m_payload; }; wxDECLARE_EVENT(wxEVT_COMMDRIVER_N0183_SERIAL, CommDriverN0183SerialEvent); - class CommDriverN0183Serial : public CommDriverN0183, public wxEvtHandler { public: CommDriverN0183Serial(const ConnectionParams* params, DriverListener& l); @@ -98,7 +98,7 @@ class CommDriverN0183Serial : public CommDriverN0183, public wxEvtHandler { CommDriverN0183SerialThread* m_secondary_thread; bool m_sec_thread_active; - GarminProtocolHandler * m_garmin_handler; + GarminProtocolHandler* m_garmin_handler; ConnectionParams m_params; DriverListener& m_listener; diff --git a/model/include/model/comm_drv_n2k.h b/model/include/model/comm_drv_n2k.h index af7af9f705..f26d0fc887 100644 --- a/model/include/model/comm_drv_n2k.h +++ b/model/include/model/comm_drv_n2k.h @@ -31,7 +31,7 @@ class CommDriverN2K : public AbstractCommDriver { public: - CommDriverN2K(const std::string& s = "n2k0" ); + CommDriverN2K(const std::string& s = "n2k0"); virtual ~CommDriverN2K(); @@ -39,7 +39,7 @@ class CommDriverN2K : public AbstractCommDriver { std::shared_ptr addr) override = 0; virtual void SetListener(DriverListener& l) override; virtual std::shared_ptr GetAddress(const N2kName& name); - virtual int SetTXPGN(int pgn){ return 0; } + virtual int SetTXPGN(int pgn) { return 0; } }; #endif // guard diff --git a/model/include/model/comm_drv_n2k_net.h b/model/include/model/comm_drv_n2k_net.h index 5df580c509..78d2600634 100644 --- a/model/include/model/comm_drv_n2k_net.h +++ b/model/include/model/comm_drv_n2k_net.h @@ -42,7 +42,7 @@ // newer versions of glib define its own GSocket but we unfortunately use this // name in our own (semi-)public header and so can't change it -- rename glib // one instead -//#include +// #include #define GSocket GlibGSocket #include #undef GSocket @@ -64,9 +64,7 @@ #define MsgTypeN2kData 0x93 #define MsgTypeN2kRequest 0x94 - -typedef enum -{ +typedef enum { N2KFormat_Undefined = 0, N2KFormat_YD_RAW, N2KFormat_Actisense_RAW_ASCII, @@ -78,17 +76,12 @@ typedef enum N2KFormat_MiniPlex } N2K_Format; -typedef enum -{ - TX_FORMAT_YDEN = 0, - TX_FORMAT_ACTISENSE -} GW_TX_FORMAT; +typedef enum { TX_FORMAT_YDEN = 0, TX_FORMAT_ACTISENSE } GW_TX_FORMAT; class CommDriverN2KNetEvent; // Internal class MrqContainer; class FastMessageMap; - class circular_buffer { public: circular_buffer(size_t size); @@ -118,7 +111,7 @@ class CommDriverN2KNet : public CommDriverN2K, public wxEvtHandler { /** Register driver and possibly do other post-ctor steps. */ void Activate() override; - void SetListener(DriverListener& l) override{}; + void SetListener(DriverListener& l) override {}; void Open(); void Close(); @@ -190,15 +183,14 @@ class CommDriverN2KNet : public CommDriverN2K, public wxEvtHandler { bool ProcessSeaSmart(std::vector packet); bool ProcessMiniPlex(std::vector packet); - - bool SendN2KNetwork(std::shared_ptr &msg, + bool SendN2KNetwork(std::shared_ptr& msg, std::shared_ptr dest_addr); - std::vector> - GetTxVector(const std::shared_ptr &msg, - std::shared_ptr dest_addr); + std::vector> GetTxVector( + const std::shared_ptr& msg, + std::shared_ptr dest_addr); bool SendSentenceNetwork(std::vector> payload); - bool HandleMgntMsg(uint64_t pgn, std::vector &payload); + bool HandleMgntMsg(uint64_t pgn, std::vector& payload); bool PrepareForTX(); wxString m_net_port; @@ -208,7 +200,7 @@ class CommDriverN2KNet : public CommDriverN2K, public wxEvtHandler { wxSocketBase* m_tsock; wxSocketServer* m_socket_server; bool m_is_multicast; - MrqContainer *m_mrq_container; + MrqContainer* m_mrq_container; int m_txenter; int m_dog_value; @@ -227,11 +219,11 @@ class CommDriverN2KNet : public CommDriverN2K, public wxEvtHandler { int m_ib; bool m_bInMsg, m_bGotESC, m_bGotSOT; - circular_buffer *m_circle; - unsigned char *rx_buffer; + circular_buffer* m_circle; + unsigned char* rx_buffer; std::string m_sentence; - FastMessageMap *fast_messages; + FastMessageMap* fast_messages; N2K_Format m_n2k_format; uint8_t m_order; char m_TX_flag; @@ -242,4 +234,3 @@ class CommDriverN2KNet : public CommDriverN2K, public wxEvtHandler { }; #endif // guard - diff --git a/model/include/model/comm_drv_n2k_serial.h b/model/include/model/comm_drv_n2k_serial.h index 5b8155fea1..93a859d54a 100644 --- a/model/include/model/comm_drv_n2k_serial.h +++ b/model/include/model/comm_drv_n2k_serial.h @@ -38,8 +38,8 @@ #include "serial/serial.h" #endif -#define OUT_QUEUE_LENGTH 20 -#define MAX_OUT_QUEUE_MESSAGE_LENGTH 200 +#define OUT_QUEUE_LENGTH 20 +#define MAX_OUT_QUEUE_MESSAGE_LENGTH 200 #define ESCAPE 0x10 #define STARTOFTEXT 0x02 @@ -61,13 +61,13 @@ class CommDriverN2KSerial : public CommDriverN2K, public wxEvtHandler { /** Register driver and possibly do other post-ctor steps. */ void Activate() override; - void SetListener(DriverListener& l) override{}; + void SetListener(DriverListener& l) override {}; bool Open(); void Close(); bool SendMessage(std::shared_ptr msg, - std::shared_ptr addr) override; + std::shared_ptr addr) override; int SetTXPGN(int pgn) override; @@ -92,10 +92,10 @@ class CommDriverN2KSerial : public CommDriverN2K, public wxEvtHandler { std::atomic_int m_Thread_run_flag; private: - void ProcessManagementPacket(std::vector *payload); - int SendMgmtMsg( unsigned char *string, size_t string_size, - unsigned char cmd_code, - int timeout_msec, bool *response_flag); + void ProcessManagementPacket(std::vector* payload); + int SendMgmtMsg(unsigned char* string, size_t string_size, + unsigned char cmd_code, int timeout_msec, + bool* response_flag); bool m_bok; std::string m_portstring; @@ -118,7 +118,6 @@ class CommDriverN2KSerial : public CommDriverN2K, public wxEvtHandler { uint64_t NAME; int m_manufacturers_code; bool m_got_mfg_code; - }; #endif // guard diff --git a/model/include/model/comm_drv_n2k_socketcan.h b/model/include/model/comm_drv_n2k_socketcan.h index 376f1577a1..0b828359a3 100644 --- a/model/include/model/comm_drv_n2k_socketcan.h +++ b/model/include/model/comm_drv_n2k_socketcan.h @@ -45,7 +45,7 @@ class CommDriverN2KSocketCAN : public CommDriverN2K { void SetListener(DriverListener& l) override { m_listener = l; } bool SendMessage(std::shared_ptr msg, - std::shared_ptr addr) = 0; //override; + std::shared_ptr addr) = 0; // override; virtual bool Open() = 0; virtual void Close() = 0; diff --git a/model/include/model/comm_drv_registry.h b/model/include/model/comm_drv_registry.h index d104bdd917..57a48c6386 100644 --- a/model/include/model/comm_drv_registry.h +++ b/model/include/model/comm_drv_registry.h @@ -71,7 +71,7 @@ class CommDriverRegistry final { EventVar evt_driver_msg; private: - CommDriverRegistry() = default; + CommDriverRegistry() = default; CommDriverRegistry(const CommDriverRegistry&) = delete; CommDriverRegistry& operator=(const CommDriverRegistry&) = delete; diff --git a/model/include/model/comm_drv_signalk.h b/model/include/model/comm_drv_signalk.h index c7ddc20d86..2c4b1f0674 100644 --- a/model/include/model/comm_drv_signalk.h +++ b/model/include/model/comm_drv_signalk.h @@ -31,7 +31,7 @@ class CommDriverSignalK : public AbstractCommDriver { public: - CommDriverSignalK(const std::string& s = "sk0" ); + CommDriverSignalK(const std::string& s = "sk0"); virtual ~CommDriverSignalK(); diff --git a/model/include/model/comm_drv_signalk_net.h b/model/include/model/comm_drv_signalk_net.h index 01265c95d9..15d46d114b 100644 --- a/model/include/model/comm_drv_signalk_net.h +++ b/model/include/model/comm_drv_signalk_net.h @@ -55,7 +55,7 @@ class CommDriverSignalKNetEvent; class CommDriverSignalKNet : public CommDriverSignalK, public wxEvtHandler { public: - CommDriverSignalKNet(const ConnectionParams *params, DriverListener& l); + CommDriverSignalKNet(const ConnectionParams *params, DriverListener &l); virtual ~CommDriverSignalKNet(); void Open(); @@ -64,16 +64,15 @@ class CommDriverSignalKNet : public CommDriverSignalK, public wxEvtHandler { static bool DiscoverSKServer(std::string serviceIdent, wxString &ip, int &port, int tSec); - void SetThreadRunning(bool active) { m_threadActive = active; } void SetThreadRunFlag(int run) { m_Thread_run_flag = run; } void ResetWatchdog() { m_dog_value = N_DOG_TIMEOUT; } void SetWatchdog(int n) { m_dog_value = n; } -/** Register driver and possibly do other post-ctor steps. */ + /** Register driver and possibly do other post-ctor steps. */ void Activate() override; - void handle_SK_sentence(CommDriverSignalKNetEvent& event); + void handle_SK_sentence(CommDriverSignalKNetEvent &event); void handleUpdate(const rapidjson::Value &update); void updateItem(const rapidjson::Value &item, wxString &sfixtime); @@ -88,7 +87,7 @@ class CommDriverSignalKNet : public CommDriverSignalK, public wxEvtHandler { std::atomic_int m_threadActive; ConnectionParams m_params; - DriverListener& m_listener; + DriverListener &m_listener; static void initIXNetSystem(); @@ -98,12 +97,12 @@ class CommDriverSignalKNet : public CommDriverSignalK, public wxEvtHandler { wxIPV4address m_addr; wxIPV4address GetAddr() const { return m_addr; } - int m_dog_value; + int m_dog_value; - wxTimer m_socketread_watchdog_timer; - wxTimer *GetSocketThreadWatchdogTimer() { - return &m_socketread_watchdog_timer; - } + wxTimer m_socketread_watchdog_timer; + wxTimer *GetSocketThreadWatchdogTimer() { + return &m_socketread_watchdog_timer; + } OCPN_WebSocketMessageHandler *m_eventHandler; bool m_useWebSocket; @@ -115,7 +114,6 @@ class CommDriverSignalKNet : public CommDriverSignalK, public wxEvtHandler { std::string m_token; WebSocketThread *m_wsThread; - }; #endif // _SIGNALK_NET_H diff --git a/model/include/model/comm_n0183_output.h b/model/include/model/comm_n0183_output.h index c285aef75d..186c873e8a 100644 --- a/model/include/model/comm_n0183_output.h +++ b/model/include/model/comm_n0183_output.h @@ -64,7 +64,6 @@ class N0183DlgCtx { confirm_overwrite([]() { return true; }) {} }; - int SendRouteToGPS_N0183(Route* pr, const wxString& com_name, bool bsend_waypoints, Multiplexer& multiplexer, N0183DlgCtx ctx); diff --git a/model/include/model/comm_navmsg.h b/model/include/model/comm_navmsg.h index f88b6d437a..dd178751eb 100644 --- a/model/include/model/comm_navmsg.h +++ b/model/include/model/comm_navmsg.h @@ -1,4 +1,4 @@ - /************************************************************************** +/************************************************************************** * Copyright (C) 2022 - 2024 by David Register, Alec Leamas * * * * This program is free software; you can redistribute it and/or modify * @@ -57,7 +57,7 @@ struct N2kPGN { * https://www.kvaser.com/about-can/higher-layer-protocols/j1939-introduction/ */ struct N2kName { - N2kName(){}; + N2kName() {}; N2kName(uint64_t name) { value.Name = name; } std::string to_string() const { @@ -134,8 +134,8 @@ class NavAddr { public: enum class Bus { N0183, Signalk, N2000, Onenet, Plugin, TestBus, Undef }; - NavAddr(Bus b, const std::string& i) : bus(b), iface(i){}; - NavAddr() : bus(Bus::Undef), iface(""){}; + NavAddr(Bus b, const std::string& i) : bus(b), iface(i) {}; + NavAddr() : bus(Bus::Undef), iface("") {}; std::string to_string() const { return NavAddr::BusToString(bus) + " " + iface; @@ -150,7 +150,7 @@ class NavAddr { class NavAddr0183 : public NavAddr { public: - NavAddr0183(const std::string iface) : NavAddr(NavAddr::Bus::N0183, iface){}; + NavAddr0183(const std::string iface) : NavAddr(NavAddr::Bus::N0183, iface) {}; std::string to_string() const { return iface; } }; @@ -158,10 +158,10 @@ class NavAddr0183 : public NavAddr { class NavAddr2000 : public NavAddr { public: NavAddr2000(const std::string& iface, const N2kName& _name) - : NavAddr(NavAddr::Bus::N2000, iface), name(_name){}; + : NavAddr(NavAddr::Bus::N2000, iface), name(_name) {}; NavAddr2000(const std::string& iface, unsigned char _address) - : NavAddr(NavAddr::Bus::N2000, iface), name(0), address(_address){}; + : NavAddr(NavAddr::Bus::N2000, iface), name(0), address(_address) {}; std::string to_string() const { return name.to_string(); } @@ -176,10 +176,9 @@ class NavAddrPlugin : public NavAddr { : NavAddr(NavAddr::Bus::Plugin, "Plugin"), id(_id) {} }; - class NavAddrSignalK : public NavAddr { public: - NavAddrSignalK(std::string iface) : NavAddr(NavAddr::Bus::Signalk, iface){}; + NavAddrSignalK(std::string iface) : NavAddr(NavAddr::Bus::Signalk, iface) {}; std::string to_string() const { return NavAddr::to_string(); } }; @@ -187,7 +186,7 @@ class NavAddrSignalK : public NavAddr { class NavAddrTest : public NavAddr { public: NavAddrTest(std::string output_path) - : NavAddr(NavAddr::Bus::TestBus, "Test"), name(output_path){}; + : NavAddr(NavAddr::Bus::TestBus, "Test"), name(output_path) {}; const std::string name; }; @@ -211,7 +210,7 @@ class NavMsg : public KeyProvider { protected: NavMsg(const NavAddr::Bus& _bus, std::shared_ptr src) - : bus(_bus), source(src){}; + : bus(_bus), source(src) {}; }; /** @@ -231,7 +230,9 @@ class Nmea2000Msg : public NavMsg { Nmea2000Msg(const uint64_t _pgn, const std::vector& _payload, std::shared_ptr src, int _priority) - : NavMsg(NavAddr::Bus::N2000, src), PGN(_pgn), payload(_payload), + : NavMsg(NavAddr::Bus::N2000, src), + PGN(_pgn), + payload(_payload), priority(_priority) {} virtual ~Nmea2000Msg() = default; @@ -309,12 +310,11 @@ class PluginMsg : public NavMsg { const std::string name; const std::string message; - const std::string dest_host; ///< hostname, ip address or 'localhost' + const std::string dest_host; ///< hostname, ip address or 'localhost' std::string key() const { return std::string("plug.json-") + name; }; }; - /** A parsed SignalK message over ipv4 */ class SignalkMsg : public NavMsg { public: @@ -327,7 +327,7 @@ class SignalkMsg : public NavMsg { std::make_shared(NavAddr::Bus::Signalk, _iface)), context_self(_context_self), context(_context), - raw_message(_raw_message){}; + raw_message(_raw_message) {}; virtual ~SignalkMsg() = default; diff --git a/model/include/model/comm_navmsg_bus.h b/model/include/model/comm_navmsg_bus.h index f44f940f6d..3cbe25b1f0 100644 --- a/model/include/model/comm_navmsg_bus.h +++ b/model/include/model/comm_navmsg_bus.h @@ -38,7 +38,6 @@ #include "model/comm_driver.h" - /** The raw message layer, a singleton. */ class NavMsgBus : public DriverListener { public: diff --git a/model/include/model/comm_out_queue.h b/model/include/model/comm_out_queue.h index ece5214ce9..2dc5e58b40 100644 --- a/model/include/model/comm_out_queue.h +++ b/model/include/model/comm_out_queue.h @@ -77,7 +77,6 @@ std::ostream& operator<<(std::ostream& os, const PerfCounter& pc); */ class CommOutQueue { public: - /** * Insert valid line of NMEA0183 data in buffer. * @return false on errors including invalid input, else true. @@ -137,7 +136,8 @@ class CommOutQueue { using duration_ms = std::chrono::duration; duration_ms m_min_msg_gap; bool m_overrun_reported; - std::set m_rate_limits_logged;; + std::set m_rate_limits_logged; + ; }; /** A CommOutQueue limited to one message of each kind. */ @@ -172,7 +172,7 @@ class MeasuredCommOutQueue : public CommOutQueue { }; /** Simple FIFO queue without added logic. */ -class DummyCommOutQueue : public CommOutQueue { +class DummyCommOutQueue : public CommOutQueue { public: DummyCommOutQueue() {}; diff --git a/model/include/model/comm_util.h b/model/include/model/comm_util.h index c75b19eb4f..bf317985a4 100644 --- a/model/include/model/comm_util.h +++ b/model/include/model/comm_util.h @@ -28,7 +28,8 @@ #include "model/comm_navmsg.h" -bool StopAndRemoveCommDriver(std::string ident, NavAddr::Bus = NavAddr::Bus::Undef); +bool StopAndRemoveCommDriver(std::string ident, + NavAddr::Bus = NavAddr::Bus::Undef); wxString ProcessNMEA4Tags(wxString& msg); diff --git a/model/include/model/config_vars.h b/model/include/model/config_vars.h index 88a3357b58..122a039531 100644 --- a/model/include/model/config_vars.h +++ b/model/include/model/config_vars.h @@ -91,7 +91,7 @@ extern wxString g_GPS_Ident; extern wxString g_hostname; extern wxString g_SART_sound_file; extern wxString g_TalkerIdText; -extern wxString g_winPluginDir; // Base plugin directory on Windows. +extern wxString g_winPluginDir; // Base plugin directory on Windows. wxConfigBase* TheBaseConfig(); void InitBaseConfig(wxConfigBase* cfg); diff --git a/model/include/model/conn_params.h b/model/include/model/conn_params.h index 18193fd630..ecf9144cdd 100644 --- a/model/include/model/conn_params.h +++ b/model/include/model/conn_params.h @@ -30,7 +30,6 @@ #include "model/ds_porttype.h" #endif - #ifndef WX_PRECOMP #include #include @@ -71,7 +70,6 @@ typedef enum { #define CONN_ENABLE_ID 47621 - class ConnectionParamsPanel; class ConnectionParams { @@ -127,7 +125,8 @@ class ConnectionParams { std::string GetStrippedDSPort(); NavAddr::Bus GetCommProtocol(); - bool SentencePassesFilter(const wxString& sentence, FilterDirection direction); + bool SentencePassesFilter(const wxString &sentence, + FilterDirection direction); bool Valid; bool b_IsSetup; @@ -139,6 +138,6 @@ class ConnectionParams { WX_DEFINE_ARRAY(ConnectionParams *, wxArrayOfConnPrm); -wxArrayOfConnPrm* TheConnectionParams(); +wxArrayOfConnPrm *TheConnectionParams(); #endif diff --git a/model/include/model/cutil.h b/model/include/model/cutil.h index bc11b00945..c5b339d25f 100644 --- a/model/include/model/cutil.h +++ b/model/include/model/cutil.h @@ -37,7 +37,6 @@ #include - #ifdef __cplusplus extern "C" int mysnprintf(char *buffer, int count, const char *format, ...); @@ -57,7 +56,4 @@ extern long __stdcall MyUnhandledExceptionFilter( #endif #endif - - - #endif diff --git a/model/include/model/dbus_instance_check.h b/model/include/model/dbus_instance_check.h index 05b4d0ea3b..4ef1b487cd 100644 --- a/model/include/model/dbus_instance_check.h +++ b/model/include/model/dbus_instance_check.h @@ -25,7 +25,6 @@ /** InstanceCheck implementation based on DBus */ class DbusInstanceCheck : public InstanceCheck { - public: DbusInstanceCheck(); diff --git a/model/include/model/dbus_server.h b/model/include/model/dbus_server.h index e5d7b68f9f..077f9e6c9e 100644 --- a/model/include/model/dbus_server.h +++ b/model/include/model/dbus_server.h @@ -93,7 +93,6 @@ static void HandleMethodCall(GDBusConnection* connection, const gchar* sender, */ class DbusServer : public LocalServerApi, public InstanceCheck { public: - static DbusServer& GetInstance(); /** Clear current singleton instance and disconnect from session bus */ diff --git a/model/include/model/garmin_protocol_mgr.h b/model/include/model/garmin_protocol_mgr.h index 7c130d511d..cc72cef606 100644 --- a/model/include/model/garmin_protocol_mgr.h +++ b/model/include/model/garmin_protocol_mgr.h @@ -43,7 +43,6 @@ #include #endif - #include #ifndef WX_PRECOMP @@ -56,7 +55,7 @@ // newer versions of glib define its own GSocket but we unfortunately use this // name in our own (semi-)public header and so can't change it -- rename glib // one instead -//#include +// #include #define GSocket GlibGSocket #include #undef GSocket @@ -275,9 +274,8 @@ class GARMIN_Serial_Thread : public wxThread { //------------------------------------------------------------------------------------------------------------- class GARMIN_USB_Thread : public wxThread { public: - GARMIN_USB_Thread(GarminProtocolHandler *parent, - wxEvtHandler *MessageTarget, unsigned int device_handle, - size_t max_tx_size); + GARMIN_USB_Thread(GarminProtocolHandler *parent, wxEvtHandler *MessageTarget, + unsigned int device_handle, size_t max_tx_size); ~GARMIN_USB_Thread(void); void *Entry(); diff --git a/model/include/model/geodesic.h b/model/include/model/geodesic.h index 01bb770a45..6608f50e36 100644 --- a/model/include/model/geodesic.h +++ b/model/include/model/geodesic.h @@ -13,11 +13,11 @@ #define GEODESIC_WGS84_SEMI_MINORAXIS 6356752.3142 #define GEODESIC_DEG2RAD(d) ((d) * (M_PI / 180.0)) #define GEODESIC_RAD2DEG(r) ((r) * (180.0 / M_PI)) -#define GEODESIC_METERS2NM(m) ((m)*0.000539956803) +#define GEODESIC_METERS2NM(m) ((m) * 0.000539956803) #define GEODESIC_NM2METERS(nm) ((nm) / 0.000539956803) -#define GEODESIC_METERS2FT(m) ((m)*3.2808399) +#define GEODESIC_METERS2FT(m) ((m) * 3.2808399) #define GEODESIC_FT2METERS(ft) ((ft) / 3.2808399) -#define GEODESIC_MPERS2KT(mpers) ((mpers)*1.9438445) +#define GEODESIC_MPERS2KT(mpers) ((mpers) * 1.9438445) #define GEODESIC_KT2MPERS(mpers) ((mpers) / 1.9438445) class Geodesic { diff --git a/model/include/model/georef.h b/model/include/model/georef.h index c9d5a809fc..2b20ab62b3 100644 --- a/model/include/model/georef.h +++ b/model/include/model/georef.h @@ -268,4 +268,4 @@ typedef struct { int n_par; } lm_data_type; -#endif // guard +#endif // guard diff --git a/model/include/model/idents.h b/model/include/model/idents.h index 9978d05c58..141dec840a 100644 --- a/model/include/model/idents.h +++ b/model/include/model/idents.h @@ -168,12 +168,10 @@ enum { }; - enum { TIME_TYPE_UTC = 1, TIME_TYPE_LMT, TIME_TYPE_COMPUTER }; -#define DS_SOCKET_ID 5001 -#define DS_SERVERSOCKET_ID 5002 +#define DS_SOCKET_ID 5001 +#define DS_SERVERSOCKET_ID 5002 #define DS_ACTIVESERVERSOCKET_ID 5003 - #endif // _IDENTS_H__ diff --git a/model/include/model/instance_check.h b/model/include/model/instance_check.h index b88139070d..67acd01078 100644 --- a/model/include/model/instance_check.h +++ b/model/include/model/instance_check.h @@ -25,25 +25,25 @@ /** Common interface for all instance checkers. */ class InstanceCheck { public: - /** @return Reference to an InstanceCheck implementation. */ - static InstanceCheck& GetInstance(); + /** @return Reference to an InstanceCheck implementation. */ + static InstanceCheck& GetInstance(); - virtual ~InstanceCheck() = default; + virtual ~InstanceCheck() = default; - /** Return true if this process is the primary opencpn instance. */ - virtual bool IsMainInstance() = 0; + /** Return true if this process is the primary opencpn instance. */ + virtual bool IsMainInstance() = 0; - /** Wait until this object can be used for example for Dbus connection. */ - virtual void WaitUntilValid() {}; + /** Wait until this object can be used for example for Dbus connection. */ + virtual void WaitUntilValid() {}; - /** - * Remove all persistent instance state, including possible lock file - * and defunct opencpn processes. - */ - virtual void CleanUp() {}; + /** + * Remove all persistent instance state, including possible lock file + * and defunct opencpn processes. + */ + virtual void CleanUp() {}; - /** Do whatever needed before wxWidget's checks triggers. */ - virtual void OnExit () {}; + /** Do whatever needed before wxWidget's checks triggers. */ + virtual void OnExit() {}; }; /** Empty place holder, primarely for Android. */ @@ -54,7 +54,7 @@ class DummyInstanceChk : public InstanceCheck { return instance; } - virtual bool IsMainInstance() { return true; } + virtual bool IsMainInstance() { return true; } }; -#endif // INSTANCE_CHECK_H__ +#endif // INSTANCE_CHECK_H__ diff --git a/model/include/model/ipc_api.h b/model/include/model/ipc_api.h index 3ab90ea7c9..1c643f3a4c 100644 --- a/model/include/model/ipc_api.h +++ b/model/include/model/ipc_api.h @@ -36,20 +36,16 @@ std::string GetSocketPath(); /** * Implement LocalClientApi using a filesystem fifo/socket. */ -class IpcClientConnection : public wxConnection { -friend class IpcClient; +class IpcClientConnection : public wxConnection { + friend class IpcClient; public: - - private: IpcClientConnection() : wxConnection() {} }; - class IpcClient : public wxClient, public LocalClientApi { public: - IpcClient(const std::string& path); IpcClient() : IpcClient(GetSocketPath()) {} @@ -64,22 +60,20 @@ class IpcClient : public wxClient, public LocalClientApi { wxConnectionBase* connection; }; - class IpcServer; // forward /** * Started by IpcServer on filesystem fifo/socket connects. */ -class IpcConnection: public wxConnection { -friend class IpcServer; +class IpcConnection : public wxConnection { + friend class IpcServer; public: static LocalServerApi& GetInstance(); static void ReleaseInstance(); IpcConnection(IpcConnection&) = delete; - void operator= (const IpcConnection&) = delete; - + void operator=(const IpcConnection&) = delete; IpcServer& server; @@ -92,7 +86,7 @@ friend class IpcServer; * - get_api_endpoint, returns endpoint string. */ const void* OnRequest(const wxString& topic, const wxString& item, - size_t* size, wxIPCFormat format) ; + size_t* size, wxIPCFormat format); protected: IpcConnection(IpcServer& s) : server(s) {} @@ -107,19 +101,18 @@ friend class IpcServer; */ class IpcServer : public wxServer, public LocalServerApi { public: - const bool is_connected; + const bool is_connected; - IpcServer(const std::string& path) - : wxServer(), is_connected(Create(path)) {} + IpcServer(const std::string& path) : wxServer(), is_connected(Create(path)) {} - IpcServer() : IpcServer(GetSocketPath()) {} + IpcServer() : IpcServer(GetSocketPath()) {} - wxConnectionBase* OnAcceptConnection(const wxString& topic) { - return new IpcConnection(*this); - } + wxConnectionBase* OnAcceptConnection(const wxString& topic) { + return new IpcConnection(*this); + } - /** void, we are serving as long as there is a ServerFactory. */ - void Serve() {} + /** void, we are serving as long as there is a ServerFactory. */ + void Serve() {} }; /** @@ -127,25 +120,24 @@ class IpcServer : public wxServer, public LocalServerApi { */ class DummyIpcServer : public LocalServerApi { public: - static DummyIpcServer& GetInstance() { - static DummyIpcServer server; - return server; - } + static DummyIpcServer& GetInstance() { + static DummyIpcServer server; + return server; + } - DummyIpcServer() {} - DummyIpcServer(const std::string& path) {} + DummyIpcServer() {} + DummyIpcServer(const std::string& path) {} - wxConnectionBase* OnAcceptConnection(const wxString& topic) { - assert(false && "OnAcceptConnection called in DummyIpcServer"); - return nullptr; // not reachable, for the compiler - } + wxConnectionBase* OnAcceptConnection(const wxString& topic) { + assert(false && "OnAcceptConnection called in DummyIpcServer"); + return nullptr; // not reachable, for the compiler + } - void Serve() {} + void Serve() {} }; -class DummyIpcClient : public LocalClientApi { +class DummyIpcClient : public LocalClientApi { public: - DummyIpcClient(const std::string& path) {} DummyIpcClient() {} @@ -168,10 +160,8 @@ class DummyIpcClient : public LocalClientApi { wxConnectionBase* OnMakeConnection() { assert(false && "OnMakeConnection called in DummyIpcServer"); - return nullptr; // not reachable, for the compiler + return nullptr; // not reachable, for the compiler } }; - - #endif // _IPC_API_H__ diff --git a/model/include/model/json_event.h b/model/include/model/json_event.h index f798594348..fbfec720f8 100644 --- a/model/include/model/json_event.h +++ b/model/include/model/json_event.h @@ -11,17 +11,17 @@ /** Handle sending of wxJson messages to all plugins. */ class JsonEvent { public: -static JsonEvent& getInstance() { + static JsonEvent& getInstance() { static JsonEvent instance; return instance; -} + } -void Notify(const std::string& message, std::shared_ptr msg_root) { + void Notify(const std::string& message, std::shared_ptr msg_root) { event.Notify(msg_root, message, 0); -} + } private: -EventVar event; + EventVar event; }; #endif diff --git a/model/include/model/local_api.h b/model/include/model/local_api.h index 5ffa4e21aa..af281edf6f 100644 --- a/model/include/model/local_api.h +++ b/model/include/model/local_api.h @@ -47,21 +47,19 @@ using LocalApiResult = std::pair; enum class CmdlineAction { Raise, Quit, Open, GetRestEndpoint, Fail, Skip }; - -class LocalApiException : public std::exception { +class LocalApiException : public std::exception { public: LocalApiException(const std::string why) : reason(why) {} const char* str() { return reason.c_str(); } + private: std::string reason; }; - /** Base interface for local server command handling. */ class LocalServerApi { public: - /** @return Reference to a LocalServerApi implementation. */ static LocalServerApi& GetInstance(); @@ -86,8 +84,7 @@ class LocalServerApi { protected: LocalServerApi() - : get_rest_api_endpoint_cb([](){ return "0.0.0.0/1024"; }) {} - + : get_rest_api_endpoint_cb([]() { return "0.0.0.0/1024"; }) {} }; /** Base interface for local clients. */ @@ -98,9 +95,9 @@ class LocalClientApi { LocalClientApi() = default; virtual ~LocalClientApi() = default; - virtual LocalApiResult HandleCmdline(const wxCmdLineParser& parser); - virtual LocalApiResult HandleCmdline(CmdlineAction action, const std::string& arg); + virtual LocalApiResult HandleCmdline(CmdlineAction action, + const std::string& arg); virtual LocalApiResult SendRaise() = 0; virtual LocalApiResult SendOpen(const char* path) = 0; @@ -111,4 +108,4 @@ class LocalClientApi { CmdlineAction ParseArgs(const wxCmdLineParser& parser, std::string& arg); }; -#endif // LOCAL_SERVER_API__ +#endif // LOCAL_SERVER_API__ diff --git a/model/include/model/mDNS_query.h b/model/include/model/mDNS_query.h index 3a748f1a60..9aa5b9cd30 100644 --- a/model/include/model/mDNS_query.h +++ b/model/include/model/mDNS_query.h @@ -38,11 +38,9 @@ struct ocpn_DNS_record_t { std::string port; }; - - -extern int send_dns_sd(void); -extern void FindAllOCPNServers(size_t timeout_secs); -extern void FindAllSignalKServers(size_t timeout_secs); +extern int send_dns_sd(void); +extern void FindAllOCPNServers(size_t timeout_secs); +extern void FindAllSignalKServers(size_t timeout_secs); extern std::vector get_local_ipv4_addresses(); #endif // guard diff --git a/model/include/model/mDNS_service.h b/model/include/model/mDNS_service.h index dfa1f40bb5..f172e0f1b4 100644 --- a/model/include/model/mDNS_service.h +++ b/model/include/model/mDNS_service.h @@ -26,8 +26,7 @@ #ifndef _MDNSSERVICE_H #define _MDNSSERVICE_H -int StartMDNSService(std::string hostname, - std::string service_name, +int StartMDNSService(std::string hostname, std::string service_name, int service_port); bool StopMDNSService(); diff --git a/model/include/model/macutils.h b/model/include/model/macutils.h index bca12cb7d4..04c407945e 100644 --- a/model/include/model/macutils.h +++ b/model/include/model/macutils.h @@ -33,8 +33,8 @@ extern "C" bool ValidateSerialPortName(const char* pPortName, int iMaxNamesToSearch); extern "C" int GetMacMonitorSize(); -extern "C" int ProcessIsTranslated(); -extern "C" int IsAppleSilicon(); +extern "C" int ProcessIsTranslated(); +extern "C" int IsAppleSilicon(); #endif // __WXOSX__ diff --git a/model/include/model/mdns_cache.h b/model/include/model/mdns_cache.h new file mode 100644 index 0000000000..4b81cd136e --- /dev/null +++ b/model/include/model/mdns_cache.h @@ -0,0 +1,88 @@ + +/*************************************************************************** + * Copyright (C) 2024 Alec Leamas * + * * + * 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., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + **************************************************************************/ + +#ifndef MDNS_CACHE_H +#define MDNS_CACHE_H + +#include +#include +#include + +/** + * Singleton cache for hosts looked up using mdns. A critical region accessed + * both by timer routines and the main thread. + * + * Entries are added by the various Add() signatures. The Validate() method + * removes all entries where host does not respond to a http request on + * port 8443. + */ +class MdnsCache { +public: + struct Entry { + std::string service_instance; + std::string hostname; + std::string ip; + std::string port; + Entry(const std::string& service, const std::string host, + const std::string& _ip, const std::string _port) + : service_instance(service), hostname(host), ip(_ip), port(_port) {} + }; + + static MdnsCache& GetInstance(); + + MdnsCache& operator=(MdnsCache&) = delete; + MdnsCache(const MdnsCache&) = delete; + + /** Check that all entries are accessible, remove stale ones. */ + void Validate(); + + /** + * Add new entry to the cache + * @return true if entry was added, false if entry with same ip + * address already exists. + */ + bool Add(const Entry& entry); + + /** + * Add new entry to the cache + * @return true if entry was added, false if entry with same ip + * address already exists. + */ + bool Add(const std::string& service, const std::string& host, + const std::string& _ip, const std::string& _port); + + /** + * Add a manual entry where only IP and port is known. + * @return true if entry was added, false if entry with same ip + * address already exists. + */ + bool Add(const std::string& _ip, const std::string& _port); + + /** Return read-only cached entries reference. */ + const std::vector& GetCache() const { return m_cache; } + +private: + mutable std::mutex m_mutex; + std::vector m_cache; + + MdnsCache() = default; +}; + +#endif // MDNS_CACHE_H diff --git a/model/include/model/meteo_points.h b/model/include/model/meteo_points.h index d699842e6b..bf57946fd1 100644 --- a/model/include/model/meteo_points.h +++ b/model/include/model/meteo_points.h @@ -1,4 +1,4 @@ - /************************************************************************** +/************************************************************************** * Copyright (C) 2023 Håkan Svensson * Copyright (C) 2023 Alec Leamas * * @@ -26,46 +26,46 @@ ** Structure and content as described in IMO SN.1/Circ.289 or ** DAC367_FI33_em_version_release_3-23mar15_0**/ - struct AisMeteoData { - // Ais8_001_31, Ais8_367_33 Meteo data +struct AisMeteoData { + // Ais8_001_31, Ais8_367_33 Meteo data int original_mmsi; - int stationID; // SignalK ID - int month; // UTC 0 - int day; // UTC 0 - int hour; // UTC 24 - int minute; // UTC 60 - int pos_acc; // low = 0 GNSS - int wind_kn; // NAN=127 - int wind_gust_kn; // kn NAN=127/122 - int wind_dir; // NAN=360 - int wind_gust_dir; // NAN=360 - double air_temp; // C NAN = -102.4 - int rel_humid; // % NAN = 101 - double dew_point; // NAN = 501(50.1) - int airpress; // value+799 hPa NAN = 511(1310) - int airpress_tend; // NAN = 3 - double hor_vis; // NAN = 127(12.7) - bool hor_vis_GT; // Greater than - double water_lev_dev; // Water level deviation (incl.tide) NAN = 30 - double water_level; // Water level NAN = -32,768 - int water_lev_trend; // NAN = 3 - double current; // kn NAN = 255(25.5) - int curr_dir; // NAN = 360 - double wave_height; // m NAN=255(24.5) - int wave_period; // s NAN = 63 - int wave_dir; // NAN = 360 - double swell_height; // m NAN = 255 (25.5) - int swell_per; // s NAN = 63 - int swell_dir; // NAN=360 - int seastate; // Bf NAN=13 - double water_temp; // C NAN = 501(50.1) - int precipitation; // type NAN=7 - double salinity; // ‰ NAN=510(50.0) - int ice; // NAN=3 - int vertical_ref; // NAN=14 - }; + int stationID; // SignalK ID + int month; // UTC 0 + int day; // UTC 0 + int hour; // UTC 24 + int minute; // UTC 60 + int pos_acc; // low = 0 GNSS + int wind_kn; // NAN=127 + int wind_gust_kn; // kn NAN=127/122 + int wind_dir; // NAN=360 + int wind_gust_dir; // NAN=360 + double air_temp; // C NAN = -102.4 + int rel_humid; // % NAN = 101 + double dew_point; // NAN = 501(50.1) + int airpress; // value+799 hPa NAN = 511(1310) + int airpress_tend; // NAN = 3 + double hor_vis; // NAN = 127(12.7) + bool hor_vis_GT; // Greater than + double water_lev_dev; // Water level deviation (incl.tide) NAN = 30 + double water_level; // Water level NAN = -32,768 + int water_lev_trend; // NAN = 3 + double current; // kn NAN = 255(25.5) + int curr_dir; // NAN = 360 + double wave_height; // m NAN=255(24.5) + int wave_period; // s NAN = 63 + int wave_dir; // NAN = 360 + double swell_height; // m NAN = 255 (25.5) + int swell_per; // s NAN = 63 + int swell_dir; // NAN=360 + int seastate; // Bf NAN=13 + double water_temp; // C NAN = 501(50.1) + int precipitation; // type NAN=7 + double salinity; // ‰ NAN=510(50.0) + int ice; // NAN=3 + int vertical_ref; // NAN=14 +}; - /** +/** * Add a new point to the list of Meteo stations */ class AisMeteoPoint { @@ -85,13 +85,14 @@ class AisMeteoPoint { * Since several nations have chose not to use individual mmsi ID * for each station but the same for all we need to separate them * by its position. Every station is allocated a unique Meteo ID. - * This list collect them and is used to destine each data update to whom it belongs. + * This list collect them and is used to destine each data update to whom it + * belongs. */ class AisMeteoPoints { public: static AisMeteoPoints& GetInstance() { - static AisMeteoPoints me; - return me; + static AisMeteoPoints me; + return me; } std::vector& GetPoints() { return points; } @@ -103,5 +104,4 @@ class AisMeteoPoints { std::vector points; }; - #endif diff --git a/model/include/model/multiplexer.h b/model/include/model/multiplexer.h index f50e75be20..083e96beae 100644 --- a/model/include/model/multiplexer.h +++ b/model/include/model/multiplexer.h @@ -37,22 +37,20 @@ class Multiplexer; // forward -extern Multiplexer* g_pMUX; +extern Multiplexer *g_pMUX; struct MuxLogCallbacks { std::function log_is_active; - std::function log_message; + std::function log_message; MuxLogCallbacks() - : log_is_active([]() { return false; }), - log_message([](const std::string& s) { }) { } - + : log_is_active([]() { return false; }), + log_message([](const std::string &s) {}) {} }; - class Multiplexer : public wxEvtHandler { public: Multiplexer(MuxLogCallbacks log_callbacks, - bool& legacy_input_filter_behaviour ); + bool &legacy_input_filter_behaviour); ~Multiplexer(); void LogOutputMessage(const wxString &msg, wxString stream_name, @@ -62,7 +60,8 @@ class Multiplexer : public wxEvtHandler { void LogInputMessage(const wxString &msg, const wxString &stream_name, bool b_filter, bool b_error = false); - bool IsLogActive() { return m_log_callbacks.log_is_active();} + bool IsLogActive() { return m_log_callbacks.log_is_active(); } + private: // comm event listeners ObservableListener listener_N2K_All; @@ -78,6 +77,6 @@ class Multiplexer : public wxEvtHandler { MuxLogCallbacks m_log_callbacks; unsigned int last_pgn_logged; int n_N2K_repeat; - bool& m_legacy_input_filter_behaviour; + bool &m_legacy_input_filter_behaviour; }; #endif // _MULTIPLEXER_H__ diff --git a/model/include/model/nav_object_database.h b/model/include/model/nav_object_database.h index 94020e52f8..bdbab2194a 100644 --- a/model/include/model/nav_object_database.h +++ b/model/include/model/nav_object_database.h @@ -94,20 +94,19 @@ Track *TrackExists(const wxString &guid); Route *FindRouteContainingWaypoint(RoutePoint *pWP); Route *GPXLoadRoute1(pugi::xml_node &wpt_node, bool b_fullviz, bool b_layer, - bool b_layerviz, int layer_id, bool b_change, bool load_points = true); + bool b_layerviz, int layer_id, bool b_change, + bool load_points = true); RoutePoint *GPXLoadWaypoint1(pugi::xml_node &wpt_node, wxString symbol_name, wxString GUID, bool b_fullviz, bool b_layer, bool b_layerviz, int layer_id); +bool InsertRouteA(Route *pTentRoute, NavObjectCollection1 *navobj); +bool InsertTrack(Track *pTentTrack, bool bApplyChanges = false); +bool InsertWpt(RoutePoint *pWp, bool overwrite); -bool InsertRouteA(Route* pTentRoute, NavObjectCollection1* navobj); -bool InsertTrack(Track* pTentTrack, bool bApplyChanges = false); -bool InsertWpt(RoutePoint* pWp, bool overwrite); - - -Track *GPXLoadTrack1(pugi::xml_node &trk_node, bool b_fullviz, - bool b_layer, bool b_layerviz, int layer_id); +Track *GPXLoadTrack1(pugi::xml_node &trk_node, bool b_fullviz, bool b_layer, + bool b_layerviz, int layer_id); class NavObjectCollection1 : public pugi::xml_document { public: @@ -119,7 +118,7 @@ class NavObjectCollection1 : public pugi::xml_document { bool CreateNavObjGPXTracks(void); void AddGPXRoutesList(RouteList *pRoutes); - void AddGPXTracksList(std::vector *pTracks); + void AddGPXTracksList(std::vector *pTracks); bool AddGPXPointsList(RoutePointList *pRoutePoints); bool AddGPXRoute(Route *pRoute); bool AddGPXTrack(Track *pTrk); @@ -142,26 +141,26 @@ class NavObjectCollection1 : public pugi::xml_document { }; class NavObjectChanges : public NavObjectCollection1 { -friend class MyConfig; + friend class MyConfig; public: static std::unique_ptr getTempInstance() { return std::unique_ptr(new NavObjectChanges()); } - static NavObjectChanges* getInstance() { - static NavObjectChanges* instance = 0; + static NavObjectChanges *getInstance() { + static NavObjectChanges *instance = 0; if (!instance) instance = new NavObjectChanges(); return instance; } - void Init(const wxString& path) { - m_filename = path; - m_changes_file = fopen(m_filename.mb_str(), "a"); + void Init(const wxString &path) { + m_filename = path; + m_changes_file = fopen(m_filename.mb_str(), "a"); } - NavObjectChanges(const NavObjectChanges&) = delete; - void operator=(const NavObjectChanges&) = delete; + NavObjectChanges(const NavObjectChanges &) = delete; + void operator=(const NavObjectChanges &) = delete; ~NavObjectChanges(); void AddRoute(Route *pr, const char *action); // support "changes" file set @@ -197,7 +196,6 @@ friend class MyConfig; */ EventVar evt_delete_route; - private: NavObjectChanges() : NavObjectCollection1() { m_changes_file = 0; diff --git a/model/include/model/navutil_base.h b/model/include/model/navutil_base.h index 016dbd9b54..48f428c4ba 100644 --- a/model/include/model/navutil_base.h +++ b/model/include/model/navutil_base.h @@ -32,7 +32,6 @@ #include "model/config_vars.h" - enum { SPEED_KTS = 0, SPEED_MPH, SPEED_KMH, SPEED_MS }; enum { WSPEED_KTS = 0, WSPEED_MS, WSPEED_MPH, WSPEED_KMH }; enum { DEPTH_FT = 0, DEPTH_M, DEPTH_FA }; @@ -58,7 +57,6 @@ class GpxDocument { static int GetRandomNumber(int min, int max); }; - extern wxString toSDMM(int NEflag, double a, bool hi_precision = true); extern double toUsrSpeed(double kts_speed, int unit = -1); extern double toUsrWindSpeed(double kts_speed, int unit = -1); @@ -87,4 +85,4 @@ extern double fromDMM(wxString sdms); extern double toMagnetic(double deg_true); extern double toMagnetic(double deg_true, double variation); -#endif // _NAVUTIL_BASE__ +#endif // _NAVUTIL_BASE__ diff --git a/model/include/model/nmea_ctx_factory.h b/model/include/model/nmea_ctx_factory.h index edaee0dc38..e02ba4364a 100644 --- a/model/include/model/nmea_ctx_factory.h +++ b/model/include/model/nmea_ctx_factory.h @@ -31,7 +31,7 @@ static NmeaContext NmeaCtxFactory() { NmeaContext ctx; - ctx.get_talker_id = []() { return g_TalkerIdText; }; + ctx.get_talker_id = []() { return g_TalkerIdText; }; ctx.get_apb_precision = []() { return g_NMEAAPBPrecision; }; return ctx; } diff --git a/model/include/model/nmea_log.h b/model/include/model/nmea_log.h index 02a74b5b64..36aa667d24 100644 --- a/model/include/model/nmea_log.h +++ b/model/include/model/nmea_log.h @@ -5,7 +5,6 @@ class NmeaLog { public: - /** Add an formatted string to log output. */ virtual void Add(const wxString& s) = 0; @@ -13,4 +12,4 @@ class NmeaLog { virtual bool Active() const = 0; }; -#endif // _ABSTRACT_NMEA_LOG__ +#endif // _ABSTRACT_NMEA_LOG__ diff --git a/model/include/model/ocpn_types.h b/model/include/model/ocpn_types.h index 5ac4b11815..54c3aca490 100644 --- a/model/include/model/ocpn_types.h +++ b/model/include/model/ocpn_types.h @@ -32,9 +32,6 @@ #include - - - // ChartType constants typedef enum ChartTypeEnum { CHART_TYPE_UNKNOWN = 0, @@ -57,7 +54,6 @@ typedef enum ChartFamilyEnum { CHART_FAMILY_DONTCARE } _ChartFamilyEnum; - //---------------------------------------------------------------------------- // ocpn Toolbar stuff //---------------------------------------------------------------------------- @@ -87,4 +83,4 @@ typedef struct { bool arrival; } ActiveLegDat; -#endif // _OCPNTYPES_H__ +#endif // _OCPNTYPES_H__ diff --git a/model/include/model/peer_client.h b/model/include/model/peer_client.h index 72444b40a8..f7a3efd1a2 100644 --- a/model/include/model/peer_client.h +++ b/model/include/model/peer_client.h @@ -42,11 +42,11 @@ enum class PeerDlgResult { Ok, Cancel, HasPincode }; enum class PeerDlg { PinConfirm, InvalidHttpResponse, - ErrorReturn, // Unexpected result code in json server reply. + ErrorReturn, // Unexpected result code in json server reply. TransferOk, ActivateUnsupported, JsonParseError, - BadPincode // User pincode not accepted by server + BadPincode // User pincode not accepted by server }; struct PeerData { diff --git a/model/include/model/pincode.h b/model/include/model/pincode.h index f555828c37..65f083797f 100644 --- a/model/include/model/pincode.h +++ b/model/include/model/pincode.h @@ -1,5 +1,5 @@ - /*************************************************************************** +/*************************************************************************** * Copyright (C) 2023 Alec Leamas * * * * This program is free software; you can redistribute it and/or modify * @@ -49,7 +49,6 @@ class Pincode { private: uint64_t m_value; - }; #endif // OPENCPN_INCLUDE_PINCODE_H_ diff --git a/model/include/model/plugin_blacklist.h b/model/include/model/plugin_blacklist.h index 0dd6088be9..a5ade3b0cd 100644 --- a/model/include/model/plugin_blacklist.h +++ b/model/include/model/plugin_blacklist.h @@ -39,10 +39,10 @@ #endif typedef enum class plug_status { - unblocked, /** Not blocked for any reason */ - unloadable, /** Tried with load error */ - hard, /** Hard block from code or configuration */ - soft /** Soft block: load with a warning. */ + unblocked, /** Not blocked for any reason */ + unloadable, /** Tried with load error */ + hard, /** Hard block from code or configuration */ + soft /** Soft block: load with a warning. */ } plug_status; typedef struct plug_data { @@ -51,11 +51,10 @@ typedef struct plug_data { int minor; plug_data(std::string n, int _major, int _minor) - : name(n), major(_major), minor(_minor) {} + : name(n), major(_major), minor(_minor) {} } plug_data; - /** * Plugins could be blacklisted in runtime if they are unloadable or in * hardcoded, compile-time list. @@ -70,11 +69,11 @@ class AbstractBlacklist { virtual ~AbstractBlacklist() = default; /** Return status for given official plugin name and version. */ - virtual plug_status get_status(const std::string& name, - int _major, int _minor) = 0; + virtual plug_status get_status(const std::string& name, int _major, + int _minor) = 0; /** Return status for given official plugin name and version. */ - virtual plug_status get_status(const plug_data pd) = 0; + virtual plug_status get_status(const plug_data pd) = 0; /** Best effort attempt to get data for a library file. */ virtual plug_data get_library_data(const std::string& library_file) = 0; @@ -89,8 +88,8 @@ class AbstractBlacklist { * Given plugin name and version mark it as unloadable. * @return true if plugin was already marked, else false. **/ - virtual bool mark_unloadable(const std::string& name, - int major, int minor) = 0; + virtual bool mark_unloadable(const std::string& name, int major, + int minor) = 0; /** Return true iff plugin (a path) is loadable. */ virtual bool is_loadable(const std::string path) = 0; diff --git a/model/include/model/plugin_handler.h b/model/include/model/plugin_handler.h index c88e8209cf..a40bae98b2 100644 --- a/model/include/model/plugin_handler.h +++ b/model/include/model/plugin_handler.h @@ -87,7 +87,6 @@ class CompatOs { class PluginHandler { public: - EventVar evt_download_ok; EventVar evt_download_failed; @@ -137,9 +136,9 @@ class PluginHandler { const std::vector getAvailable(); /** - * Return list of available, unique and compatible plugins from - * configured XML catalog. - */ + * Return list of available, unique and compatible plugins from + * configured XML catalog. + */ std::vector getCompatiblePlugins(); /** Map of available plugin targets -> number of occurences. */ @@ -187,14 +186,37 @@ class PluginHandler { std::vector installed; CatalogData catalogData; std::string last_error_msg; - bool InstallPlugin(const std::string& path,std::string& filelist, - const std::string metadata_path, - bool only_metadata); + bool InstallPlugin(const std::string& path, std::string& filelist, + const std::string metadata_path, bool only_metadata); + /** + * Internal helper function to extract a tarball into platform-specific user + * directories. + * + * @param path: Path to tarball. + * @param filelist: On return contains a list of files installed. + * @param metadata_path: If non-empty, location where to extract plugin + * metadata.xml file. + * @param only_metadata: If true don't install any files, just extract + * the metadata.xml file. + * @return true if tarball could be extracted and contains metadata.xml + * file. false otherwise. + */ bool explodeTarball(struct archive* src, struct archive* dest, - std::string& filelist, - const std::string& metadata_path, + std::string& filelist, const std::string& metadata_path, bool only_metadata); + /** + * Extract a tarball into platform-specific user directories. + * + * @param path: Path to tarball. + * @param filelist: On return contains a list of files installed. + * @param metadata_path: If non-empty, location where to extract plugin + * metadata.xml file. + * @param only_metadata: If true don't install any files, just extract + * the metadata.xml file. + * @return true if tarball could be extracted and contains metadata.xml + * file. false otherwise. + */ bool extractTarball(const std::string path, std::string& filelist, const std::string metadata_path = "", bool only_metadata = false); diff --git a/model/include/model/plugin_loader.h b/model/include/model/plugin_loader.h index 5e2d172a9f..ce6342009e 100644 --- a/model/include/model/plugin_loader.h +++ b/model/include/model/plugin_loader.h @@ -68,7 +68,7 @@ class PlugInData { PlugInData(); - bool m_has_setup_options; //!< Has run NotifySetupOptionsPlugin() + bool m_has_setup_options; //!< Has run NotifySetupOptionsPlugin() bool m_enabled; bool m_init_state; bool m_toolbox_panel; diff --git a/model/include/model/plugin_paths.h b/model/include/model/plugin_paths.h index 86a7ce18d1..7c26051a2a 100644 --- a/model/include/model/plugin_paths.h +++ b/model/include/model/plugin_paths.h @@ -1,7 +1,6 @@ #include #include - /** Join a list of directories to a string. */ std::string join(std::vector v, char c); diff --git a/model/include/model/rest_server.h b/model/include/model/rest_server.h index b2f8612000..5b6f73c2b0 100644 --- a/model/include/model/rest_server.h +++ b/model/include/model/rest_server.h @@ -32,9 +32,9 @@ #include "observable_evtvar.h" - // MacOS 1.13: -#if (defined(OCPN_GHC_FILESYSTEM) || (defined(__clang_major__) && (__clang_major__ < 15))) +#if (defined(OCPN_GHC_FILESYSTEM) || \ + (defined(__clang_major__) && (__clang_major__ < 15))) #include namespace fs = ghc::filesystem; @@ -219,7 +219,6 @@ class RouteCtx { * Result codes are as defined in RestServerResult. */ class AbstractRestServer { - public: /** Start the server thread. */ virtual bool StartServer(const fs::path& certificate_location) = 0; diff --git a/model/include/model/route.h b/model/include/model/route.h index ca074eb9bf..cbec81067b 100644 --- a/model/include/model/route.h +++ b/model/include/model/route.h @@ -47,7 +47,7 @@ #define RTE_TIME_DISP_LOCAL _T("LOCAL") #define RTE_UNDEF_DEPARTURE wxInvalidDateTime -class WayPointman; // FIXME (leamas) why? routeman.h defines this. +class WayPointman; // FIXME (leamas) why? routeman.h defines this. extern WayPointman *pWayPointMan; @@ -73,7 +73,7 @@ const int StyleValues[] = {-1, wxSOLID, wxDOT, const int WidthValues[] = {-1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; class Route : public wxObject { -friend class RouteGui; + friend class RouteGui; public: Route(); @@ -84,10 +84,11 @@ friend class RouteGui; void AddPoint(RoutePoint *pNewPoint, bool b_rename_in_sequence = true, bool b_deferBoxCalc = false); void InsertPointAndSegment(RoutePoint *pNewPoint, int insert_after, - bool b_rename_in_sequence = true, - bool b_deferBoxCalc = false); - void AddPointAndSegment(RoutePoint *pNewPoint, bool b_rename_in_sequence = true, - bool b_deferBoxCalc = false); + bool b_rename_in_sequence = true, + bool b_deferBoxCalc = false); + void AddPointAndSegment(RoutePoint *pNewPoint, + bool b_rename_in_sequence = true, + bool b_deferBoxCalc = false); RoutePoint *GetPoint(int nPoint); RoutePoint *GetPoint(const wxString &guid); int GetIndexOf(RoutePoint *prp); diff --git a/model/include/model/route_point.h b/model/include/model/route_point.h index 7ef8804c6f..be1b28dbc6 100644 --- a/model/include/model/route_point.h +++ b/model/include/model/route_point.h @@ -38,7 +38,7 @@ #define MAX_INT_VAL 2147483647 // max possible integer value before 'rollover' // minimal allowed ScaMin setting. prevents always hiding -#define SCAMIN_MIN 800 +#define SCAMIN_MIN 800 #define ETA_FORMAT_STR "%x %H:%M" //"%d/%m/%Y %H:%M" //"%Y-%m-%d %H:%M" @@ -51,7 +51,7 @@ extern int g_LayerIdx; extern wxRect g_blink_rect; class RoutePoint { -friend class RoutePointGui; + friend class RoutePointGui; public: RoutePoint(double lat, double lon, const wxString &icon_ident, @@ -67,7 +67,7 @@ friend class RoutePointGui; * doing nothing but at an "early stage" initiated do do the actual * glDeleteTextures call. */ - static std::function delete_gl_textures; + static std::function delete_gl_textures; void ReLoadIcon() { m_IconIsDirty = true; } @@ -228,7 +228,6 @@ friend class RoutePointGui; wxDateTime m_CreateTimeX; private: - wxString m_MarkName; wxBitmap *m_pbmIcon; wxString m_IconName; diff --git a/model/include/model/routeman.h b/model/include/model/routeman.h index 3ba36089a8..2fd85213a0 100644 --- a/model/include/model/routeman.h +++ b/model/include/model/routeman.h @@ -54,7 +54,7 @@ #define PI 3.1415926535897931160E0 /* pi */ #endif -class Routeman; // forward +class Routeman; // forward class WayPointman; // forward extern bool g_bPluginHandleAutopilotRoute; @@ -68,7 +68,7 @@ extern RoutePoint *pAnchorWatchPoint2; extern float g_ChartScaleFactorExp; -extern Routeman* g_pRouteMan; +extern Routeman *g_pRouteMan; // List definitions for Waypoint Manager Icons @@ -81,14 +81,13 @@ WX_DEFINE_ARRAY(MarkIcon *, ArrayOfMarkIcon); /** Callbacks for RoutePropDlg */ struct RoutePropDlgCtx { - std::function set_route_and_update; - std::function set_enroute_point; - std::function hide; - RoutePropDlgCtx() : - set_route_and_update([&](Route* r) {}), - set_enroute_point([&](Route* r, RoutePoint* rt) {}), - hide([&](Route* r) {}) - { } + std::function set_route_and_update; + std::function set_enroute_point; + std::function hide; + RoutePropDlgCtx() + : set_route_and_update([&](Route *r) {}), + set_enroute_point([&](Route *r, RoutePoint *rt) {}), + hide([&](Route *r) {}) {} }; /** Routeman callbacks. */ @@ -101,33 +100,28 @@ struct RoutemanDlgCtx { std::function route_mgr_dlg_update_list_ctrl; RoutemanDlgCtx() - : confirm_delete_ais_mob([]() { return true; }), - get_global_colour([](wxString c) { return *wxBLACK; }), - show_with_fresh_fonts([]() { }), - clear_console_background([]() { }), - route_mgr_dlg_update_list_ctrl([]() { }) - {} + : confirm_delete_ais_mob([]() { return true; }), + get_global_colour([](wxString c) { return *wxBLACK; }), + show_with_fresh_fonts([]() {}), + clear_console_background([]() {}), + route_mgr_dlg_update_list_ctrl([]() {}) {} }; - //---------------------------------------------------------------------------- // Routeman //---------------------------------------------------------------------------- // class Routeman { - -friend class RoutemanGui; + friend class RoutemanGui; public: Routeman(struct RoutePropDlgCtx prop_dlg_ctx, - struct RoutemanDlgCtx route_dlg_ctx, - NmeaLog& nmea_log); + struct RoutemanDlgCtx route_dlg_ctx, NmeaLog &nmea_log); ~Routeman(); bool DeleteTrack(Track *pTrack); - bool DeleteRoute(Route *pRoute, NavObjectChanges* nav_obj_changes); - void DeleteAllRoutes(NavObjectChanges* nav_obj_changes); - + bool DeleteRoute(Route *pRoute, NavObjectChanges *nav_obj_changes); + void DeleteAllRoutes(NavObjectChanges *nav_obj_changes); bool IsRouteValid(Route *pRoute); @@ -176,6 +170,7 @@ friend class RoutemanGui; wxString GetRouteReverseMessage(void); wxString GetRouteResequenceMessage(void); + struct RoutemanDlgCtx &GetDlgContext() { return m_route_dlg_ctx; } bool m_bDataValid; @@ -189,7 +184,7 @@ friend class RoutemanGui; EventVar json_leg_info; /** Notified when a message available as GetString() is sent to garmin. */ - EventVar on_message_sent; + EventVar on_message_sent; /** Notified when list of routes is updated (no data in event) */ EventVar on_routes_update; @@ -228,7 +223,7 @@ friend class RoutemanGui; int m_arrival_test; struct RoutePropDlgCtx m_prop_dlg_ctx; struct RoutemanDlgCtx m_route_dlg_ctx; - NmeaLog& m_nmea_log; + NmeaLog &m_nmea_log; ObsListener msg_sent_listener; ObsListener active_route_listener; @@ -241,8 +236,7 @@ friend class RoutemanGui; typedef std::function GlobalColourFunc; class WayPointman { - -friend class WayPointmanGui; + friend class WayPointmanGui; public: WayPointman(GlobalColourFunc colour_func); @@ -255,7 +249,7 @@ friend class WayPointmanGui; int GetFIconImageListIndex(const wxBitmap *pbm); int GetNumIcons(void) { return m_pIconArray->Count(); } wxString CreateGUID(RoutePoint *pRP); - RoutePoint* FindWaypointByGuid(const std::string& guid); + RoutePoint *FindWaypointByGuid(const std::string &guid); RoutePoint *GetNearbyWaypoint(double lat, double lon, double radius_meters); RoutePoint *GetOtherNearbyWaypoint(double lat, double lon, double radius_meters, @@ -279,7 +273,6 @@ friend class WayPointmanGui; bool RemoveRoutePoint(RoutePoint *prp); RoutePointList *GetWaypointList(void) { return m_pWayPointList; } - private: wxImage CreateDimImage(wxImage &image, double factor); @@ -303,4 +296,4 @@ friend class WayPointmanGui; GlobalColourFunc m_get_global_colour; }; -#endif // _ROUTEMAN_H__ +#endif // _ROUTEMAN_H__ diff --git a/model/include/model/select.h b/model/include/model/select.h index 02caedeb67..ee729e845b 100644 --- a/model/include/model/select.h +++ b/model/include/model/select.h @@ -40,15 +40,16 @@ #define SELTYPE_TRACKSEGMENT 0x0100 #define SELTYPE_DRAGHANDLE 0x0200 -class Select; // forward +class Select; // forward -extern Select* pSelect; +extern Select *pSelect; struct SelectCtx { const bool show_nav_objects; const double scale; const double chart_scale; - SelectCtx(bool s, double _scale, double _chart_scale) : show_nav_objects(s), scale(_scale), chart_scale(_chart_scale) {} + SelectCtx(bool s, double _scale, double _chart_scale) + : show_nav_objects(s), scale(_scale), chart_scale(_chart_scale) {} }; class Select { @@ -69,9 +70,9 @@ class Select { float slon2, TrackPoint *pTrackPointAdd1, TrackPoint *pTrackPointAdd2, Track *pTrack); - SelectItem *FindSelection(SelectCtx& ctx, float slat, float slon, + SelectItem *FindSelection(SelectCtx &ctx, float slat, float slon, int fseltype); - SelectableItemList FindSelectionList(SelectCtx& ctx, float slat, float slon, + SelectableItemList FindSelectionList(SelectCtx &ctx, float slat, float slon, int fseltype); bool DeleteAllSelectableRouteSegments(Route *); @@ -84,7 +85,7 @@ class Select { bool DeletePointSelectableTrackSegments(TrackPoint *pt); bool IsSegmentSelected(float a, float b, float c, float d, float slat, float slon); - bool IsSelectableSegmentSelected(SelectCtx& ctx, float slat, float slon, + bool IsSelectableSegmentSelected(SelectCtx &ctx, float slat, float slon, SelectItem *pFindSel); // Generic Point Support @@ -106,11 +107,11 @@ class Select { private: // FIXME (leamas?) this is not model stuff. - void CalcSelectRadius(SelectCtx& ctx); + void CalcSelectRadius(SelectCtx &ctx); SelectableItemList *pSelectList; int pixelRadius; float selectRadius; }; -#endif // _SELECT_H__ +#endif // _SELECT_H__ diff --git a/model/include/model/sys_events.h b/model/include/model/sys_events.h index f9e12b21f9..3eff3e9621 100644 --- a/model/include/model/sys_events.h +++ b/model/include/model/sys_events.h @@ -47,4 +47,4 @@ class SystemEvents { SystemEvents() = default; }; -#endif // define SYS__EVENTS_H_ +#endif // define SYS__EVENTS_H_ diff --git a/model/include/model/track.h b/model/include/model/track.h index caa9d08eb4..56e26cc0b8 100644 --- a/model/include/model/track.h +++ b/model/include/model/track.h @@ -37,7 +37,7 @@ #include "route.h" #include "vector2D.h" -extern std::vector g_TrackList; +extern std::vector g_TrackList; struct SubTrack { SubTrack() {} @@ -46,6 +46,9 @@ struct SubTrack { double m_scale; }; +/** + * Represents a single point in a track. + */ class TrackPoint { public: TrackPoint(double lat, double lon, wxString ts = ""); @@ -57,26 +60,23 @@ class TrackPoint { void SetCreateTime(wxDateTime dt); const char *GetTimeString() { return m_stimestring.c_str(); } bool HasValidTimestamp() { - if (m_stimestring.size() != strlen("YYYY-MM-DDTHH:MM:SSZ")) - return false; + if (m_stimestring.size() < strlen("YYYY-MM-DDTHH:MM:SSZ")) return false; return true; }; double m_lat, m_lon; int m_GPXTrkSegNo; - private: void SetCreateTime(wxString ts); std::string m_stimestring; }; -//---------------------------------------------------------------------------- -// Track -//---------------------------------------------------------------------------- - +/** + * Represents a track, which is a series of connected track points. + */ class Track { -friend class TrackGui; + friend class TrackGui; public: Track(); @@ -134,7 +134,7 @@ friend class TrackGui; .FormatISOTime(); // name = rp->m_CreateTime.Format(); else name = _("(Unknown Date)"); - return name; + return name; } wxString m_GUID; @@ -163,8 +163,8 @@ friend class TrackGui; const wxString &suffix); protected: -// void Segments(ChartCanvas *cc, std::list > &pointlists, -// const LLBBox &box, double scale); + // void Segments(ChartCanvas *cc, std::list > &pointlists, + // const LLBBox &box, double scale); void DouglasPeuckerReducer(std::vector &list, std::vector &keeplist, int from, int to, double delta); @@ -176,26 +176,30 @@ friend class TrackGui; std::vector > SubTracks; private: -// void GetPointLists(ChartCanvas *cc, -// std::list > &pointlists, ViewPort &VP, -// const LLBBox &box); + // void GetPointLists(ChartCanvas *cc, + // std::list > &pointlists, ViewPort + // &VP, const LLBBox &box); void Finalize(); double ComputeScale(int left, int right); void InsertSubTracks(LLBBox &box, int level, int pos); -// -// void AddPointToList(ChartCanvas *cc, -// std::list > &pointlists, int n); -// void AddPointToLists(ChartCanvas *cc, -// std::list > &pointlists, int &last, -// int n); -// -// void Assemble(ChartCanvas *cc, std::list > &pointlists, -// const LLBBox &box, double scale, int &last, int level, int pos); -// + // + // void AddPointToList(ChartCanvas *cc, + // std::list > &pointlists, int n); + // void AddPointToLists(ChartCanvas *cc, + // std::list > &pointlists, int + // &last, int n); + // + // void Assemble(ChartCanvas *cc, std::list > &pointlists, + // const LLBBox &box, double scale, int &last, int level, int + // pos); + // wxString m_TrackNameString; }; class Route; +/** + * Represents an active track that is currently being recorded. + */ class ActiveTrack : public wxEvtHandler, public Track { public: ActiveTrack(); diff --git a/model/include/model/usb_watch_daemon.h b/model/include/model/usb_watch_daemon.h index 3bb447115d..be8a70a8db 100644 --- a/model/include/model/usb_watch_daemon.h +++ b/model/include/model/usb_watch_daemon.h @@ -59,4 +59,4 @@ class DummyWatchDaemon : public UsbWatchDaemon { }; #endif -#endif // USB_WATCH_DAEMON__H +#endif // USB_WATCH_DAEMON__H diff --git a/model/include/model/wait_continue.h b/model/include/model/wait_continue.h index 9380340fa6..a5e39cf46c 100644 --- a/model/include/model/wait_continue.h +++ b/model/include/model/wait_continue.h @@ -39,7 +39,7 @@ class WaitContinue { WaitContinue(const WaitContinue&) = delete; /** Release any threads blocked by Wait(). */ - void Continue() { + void Continue() { { std::unique_lock lock(m_mutex); is_waiting = false; @@ -52,7 +52,7 @@ class WaitContinue { std::unique_lock lock(m_mutex); is_waiting = true; auto t = std::chrono::high_resolution_clock::now() + timeout; - auto result = cv.wait_until(lock, t, [&]{ return !is_waiting; }); + auto result = cv.wait_until(lock, t, [&] { return !is_waiting; }); return true; } @@ -67,5 +67,4 @@ class WaitContinue { std::condition_variable cv; }; - -#endif // WAIT_COND__ +#endif // WAIT_COND__ diff --git a/model/include/model/win_usb_watch.h b/model/include/model/win_usb_watch.h index baeb4dc832..89c8c2d35c 100644 --- a/model/include/model/win_usb_watch.h +++ b/model/include/model/win_usb_watch.h @@ -34,7 +34,7 @@ */ class WinUsbWatchDaemon : public UsbWatchDaemon { public: - WinUsbWatchDaemon(SystemEvents& se) : UsbWatchDaemon(se), m_frame(0) {} + WinUsbWatchDaemon(SystemEvents& se) : UsbWatchDaemon(se), m_frame(0) {} virtual ~WinUsbWatchDaemon() = default; void Start(); diff --git a/model/include/model/wx_instance_chk.h b/model/include/model/wx_instance_chk.h index 520018894f..ca370c3476 100644 --- a/model/include/model/wx_instance_chk.h +++ b/model/include/model/wx_instance_chk.h @@ -29,7 +29,9 @@ class WxInstanceCheck : public InstanceCheck { public: WxInstanceCheck(); - ~WxInstanceCheck() { if (m_checker) delete m_checker; } + ~WxInstanceCheck() { + if (m_checker) delete m_checker; + } bool IsMainInstance() override; @@ -37,7 +39,6 @@ class WxInstanceCheck : public InstanceCheck { void OnExit() override; - private: void Init(); @@ -45,4 +46,4 @@ class WxInstanceCheck : public InstanceCheck { bool is_inited; }; -#endif // _WX_INST_CHECK__ +#endif // _WX_INST_CHECK__ diff --git a/model/src/ais_decoder.cpp b/model/src/ais_decoder.cpp index bc5ec96271..7460b70c73 100644 --- a/model/src/ais_decoder.cpp +++ b/model/src/ais_decoder.cpp @@ -75,11 +75,10 @@ static const long long lNaN = 0xfff8000000000000; #define NAN (*(double *)&lNaN) #endif - -wxEvtHandler* g_pais_alert_dialog_active; +wxEvtHandler *g_pais_alert_dialog_active; AisDecoder *g_pAIS; -Select* pSelectAIS; +Select *pSelectAIS; bool g_bUseOnlyConfirmedAISName; wxString GetShipNameFromFile(int); wxString AISTargetNameFileName; @@ -119,14 +118,11 @@ static int first_rx_ticks; static int rx_ticks; static double arpa_ref_hdg = NAN; - static inline double GeodesicRadToDeg(double rads) { return rads * 180.0 / M_PI; } -static inline double MS2KNOTS(double ms) { - return ms * 1.9438444924406; -} +static inline double MS2KNOTS(double ms) { return ms * 1.9438444924406; } int AisMeteoNewMmsi(int, int, int, int, int); int origin_mmsi = 0; @@ -181,19 +177,19 @@ AisDecoder::AisDecoder(AisDecoderCallbacks callbacks) m_dsc_timer.SetOwner(this, TIMER_DSC); // Create/connect a dynamic event handler slot for wxEVT_OCPN_DATASTREAM(s) - //FIXME delete Connect(wxEVT_OCPN_DATASTREAM, + // FIXME delete Connect(wxEVT_OCPN_DATASTREAM, // (wxObjectEventFunction)(wxEventFunction)&AisDecoder::OnEvtAIS); -// Connect(EVT_OCPN_SIGNALKSTREAM, -// (wxObjectEventFunction)(wxEventFunction)&AisDecoder::OnEvtSignalK); + // Connect(EVT_OCPN_SIGNALKSTREAM, + // (wxObjectEventFunction)(wxEventFunction)&AisDecoder::OnEvtSignalK); InitCommListeners(); } AisDecoder::~AisDecoder(void) { -// for (const auto &it : GetTargetList()) { -// AisTargetData *td = it.second; -// -// delete td; -// } + // for (const auto &it : GetTargetList()) { + // AisTargetData *td = it.second; + // + // delete td; + // } // Write mmsi-shipsname to file in a safe way wxTempFile outfile; @@ -239,91 +235,91 @@ AisDecoder::~AisDecoder(void) { void AisDecoder::InitCommListeners(void) { // Initialize the comm listeners - auto& msgbus = NavMsgBus::GetInstance(); + auto &msgbus = NavMsgBus::GetInstance(); - //NMEA0183 - //VDM + // NMEA0183 + // VDM Nmea0183Msg n0183_msg_VDM("VDM"); listener_N0183_VDM.Listen(n0183_msg_VDM, this, EVT_N0183_VDM); Bind(EVT_N0183_VDM, [&](ObservedEvt ev) { - auto ptr = ev.GetSharedPtr(); - auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS( n0183_msg ); - }); + auto ptr = ev.GetSharedPtr(); + auto n0183_msg = std::static_pointer_cast(ptr); + HandleN0183_AIS(n0183_msg); + }); - //FRPOS + // FRPOS Nmea0183Msg n0183_msg_FRPOS("FRPOS"); listener_N0183_FRPOS.Listen(n0183_msg_FRPOS, this, EVT_N0183_FRPOS); Bind(EVT_N0183_FRPOS, [&](ObservedEvt ev) { - auto ptr = ev.GetSharedPtr(); - auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS( n0183_msg ); - }); + auto ptr = ev.GetSharedPtr(); + auto n0183_msg = std::static_pointer_cast(ptr); + HandleN0183_AIS(n0183_msg); + }); - //CDDSC + // CDDSC Nmea0183Msg n0183_msg_CDDSC("CDDSC"); listener_N0183_CDDSC.Listen(n0183_msg_CDDSC, this, EVT_N0183_CDDSC); Bind(EVT_N0183_CDDSC, [&](ObservedEvt ev) { - auto ptr = ev.GetSharedPtr(); - auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS( n0183_msg ); - }); + auto ptr = ev.GetSharedPtr(); + auto n0183_msg = std::static_pointer_cast(ptr); + HandleN0183_AIS(n0183_msg); + }); - //CDDSE + // CDDSE Nmea0183Msg n0183_msg_CDDSE("CDDSE"); listener_N0183_CDDSE.Listen(n0183_msg_CDDSE, this, EVT_N0183_CDDSE); Bind(EVT_N0183_CDDSE, [&](ObservedEvt ev) { - auto ptr = ev.GetSharedPtr(); - auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS( n0183_msg ); - }); + auto ptr = ev.GetSharedPtr(); + auto n0183_msg = std::static_pointer_cast(ptr); + HandleN0183_AIS(n0183_msg); + }); - //TLL + // TLL Nmea0183Msg n0183_msg_TLL("TLL"); listener_N0183_TLL.Listen(n0183_msg_TLL, this, EVT_N0183_TLL); Bind(EVT_N0183_TLL, [&](ObservedEvt ev) { - auto ptr = ev.GetSharedPtr(); - auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS( n0183_msg ); - }); + auto ptr = ev.GetSharedPtr(); + auto n0183_msg = std::static_pointer_cast(ptr); + HandleN0183_AIS(n0183_msg); + }); - //TTM + // TTM Nmea0183Msg n0183_msg_ttm("TTM"); listener_N0183_TTM.Listen(n0183_msg_ttm, this, EVT_N0183_TTM); Bind(EVT_N0183_TTM, [&](ObservedEvt ev) { - auto ptr = ev.GetSharedPtr(); - auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS(n0183_msg); - }); + auto ptr = ev.GetSharedPtr(); + auto n0183_msg = std::static_pointer_cast(ptr); + HandleN0183_AIS(n0183_msg); + }); - //OSD + // OSD Nmea0183Msg n0183_msg_OSD("OSD"); listener_N0183_OSD.Listen(n0183_msg_OSD, this, EVT_N0183_OSD); Bind(EVT_N0183_OSD, [&](ObservedEvt ev) { - auto ptr = ev.GetSharedPtr(); - auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS( n0183_msg ); - }); + auto ptr = ev.GetSharedPtr(); + auto n0183_msg = std::static_pointer_cast(ptr); + HandleN0183_AIS(n0183_msg); + }); - //WPL + // WPL Nmea0183Msg n0183_msg_WPL("WPL"); listener_N0183_WPL.Listen(n0183_msg_WPL, this, EVT_N0183_WPL); Bind(EVT_N0183_WPL, [&](ObservedEvt ev) { auto ptr = ev.GetSharedPtr(); auto n0183_msg = std::static_pointer_cast(ptr); - HandleN0183_AIS( n0183_msg ); + HandleN0183_AIS(n0183_msg); }); - //SignalK + // SignalK SignalkMsg sk_msg; listener_SignalK.Listen(sk_msg, this, EVT_SIGNALK); Bind(EVT_SIGNALK, [&](ObservedEvt ev) { HandleSignalK(UnpackEvtPointer(ev)); }); - // AIS Class A PGN 129038 + // AIS Class A PGN 129038 //----------------------------- Nmea2000Msg n2k_msg_129038(static_cast(129038)); listener_N2K_129038.Listen(n2k_msg_129038, this, EVT_N2K_129038); @@ -331,7 +327,7 @@ void AisDecoder::InitCommListeners(void) { HandleN2K_129038(UnpackEvtPointer(ev)); }); - // AIS Class B PGN 129039 + // AIS Class B PGN 129039 //----------------------------- Nmea2000Msg n2k_msg_129039(static_cast(129039)); listener_N2K_129039.Listen(n2k_msg_129039, this, EVT_N2K_129039); @@ -339,7 +335,7 @@ void AisDecoder::InitCommListeners(void) { HandleN2K_129039(UnpackEvtPointer(ev)); }); - // AIS ATON PGN 129041 + // AIS ATON PGN 129041 //----------------------------- Nmea2000Msg n2k_msg_129041(static_cast(129041)); listener_N2K_129041.Listen(n2k_msg_129041, this, EVT_N2K_129041); @@ -347,7 +343,7 @@ void AisDecoder::InitCommListeners(void) { HandleN2K_129041(UnpackEvtPointer(ev)); }); - // AIS static data class A PGN 129794 + // AIS static data class A PGN 129794 //----------------------------- Nmea2000Msg n2k_msg_129794(static_cast(129794)); listener_N2K_129794.Listen(n2k_msg_129794, this, EVT_N2K_129794); @@ -355,7 +351,7 @@ void AisDecoder::InitCommListeners(void) { HandleN2K_129794(UnpackEvtPointer(ev)); }); - // AIS static data class B part A PGN 129809 + // AIS static data class B part A PGN 129809 //----------------------------- Nmea2000Msg n2k_msg_129809(static_cast(129809)); listener_N2K_129809.Listen(n2k_msg_129809, this, EVT_N2K_129809); @@ -378,11 +374,9 @@ void AisDecoder::InitCommListeners(void) { Bind(EVT_N2K_129793, [&](ObservedEvt ev) { HandleN2K_129793(UnpackEvtPointer(ev)); }); - } - -bool AisDecoder::HandleN0183_AIS( std::shared_ptr n0183_msg ){ +bool AisDecoder::HandleN0183_AIS(std::shared_ptr n0183_msg) { std::string str = n0183_msg->payload; wxString sentence(str.c_str()); DecodeN0183(sentence); @@ -390,7 +384,7 @@ bool AisDecoder::HandleN0183_AIS( std::shared_ptr n0183_msg return true; } -bool AisDecoder::HandleN2K_129038( std::shared_ptr n2k_msg ){ +bool AisDecoder::HandleN2K_129038(std::shared_ptr n2k_msg) { std::vector v = n2k_msg->payload; uint8_t MessageID; @@ -408,16 +402,14 @@ bool AisDecoder::HandleN2K_129038( std::shared_ptr n2k_msg ){ tN2kAISNavStatus NavStat = N2kaisns_Under_Way_Motoring; tN2kAISTransceiverInformation AISTransceiverInformation; - - if (ParseN2kPGN129038(v, MessageID, Repeat, UserID, - Latitude, Longitude, Accuracy, RAIM, Seconds, - COG, SOG, Heading, ROT, NavStat, AISTransceiverInformation)) { - + if (ParseN2kPGN129038(v, MessageID, Repeat, UserID, Latitude, Longitude, + Accuracy, RAIM, Seconds, COG, SOG, Heading, ROT, + NavStat, AISTransceiverInformation)) { // Is this target already in the global target list? // Search the current AISTargetList for an MMSI match int mmsi = UserID; long mmsi_long = mmsi; - std::shared_ptrpTargetData = 0; + std::shared_ptr pTargetData = 0; bool bnewtarget = false; auto it = AISTargetList.find(mmsi); @@ -427,19 +419,19 @@ bool AisDecoder::HandleN2K_129038( std::shared_ptr n2k_msg ){ bnewtarget = true; m_n_targets++; } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry } wxDateTime now = wxDateTime::Now(); now.MakeUTC(); - //Populate the target_data + // Populate the target_data pTargetData->MMSI = mmsi; pTargetData->MID = MessageID; pTargetData->MMSI = mmsi; pTargetData->Class = AIS_CLASS_A; // Check for SART and friends by looking at first two digits of MMSI - if( 97 == pTargetData->MMSI / 10000000) { + if (97 == pTargetData->MMSI / 10000000) { pTargetData->Class = AIS_SART; // won't get a static report, so fake it here pTargetData->StaticReportTicks = now.GetTicks(); @@ -455,18 +447,19 @@ bool AisDecoder::HandleN2K_129038( std::shared_ptr n2k_msg ){ double rot_dir = 1.0; - //FIXME (dave) -// if (ROT == 128) -// pTargetData->ROTAIS = -128; // not available codes as -128 -// else if ((ROT & 0x80) == 0x80) { -// pTargetData->ROTAIS = ROT - 256; // convert to twos complement -// rot_dir = -1.0; -// } -// -// pTargetData->ROTIND = round(rot_dir * pow((ROT / 4.733), 2)); + // FIXME (dave) + // if (ROT == 128) + // pTargetData->ROTAIS = -128; // not available codes as -128 + // else if ((ROT & 0x80) == 0x80) { + // pTargetData->ROTAIS = ROT - 256; // convert to twos complement + // rot_dir = -1.0; + // } + // + // pTargetData->ROTIND = round(rot_dir * pow((ROT / 4.733), 2)); pTargetData->b_OwnShip = - AISTransceiverInformation == tN2kAISTransceiverInformation::N2kaisown_information_not_broadcast; + AISTransceiverInformation == + tN2kAISTransceiverInformation::N2kaisown_information_not_broadcast; pTargetData->b_active = true; pTargetData->b_lost = false; pTargetData->b_positionOnceValid = true; @@ -478,21 +471,25 @@ bool AisDecoder::HandleN2K_129038( std::shared_ptr n2k_msg ){ touch_state.Notify(); return true; - } - else + } else return false; } - // AIS position reports for Class B -bool AisDecoder::HandleN2K_129039( std::shared_ptr n2k_msg ){ +// AIS position reports for Class B +bool AisDecoder::HandleN2K_129039(std::shared_ptr n2k_msg) { std::vector v = n2k_msg->payload; -// Input: -// - N2kMsg NMEA2000 message to decode -// bool ParseN2kPGN129039(std::vector &v, uint8_t &MessageID, tN2kAISRepeat &Repeat, uint32_t &UserID, -// double &Latitude, double &Longitude, bool &Accuracy, bool &RAIM, uint8_t &Seconds, double &COG, -// double &SOG, tN2kAISTransceiverInformation &AISTransceiverInformation, double &Heading, -// tN2kAISUnit &Unit, bool &Display, bool &DSC, bool &Band, bool &Msg22, tN2kAISMode &Mode, bool &State); + // Input: + // - N2kMsg NMEA2000 message to decode + // bool ParseN2kPGN129039(std::vector &v, uint8_t &MessageID, + // tN2kAISRepeat &Repeat, uint32_t &UserID, + // double &Latitude, double &Longitude, bool + // &Accuracy, bool &RAIM, uint8_t &Seconds, double + // &COG, double &SOG, tN2kAISTransceiverInformation + // &AISTransceiverInformation, double &Heading, + // tN2kAISUnit &Unit, bool &Display, bool &DSC, bool + // &Band, bool &Msg22, tN2kAISMode &Mode, bool + // &State); uint8_t MessageID; tN2kAISRepeat Repeat; @@ -511,11 +508,10 @@ bool AisDecoder::HandleN2K_129039( std::shared_ptr n2k_msg ){ bool DSC, Band, Msg22, State, Display; tN2kAISMode Mode; - if (ParseN2kPGN129039(v, MessageID, Repeat, UserID, - Latitude, Longitude, Accuracy, RAIM, Seconds, COG, - SOG, AISTransceiverInformation, Heading, - Unit, Display, DSC, Band, Msg22, Mode, State)) { - + if (ParseN2kPGN129039(v, MessageID, Repeat, UserID, Latitude, Longitude, + Accuracy, RAIM, Seconds, COG, SOG, + AISTransceiverInformation, Heading, Unit, Display, DSC, + Band, Msg22, Mode, State)) { // Is this target already in the global target list? // Search the current AISTargetList for an MMSI match int mmsi = UserID; @@ -530,13 +526,13 @@ bool AisDecoder::HandleN2K_129039( std::shared_ptr n2k_msg ){ bnewtarget = true; m_n_targets++; } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry } wxDateTime now = wxDateTime::Now(); now.MakeUTC(); - //Populate the target_data + // Populate the target_data pTargetData->MMSI = mmsi; pTargetData->MID = MessageID; pTargetData->MMSI = mmsi; @@ -545,7 +541,7 @@ bool AisDecoder::HandleN2K_129039( std::shared_ptr n2k_msg ){ if (!N2kIsNA(SOG)) pTargetData->SOG = MS2KNOTS(SOG); if (!N2kIsNA(COG)) pTargetData->COG = GeodesicRadToDeg(COG); if (!N2kIsNA(Heading)) pTargetData->HDG = GeodesicRadToDeg(Heading); - if(!N2kIsNA(Longitude)) pTargetData->Lon = Longitude; + if (!N2kIsNA(Longitude)) pTargetData->Lon = Longitude; if (!N2kIsNA(Latitude)) pTargetData->Lat = Latitude; pTargetData->b_positionOnceValid = true; @@ -554,22 +550,21 @@ bool AisDecoder::HandleN2K_129039( std::shared_ptr n2k_msg ){ pTargetData->LastPositionReportTicks = pTargetData->PositionReportTicks; pTargetData->PositionReportTicks = now.GetTicks(); pTargetData->b_OwnShip = - AISTransceiverInformation == tN2kAISTransceiverInformation::N2kaisown_information_not_broadcast; + AISTransceiverInformation == + tN2kAISTransceiverInformation::N2kaisown_information_not_broadcast; pSelectAIS->DeleteSelectablePoint((void *)(long)mmsi, SELTYPE_AISTARGET); CommitAISTarget(pTargetData, "", true, bnewtarget); touch_state.Notify(); return true; - } - else + } else return false; - return true; } -bool AisDecoder::HandleN2K_129041( std::shared_ptr n2k_msg ){ +bool AisDecoder::HandleN2K_129041(std::shared_ptr n2k_msg) { std::vector v = n2k_msg->payload; tN2kAISAtoNReportData data; @@ -598,7 +593,7 @@ bool AisDecoder::HandleN2K_129041( std::shared_ptr n2k_msg ){ char AtoNName[34 + 1]; #endif - if (ParseN2kPGN129041(v, data)){ + if (ParseN2kPGN129041(v, data)) { // Is this target already in the global target list? // Search the current AISTargetList for an MMSI match int mmsi = data.UserID; @@ -613,17 +608,17 @@ bool AisDecoder::HandleN2K_129041( std::shared_ptr n2k_msg ){ bnewtarget = true; m_n_targets++; } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry } - //Populate the target_data + // Populate the target_data pTargetData->MMSI = mmsi; wxDateTime now = wxDateTime::Now(); now.MakeUTC(); int offpos = data.OffPositionIndicator; // off position flag - int virt = data.VirtualAtoNFlag; // virtual flag + int virt = data.VirtualAtoNFlag; // virtual flag if (virt) pTargetData->NavStatus = ATON_VIRTUAL; @@ -632,9 +627,9 @@ bool AisDecoder::HandleN2K_129041( std::shared_ptr n2k_msg ){ pTargetData->m_utc_sec = data.Seconds; - if (pTargetData->m_utc_sec <= 59 ){ - pTargetData->NavStatus += 1; - if (offpos) pTargetData->NavStatus += 1; + if (pTargetData->m_utc_sec <= 59) { + pTargetData->NavStatus += 1; + if (offpos) pTargetData->NavStatus += 1; } data.AtoNName[34] = 0; @@ -653,20 +648,19 @@ bool AisDecoder::HandleN2K_129041( std::shared_ptr n2k_msg ){ pTargetData->LastPositionReportTicks = pTargetData->PositionReportTicks; pTargetData->PositionReportTicks = now.GetTicks(); - //FIXME (dave) Populate more fiddly static data + // FIXME (dave) Populate more fiddly static data pSelectAIS->DeleteSelectablePoint((void *)(long)mmsi, SELTYPE_AISTARGET); CommitAISTarget(pTargetData, "", true, bnewtarget); touch_state.Notify(); return true; - } - else + } else return false; } -//AIS static data class A -bool AisDecoder::HandleN2K_129794( std::shared_ptr n2k_msg ){ +// AIS static data class A +bool AisDecoder::HandleN2K_129794(std::shared_ptr n2k_msg) { std::vector v = n2k_msg->payload; uint8_t MessageID; @@ -689,13 +683,10 @@ bool AisDecoder::HandleN2K_129794( std::shared_ptr n2k_msg ){ tN2kAISDTE DTE; tN2kAISTranceiverInfo AISinfo; - - if (ParseN2kPGN129794(v, MessageID, Repeat, UserID, - IMOnumber, Callsign, Name, VesselType, Length, - Beam, PosRefStbd, PosRefBow, ETAdate, ETAtime, - Draught, Destination, AISversion, GNSStype, - DTE, AISinfo) ) - { + if (ParseN2kPGN129794(v, MessageID, Repeat, UserID, IMOnumber, Callsign, Name, + VesselType, Length, Beam, PosRefStbd, PosRefBow, + ETAdate, ETAtime, Draught, Destination, AISversion, + GNSStype, DTE, AISinfo)) { // Is this target already in the global target list? // Search the current AISTargetList for an MMSI match int mmsi = UserID; @@ -710,10 +701,10 @@ bool AisDecoder::HandleN2K_129794( std::shared_ptr n2k_msg ){ bnewtarget = true; m_n_targets++; } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry } - //Populate the target_data + // Populate the target_data pTargetData->MMSI = mmsi; strncpy(pTargetData->ShipName, Name, SHIP_NAME_LEN - 1); pTargetData->ShipName[sizeof(pTargetData->ShipName) - 1] = '\0'; @@ -722,7 +713,8 @@ bool AisDecoder::HandleN2K_129794( std::shared_ptr n2k_msg ){ pTargetData->MID = 124; // Indicates a name from n2k pTargetData->b_OwnShip = - AISinfo == tN2kAISTranceiverInfo::N2kaisti_Own_information_not_broadcast; + AISinfo == + tN2kAISTranceiverInfo::N2kaisti_Own_information_not_broadcast; pTargetData->DimA = PosRefBow; pTargetData->DimB = Length - PosRefBow; @@ -754,12 +746,11 @@ bool AisDecoder::HandleN2K_129794( std::shared_ptr n2k_msg ){ touch_state.Notify(); return true; - } - else + } else return false; } // AIS static data class B part A -bool AisDecoder::HandleN2K_129809( std::shared_ptr n2k_msg ){ +bool AisDecoder::HandleN2K_129809(std::shared_ptr n2k_msg) { std::vector v = n2k_msg->payload; uint8_t MessageID; @@ -767,8 +758,7 @@ bool AisDecoder::HandleN2K_129809( std::shared_ptr n2k_msg ){ uint32_t UserID; char Name[21]; - if (ParseN2kPGN129809(v, MessageID, Repeat, UserID, Name)) - { + if (ParseN2kPGN129809(v, MessageID, Repeat, UserID, Name)) { // Is this target already in the global target list? // Search the current AISTargetList for an MMSI match int mmsi = UserID; @@ -783,10 +773,10 @@ bool AisDecoder::HandleN2K_129809( std::shared_ptr n2k_msg ){ bnewtarget = true; m_n_targets++; } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry } - //Populate the target_data + // Populate the target_data pTargetData->MMSI = mmsi; Name[sizeof(Name) - 1] = 0; strncpy(pTargetData->ShipName, Name, SHIP_NAME_LEN - 1); @@ -799,14 +789,12 @@ bool AisDecoder::HandleN2K_129809( std::shared_ptr n2k_msg ){ touch_state.Notify(); return true; - } - else + } else return false; } - // AIS static data class B part B -bool AisDecoder::HandleN2K_129810( std::shared_ptr n2k_msg ){ +bool AisDecoder::HandleN2K_129810(std::shared_ptr n2k_msg) { std::vector v = n2k_msg->payload; uint8_t MessageID; @@ -821,10 +809,9 @@ bool AisDecoder::HandleN2K_129810( std::shared_ptr n2k_msg ){ double PosRefBow; uint32_t MothershipID; - if (ParseN2kPGN129810(v, MessageID, Repeat, UserID, - VesselType, Vendor, Callsign, Length, Beam, - PosRefStbd, PosRefBow, MothershipID)) - { + if (ParseN2kPGN129810(v, MessageID, Repeat, UserID, VesselType, Vendor, + Callsign, Length, Beam, PosRefStbd, PosRefBow, + MothershipID)) { // Is this target already in the global target list? // Search the current AISTargetList for an MMSI match int mmsi = UserID; @@ -839,10 +826,10 @@ bool AisDecoder::HandleN2K_129810( std::shared_ptr n2k_msg ){ bnewtarget = true; m_n_targets++; } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry } - //Populate the target_data + // Populate the target_data pTargetData->MMSI = mmsi; pTargetData->DimA = PosRefBow; pTargetData->DimB = Length - PosRefBow; @@ -857,13 +844,12 @@ bool AisDecoder::HandleN2K_129810( std::shared_ptr n2k_msg ){ touch_state.Notify(); return true; - } - else + } else return false; } // AIS Base Station Report -bool AisDecoder::HandleN2K_129793( std::shared_ptr n2k_msg ){ +bool AisDecoder::HandleN2K_129793(std::shared_ptr n2k_msg) { std::vector v = n2k_msg->payload; uint8_t MessageID; @@ -874,10 +860,8 @@ bool AisDecoder::HandleN2K_129793( std::shared_ptr n2k_msg ){ unsigned int SecondsSinceMidnight; unsigned int DaysSinceEpoch; - if (ParseN2kPGN129793(v, MessageID, Repeat, UserID, - Longitude, Latitude, - SecondsSinceMidnight, DaysSinceEpoch)) - { + if (ParseN2kPGN129793(v, MessageID, Repeat, UserID, Longitude, Latitude, + SecondsSinceMidnight, DaysSinceEpoch)) { wxDateTime now = wxDateTime::Now(); now.MakeUTC(); @@ -895,10 +879,10 @@ bool AisDecoder::HandleN2K_129793( std::shared_ptr n2k_msg ){ bnewtarget = true; m_n_targets++; } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry } - //Populate the target_data + // Populate the target_data pTargetData->MMSI = mmsi; pTargetData->Class = AIS_BASE; @@ -909,16 +893,14 @@ bool AisDecoder::HandleN2K_129793( std::shared_ptr n2k_msg ){ pTargetData->LastPositionReportTicks = pTargetData->PositionReportTicks; pTargetData->PositionReportTicks = now.GetTicks(); - - //FIXME (dave) Populate more fiddly static data + // FIXME (dave) Populate more fiddly static data pSelectAIS->DeleteSelectablePoint((void *)(long)mmsi, SELTYPE_AISTARGET); CommitAISTarget(pTargetData, "", true, bnewtarget); touch_state.Notify(); return true; - } - else + } else return false; } @@ -1013,7 +995,7 @@ void AisDecoder::BuildERIShipTypeHash(void) { //---------------------------------------------------------------------------------- // Handle events from SignalK //---------------------------------------------------------------------------------- -void AisDecoder::HandleSignalK(std::shared_ptr sK_msg){ +void AisDecoder::HandleSignalK(std::shared_ptr sK_msg) { rapidjson::Document root; root.Parse(sK_msg->raw_message); @@ -1051,9 +1033,9 @@ void AisDecoder::HandleSignalK(std::shared_ptr sK_msg){ } else { mmsi = 0; } - } - else if (context.StartsWith(_T("meteo.urn:mrn:imo:mmsi:"), &mmsi_string)) { - // mmsi_string for a Meteo is like: 002655619:672707 + } else if (context.StartsWith(_T("meteo.urn:mrn:imo:mmsi:"), + &mmsi_string)) { + // mmsi_string for a Meteo is like: 002655619:672707 origin_mmsi = wxAtoi(wxString(mmsi_string).BeforeFirst(':')); meteo_SiteID = wxAtoi('1' + wxString(mmsi_string).AfterFirst(':')); // Preface "1" to distinguish e.g. "012345" from "12345" @@ -1073,13 +1055,13 @@ void AisDecoder::HandleSignalK(std::shared_ptr sK_msg){ wxString logmsg; logmsg.Printf("AIS :MMSI: %ld", mmsi); std::string source = sK_msg->source->to_string(); - g_pMUX->LogInputMessage( logmsg, source, false, false); + g_pMUX->LogInputMessage(logmsg, source, false, false); } // Stop here if the target shall be ignored for (unsigned int i = 0; i < g_MMSI_Props_Array.GetCount(); i++) { if (mmsi == g_MMSI_Props_Array[i]->MMSI) { - MmsiProperties * props = g_MMSI_Props_Array[i]; + MmsiProperties *props = g_MMSI_Props_Array[i]; if (props->m_bignore) { return; } @@ -1105,7 +1087,8 @@ void AisDecoder::HandleSignalK(std::shared_ptr sK_msg){ pTargetData->MMSI = mmsi; getMmsiProperties(pTargetData); if (root.HasMember("updates") && root["updates"].IsArray()) { - for (rapidjson::Value::ConstValueIterator itr = root["updates"].Begin(); itr != root["updates"].End(); ++itr) { + for (rapidjson::Value::ConstValueIterator itr = root["updates"].Begin(); + itr != root["updates"].End(); ++itr) { handleUpdate(pTargetData, bnewtarget, *itr); } } @@ -1118,8 +1101,8 @@ void AisDecoder::HandleSignalK(std::shared_ptr sK_msg){ pTargetData->Class = AIS_METEO; pTargetData->met_data.original_mmsi = origin_mmsi; pTargetData->met_data.stationID = meteo_SiteID; - /* Make a unique "shipname" for each station - based on position inherited from meteo_SiteID */ + /* Make a unique "shipname" for each station + based on position inherited from meteo_SiteID */ wxString met_name = pTargetData->ShipName; if (met_name.Find("METEO") == wxNOT_FOUND) { wxString s_id; @@ -1144,15 +1127,16 @@ void AisDecoder::HandleSignalK(std::shared_ptr sK_msg){ } } -void AisDecoder::handleUpdate(std::shared_ptr pTargetData, bool bnewtarget, - const rapidjson::Value &update) { +void AisDecoder::handleUpdate(std::shared_ptr pTargetData, + bool bnewtarget, const rapidjson::Value &update) { wxString sfixtime = ""; if (update.HasMember("timestamp")) { sfixtime = update["timestamp"].GetString(); } if (update.HasMember("values") && update["values"].IsArray()) { - for (rapidjson::Value::ConstValueIterator itr = update["values"].Begin(); itr != update["values"].End(); ++itr) { + for (rapidjson::Value::ConstValueIterator itr = update["values"].Begin(); + itr != update["values"].End(); ++itr) { updateItem(pTargetData, bnewtarget, *itr, sfixtime); } } @@ -1175,12 +1159,14 @@ void AisDecoder::handleUpdate(std::shared_ptr pTargetData, bool b if (pTargetData->b_show_track) UpdateOneTrack(pTargetData.get()); } -void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bnewtarget, - const rapidjson::Value &item, wxString &sfixtime) const { +void AisDecoder::updateItem(std::shared_ptr pTargetData, + bool bnewtarget, const rapidjson::Value &item, + wxString &sfixtime) const { if (item.HasMember("path") && item.HasMember("value")) { const wxString &update_path = item["path"].GetString(); if (update_path == _T("navigation.position")) { - if (item["value"].HasMember("latitude") && item["value"].HasMember("longitude")) { + if (item["value"].HasMember("latitude") && + item["value"].HasMember("longitude")) { wxDateTime now = wxDateTime::Now(); now.MakeUTC(); double lat = item["value"]["latitude"].GetDouble(); @@ -1198,13 +1184,17 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne if (item["value"].HasMember("altitude")) { pTargetData->altitude = item["value"]["altitude "].GetInt(); }*/ - } else if (update_path == _T("navigation.speedOverGround") && item["value"].IsNumber()) { + } else if (update_path == _T("navigation.speedOverGround") && + item["value"].IsNumber()) { pTargetData->SOG = item["value"].GetDouble() * ms_to_knot_factor; - } else if (update_path == _T("navigation.courseOverGroundTrue") && item["value"].IsNumber()) { + } else if (update_path == _T("navigation.courseOverGroundTrue") && + item["value"].IsNumber()) { pTargetData->COG = GEODESIC_RAD2DEG(item["value"].GetDouble()); - } else if (update_path == _T("navigation.headingTrue") && item["value"].IsNumber()) { + } else if (update_path == _T("navigation.headingTrue") && + item["value"].IsNumber()) { pTargetData->HDG = GEODESIC_RAD2DEG(item["value"].GetDouble()); - } else if (update_path == _T("navigation.rateOfTurn") && item["value"].IsNumber()) { + } else if (update_path == _T("navigation.rateOfTurn") && + item["value"].IsNumber()) { pTargetData->ROTAIS = 4.733 * sqrt(item["value"].GetDouble()); } else if (update_path == _T("design.aisShipType")) { if (item["value"].HasMember("id")) { @@ -1255,11 +1245,9 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne } else if (update_path == _T("sensors.ais.class")) { wxString aisclass = item["value"].GetString(); if (aisclass == _T("A")) { - if(!pTargetData->b_isDSCtarget) - pTargetData->Class = AIS_CLASS_A; + if (!pTargetData->b_isDSCtarget) pTargetData->Class = AIS_CLASS_A; } else if (aisclass == _T("B")) { - if (!pTargetData->b_isDSCtarget) - pTargetData->Class = AIS_CLASS_B; + if (!pTargetData->b_isDSCtarget) pTargetData->Class = AIS_CLASS_B; pTargetData->NavStatus = UNDEFINED; // Class B targets have no status. Enforce this... } else if (aisclass == _T("BASE")) { @@ -1288,7 +1276,8 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne int beam = pTargetData->DimC; int center = beam / 2; if (item["value"].IsNumber()) { - //FIXME (nohal): Dim* are int, but we have seen data streams with doubles in them... + // FIXME (nohal): Dim* are int, but we have seen data streams with + // doubles in them... pTargetData->DimC = center + item["value"].GetDouble(); pTargetData->DimD = beam - pTargetData->DimC; } @@ -1328,7 +1317,8 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne strncpy(pTargetData->Destination, destination.c_str(), DESTINATION_LEN - 1); } else if (update_path == _T("navigation.specialManeuver")) { - if (strcmp("not available", item["value"].GetString()) != 0 && pTargetData->IMO < 1) { + if (strcmp("not available", item["value"].GetString()) != 0 && + pTargetData->IMO < 1) { const wxString &bluesign = item["value"].GetString(); if (_T("not engaged") == bluesign) { pTargetData->blue_paddle = 1; @@ -1345,15 +1335,15 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne } } else if (update_path == _T("sensors.ais.functionalId")) { if (item["value"].GetInt() == 10 && pTargetData->b_hasInlandDac) { - // "Inland ship static and voyage related data" + // "Inland ship static and voyage related data" pTargetData->b_isEuroInland = true; } - // METEO Data + // METEO Data } else if (update_path == "environment.date") { wxString issued = item["value"].GetString(); if (issued.Len()) { - // Parse ISO 8601 date/time + // Parse ISO 8601 date/time wxDateTime tz; ParseGPXDateTime(tz, issued); pTargetData->met_data.day = tz.GetDay(); @@ -1362,91 +1352,105 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne } } else if (update_path == "environment.wind.averageSpeed" && item["value"].IsNumber()) { - pTargetData->met_data.wind_kn = MS2KNOTS(item["value"].GetDouble()); + pTargetData->met_data.wind_kn = MS2KNOTS(item["value"].GetDouble()); } else if (update_path == "environment.wind.gust" && item["value"].IsNumber()) { - pTargetData->met_data.wind_gust_kn = MS2KNOTS(item["value"].GetDouble()); + pTargetData->met_data.wind_gust_kn = MS2KNOTS(item["value"].GetDouble()); } else if (update_path == "environment.wind.directionTrue" && item["value"].IsNumber()) { - pTargetData->met_data.wind_dir = GEODESIC_RAD2DEG(item["value"].GetDouble()); + pTargetData->met_data.wind_dir = + GEODESIC_RAD2DEG(item["value"].GetDouble()); } else if (update_path == "environment.wind.gustDirectionTrue" && item["value"].IsNumber()) { - pTargetData->met_data.wind_gust_dir = GEODESIC_RAD2DEG(item["value"].GetDouble()); + pTargetData->met_data.wind_gust_dir = + GEODESIC_RAD2DEG(item["value"].GetDouble()); } else if (update_path == "environment.outside.temperature" && item["value"].IsNumber()) { - pTargetData->met_data.air_temp = KelvinToC(item["value"].GetDouble()); + pTargetData->met_data.air_temp = KelvinToC(item["value"].GetDouble()); } else if (update_path == "environment.outside.relativeHumidity" && item["value"].IsNumber()) { - pTargetData->met_data.rel_humid = item["value"].GetDouble(); + pTargetData->met_data.rel_humid = item["value"].GetDouble(); } else if (update_path == "environment.outside.dewPointTemperature" && item["value"].IsNumber()) { - pTargetData->met_data.dew_point = KelvinToC(item["value"].GetDouble()); + pTargetData->met_data.dew_point = KelvinToC(item["value"].GetDouble()); } else if (update_path == "environment.outside.pressure" && item["value"].IsNumber()) { - pTargetData->met_data.airpress = static_cast(item["value"].GetDouble() / 100); + pTargetData->met_data.airpress = + static_cast(item["value"].GetDouble() / 100); } else if (update_path == "environment.water.level" && item["value"].IsNumber()) { - pTargetData->met_data.water_lev_dev = item["value"].GetDouble(); + pTargetData->met_data.water_lev_dev = item["value"].GetDouble(); } else if (update_path == "environment.water.current.drift" && item["value"].IsNumber()) { // surfcurrspd - pTargetData->met_data.current = MS2KNOTS(item["value"].GetDouble()); + pTargetData->met_data.current = MS2KNOTS(item["value"].GetDouble()); } else if (update_path == "environment.water.current.set" && item["value"].IsNumber()) { // surfcurrdir - pTargetData->met_data.curr_dir = GEODESIC_RAD2DEG(item["value"].GetDouble()); + pTargetData->met_data.curr_dir = + GEODESIC_RAD2DEG(item["value"].GetDouble()); } else if (update_path == "environment.water.levelTendencyValue" && item["value"].IsNumber()) { - pTargetData->met_data.water_lev_trend = static_cast(item["value"].GetDouble()); + pTargetData->met_data.water_lev_trend = + static_cast(item["value"].GetDouble()); } else if (update_path == "environment.water.levelTendency") { // Don't use this text we parse it ourself. } else if (update_path == "environment.water.waves.significantHeight" && - item["value"].IsNumber()) { - pTargetData->met_data.wave_height = item["value"].GetDouble(); + item["value"].IsNumber()) { + pTargetData->met_data.wave_height = item["value"].GetDouble(); } else if (update_path == "environment.water.waves.period" && item["value"].IsNumber()) { - pTargetData->met_data.wave_period = static_cast(item["value"].GetDouble()); + pTargetData->met_data.wave_period = + static_cast(item["value"].GetDouble()); } else if (update_path == "environment.water.waves.directionTrue" && item["value"].IsNumber()) { - pTargetData->met_data.wave_dir = GEODESIC_RAD2DEG(item["value"].GetDouble()); + pTargetData->met_data.wave_dir = + GEODESIC_RAD2DEG(item["value"].GetDouble()); } else if (update_path == "environment.water.swell.height" && item["value"].IsNumber()) { - pTargetData->met_data.swell_height = item["value"].GetDouble(); + pTargetData->met_data.swell_height = item["value"].GetDouble(); } else if (update_path == "environment.water.swell.period" && item["value"].IsNumber()) { - pTargetData->met_data.swell_per = static_cast(item["value"].GetDouble()); + pTargetData->met_data.swell_per = + static_cast(item["value"].GetDouble()); } else if (update_path == "environment.water.swell.directionTrue" && item["value"].IsNumber()) { - pTargetData->met_data.swell_dir = GEODESIC_RAD2DEG(item["value"].GetDouble()); + pTargetData->met_data.swell_dir = + GEODESIC_RAD2DEG(item["value"].GetDouble()); } else if (update_path == "environment.water.temperature" && item["value"].IsNumber()) { - pTargetData->met_data.water_temp = KelvinToC(item["value"].GetDouble()); + pTargetData->met_data.water_temp = KelvinToC(item["value"].GetDouble()); } else if (update_path == "environment.water.salinity" && item["value"].IsNumber()) { - pTargetData->met_data.salinity = item["value"].GetDouble(); - } else if (update_path == "environment.water.ice"){ - // Don't use. We parse it ourself + pTargetData->met_data.salinity = item["value"].GetDouble(); + } else if (update_path == "environment.water.ice") { + // Don't use. We parse it ourself } else if (update_path == "environment.water.iceValue" && item["value"].IsNumber()) { - pTargetData->met_data.ice = static_cast(item["value"].GetDouble()); + pTargetData->met_data.ice = static_cast(item["value"].GetDouble()); } else if (update_path == "environment.water.seaStateValue" && item["value"].IsNumber()) { - pTargetData->met_data.seastate = static_cast(item["value"].GetDouble()); + pTargetData->met_data.seastate = + static_cast(item["value"].GetDouble()); } else if (update_path == "environment.water.seaState") { - //This is the parsed (air!) Bf-scale. Don't use + // This is the parsed (air!) Bf-scale. Don't use } else if (update_path == "environment.outside.precipitation") { - // Don't use. We parse it ourself + // Don't use. We parse it ourself } else if (update_path == "environment.outside.precipitationValue" && item["value"].IsNumber()) { - pTargetData->met_data.precipitation = static_cast(item["value"].GetDouble()); + pTargetData->met_data.precipitation = + static_cast(item["value"].GetDouble()); } else if (update_path == "environment.outside.pressureTendencyValue" && item["value"].IsNumber()) { - pTargetData->met_data.airpress_tend = static_cast(item["value"].GetDouble()); + pTargetData->met_data.airpress_tend = + static_cast(item["value"].GetDouble()); } else if (update_path == "environment.outside.pressureTendency") { - // Parsed value, don't use, we do it ourself + // Parsed value, don't use, we do it ourself } else if (update_path == "environment.outside.horizontalVisibility" && item["value"].IsNumber()) { - pTargetData->met_data.hor_vis = GEODESIC_METERS2NM(item["value"].GetDouble()); - } else if (update_path == "environment.outside.horizontalVisibility.overRange") { - pTargetData->met_data.hor_vis_GT = item["value"].GetBool(); + pTargetData->met_data.hor_vis = + GEODESIC_METERS2NM(item["value"].GetDouble()); + } else if (update_path == + "environment.outside.horizontalVisibility.overRange") { + pTargetData->met_data.hor_vis_GT = item["value"].GetBool(); } else if (update_path == _T("")) { if (item["value"].HasMember("name")) { const wxString &name = item["value"]["name"].GetString(); @@ -1462,7 +1466,7 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne strncpy(pTargetData->CallSign, callsign.c_str(), 7); } if (item["value"].HasMember("mmsi") && - 1994 != (pTargetData->MMSI) / 100000) { //Meteo + 1994 != (pTargetData->MMSI) / 100000) { // Meteo long mmsi; wxString tmp = item["value"]["mmsi"].GetString(); if (tmp.ToLong(&mmsi)) { @@ -1475,8 +1479,8 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne pTargetData->b_SarAircraftPosnReport = true; } - AISshipNameCache(pTargetData.get(), AISTargetNamesC, - AISTargetNamesNC, mmsi); + AISshipNameCache(pTargetData.get(), AISTargetNamesC, AISTargetNamesNC, + mmsi); } } } else { @@ -1497,9 +1501,8 @@ void AisDecoder::updateItem(std::shared_ptr pTargetData, bool bne //---------------------------------------------------------------------------------- // Decode a single AIVDO sentence to a Generic Position Report //---------------------------------------------------------------------------------- -AisError AisDecoder::DecodeSingleVDO(const wxString &str, - GenericPosDatEx *pos, - wxString *accumulator) { +AisError AisDecoder::DecodeSingleVDO(const wxString &str, GenericPosDatEx *pos, + wxString *accumulator) { // Make some simple tests for validity if (str.Len() > 128) return AIS_NMEAVDX_TOO_LONG; @@ -1567,8 +1570,8 @@ AisError AisDecoder::DecodeSingleVDO(const wxString &str, // Create the bit accessible string AisBitstring strbit(string_to_parse.mb_str()); -// auto TargetData = std::make_unique( -// *AisTargetDataMaker::GetInstance().GetTargetData()); + // auto TargetData = std::make_unique( + // *AisTargetDataMaker::GetInstance().GetTargetData()); auto TargetData = AisTargetDataMaker::GetInstance().GetTargetData(); @@ -1761,9 +1764,9 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { } mmsi = arpa_mmsi = 199200000 + arpa_tgt_num; - // 199 is INMARSAT-A MID, should not occur ever in AIS - // stream + we make sure we are out of the hashes for - // GPSGate buddies by being above 1992* + // 199 is INMARSAT-A MID, should not occur ever in AIS + // stream + we make sure we are out of the hashes for + // GPSGate buddies by being above 1992* } else if (str.Mid(3, 3).IsSameAs(_T("TLL"))) { //$--TLL,xx,llll.lll,a,yyyyy.yyy,a,c--c,hhmmss.ss,a,a*hh //"$RATLL,01,5603.370,N,01859.976,E,ALPHA,015200.36,T,*75\r\n" @@ -1805,9 +1808,10 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { arpa_utc_min = (int)(arpa_utc_time / 100.0) - arpa_utc_hour * 100; arpa_utc_sec = (int)arpa_utc_time - arpa_utc_hour * 10000 - arpa_utc_min * 100; - arpa_status = tkz.GetNextToken(); // 6) Target status: L = lost,tracked - // target has beenlost Q = query,target in - // the process of acquisition T = tracking + arpa_status = + tkz.GetNextToken(); // 6) Target status: L = lost,tracked + // target has beenlost Q = query,target in + // the process of acquisition T = tracking if (arpa_status != _T("L")) arpa_lost = false; else if (arpa_status != wxEmptyString) @@ -1874,14 +1878,14 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { while (hash >= 100000) hash = hash / 100000; } mmsi = aprs_mmsi = 199300000 + hash; - // 199 is INMARSAT-A MID, should not occur ever in AIS stream + - // we make sure we are out of the hashes for GPSGate buddies - // and ARPA by being above 1993* + // 199 is INMARSAT-A MID, should not occur ever in AIS stream + + // we make sure we are out of the hashes for GPSGate buddies + // and ARPA by being above 1993* } else if (1 == g_WplAction) { // Create mark - RoutePoint *pWP = new RoutePoint(aprs_lat, aprs_lon, wxEmptyString, - aprs_name_str, wxEmptyString, false); - pWP->m_bIsolatedMark = true; - InsertWpt(pWP, true); + RoutePoint *pWP = new RoutePoint(aprs_lat, aprs_lon, wxEmptyString, + aprs_name_str, wxEmptyString, false); + pWP->m_bIsolatedMark = true; + InsertWpt(pWP, true); } } else if (str.Mid(1, 5).IsSameAs(_T("FRPOS"))) { // parse a GpsGate Position message $FRPOS,..... @@ -2026,8 +2030,8 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { mmsi = AisMeteoNewMmsi(mmsi, met_lat, met_lon, 25, 0); mmsi_long = mmsi; - } else if (dac == 367 && fi == 33) { // ais8_367_33 - // Check for a valid message size before further handling + } else if (dac == 367 && fi == 33) { // ais8_367_33 + // Check for a valid message size before further handling const int size = strbit.GetBitCount(); if (size < 168) return AIS_GENERIC_ERROR; const int startb = 56; @@ -2037,23 +2041,22 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { int mes_type = strbit.GetInt(57, 4); int site_ID = strbit.GetInt(77, 7); - if (mes_type == 0) { // Location + if (mes_type == 0) { // Location origin_mmsi = mmsi; met_lon = strbit.GetInt(90, 28); met_lat = strbit.GetInt(118, 27); mmsi = AisMeteoNewMmsi(mmsi, met_lat, met_lon, 28, site_ID); mmsi_long = mmsi; - } else { // Other messsage types without position. - // We need a previously received type 0, position message - // to get use of any sensor report. + } else { // Other messsage types without position. + // We need a previously received type 0, position message + // to get use of any sensor report. int x_mmsi = AisMeteoNewMmsi(mmsi, 91, 181, 0, site_ID); if (x_mmsi) { origin_mmsi = mmsi; mmsi = x_mmsi; mmsi_long = mmsi; - } else // So far no use for this report. + } else // So far no use for this report. return AIS_GENERIC_ERROR; - } } } @@ -2071,10 +2074,11 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { pTargetData->met_data.original_mmsi = origin_mmsi; } } else { - pTargetData = it->second; // find current entry + pTargetData = it->second; // find current entry - if(!bnewtarget) pStaleTarget = pTargetData; // save a pointer to stale data - if (origin_mmsi) { // Meteo point + if (!bnewtarget) + pStaleTarget = pTargetData; // save a pointer to stale data + if (origin_mmsi) { // Meteo point pTargetData->MMSI = mmsi; pTargetData->met_data.original_mmsi = origin_mmsi; } @@ -2085,8 +2089,7 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { // Check if this target has a dedicated tracktype if (TRACKTYPE_NEVER == props->TrackType) { pTargetData->b_show_track = false; - } - else if (TRACKTYPE_ALWAYS == props->TrackType) { + } else if (TRACKTYPE_ALWAYS == props->TrackType) { pTargetData->b_show_track = true; } @@ -2125,11 +2128,11 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { std::string full_sentence = aivdostr.ToStdString(); std::string identifier("AIVDO"); // We notify based on full message, including the Talker ID - // notify message listener and also "ALL" N0183 messages, to support plugin - // API using original talker id + // notify message listener and also "ALL" N0183 messages, to + // support plugin API using original talker id auto address = std::make_shared("virtual"); - auto msg = - std::make_shared(identifier, full_sentence, address); + auto msg = std::make_shared( + identifier, full_sentence, address); auto msg_all = std::make_shared(*msg, "ALL"); auto &msgbus = NavMsgBus::GetInstance(); @@ -2157,7 +2160,7 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { if (pStaleTarget) pSelectAIS->DeleteSelectablePoint((void *)mmsi_long, SELTYPE_AISTARGET); - if (pTargetData) { + if (pTargetData) { if (gpsg_mmsi) { pTargetData->LastPositionReportTicks = pTargetData->PositionReportTicks; pTargetData->PositionReportTicks = now.GetTicks(); @@ -2287,56 +2290,81 @@ AisError AisDecoder::DecodeN0183(const wxString &str) { } void AisDecoder::CommitAISTarget(std::shared_ptr pTargetData, - const wxString &str, - bool message_valid, - bool new_target){ + const wxString &str, bool message_valid, + bool new_target) { + m_pLatestTargetData = pTargetData; - m_pLatestTargetData = pTargetData; - - if (!str.IsEmpty()) { // NMEA0183 message - if (str.Mid(3, 3).IsSameAs(_T("VDO"))) - pTargetData->b_OwnShip = true; - else - pTargetData->b_OwnShip = false; - } + if (!str.IsEmpty()) { // NMEA0183 message + if (str.Mid(3, 3).IsSameAs(_T("VDO"))) + pTargetData->b_OwnShip = true; + else + pTargetData->b_OwnShip = false; + } - if (!pTargetData->b_OwnShip) { - // set mmsi-props to default values - if (0 == m_persistent_tracks.count(pTargetData->MMSI)) { - // Normal target - pTargetData->b_PersistTrack = false; - // Or first decode for this target - for (unsigned int i = 0; i < g_MMSI_Props_Array.GetCount(); i++) { - if (pTargetData->MMSI == g_MMSI_Props_Array[i]->MMSI) { - MmsiProperties *props = g_MMSI_Props_Array[i]; - pTargetData->b_mPropPersistTrack = props->m_bPersistentTrack; - break; - } + if (!pTargetData->b_OwnShip) { + // set mmsi-props to default values + if (0 == m_persistent_tracks.count(pTargetData->MMSI)) { + // Normal target + pTargetData->b_PersistTrack = false; + // Or first decode for this target + for (unsigned int i = 0; i < g_MMSI_Props_Array.GetCount(); i++) { + if (pTargetData->MMSI == g_MMSI_Props_Array[i]->MMSI) { + MmsiProperties *props = g_MMSI_Props_Array[i]; + pTargetData->b_mPropPersistTrack = props->m_bPersistentTrack; + break; } - } else { - // The track persistency enabled in the query window or mmsi-props } - pTargetData->b_NoTrack = false; + } else { + // The track persistency enabled in the query window or mmsi-props + } + pTargetData->b_NoTrack = false; + } + + // If the message was decoded correctly + // Update the AIS Target information + if (message_valid) { + // Print to name cache only if not mmsi = 0 + if (pTargetData->MMSI) { + AISshipNameCache(pTargetData.get(), AISTargetNamesC, AISTargetNamesNC, + pTargetData->MMSI); } + AISTargetList[pTargetData->MMSI] = + pTargetData; // update the hash table entry - // If the message was decoded correctly - // Update the AIS Target information - if (message_valid) { - // Print to name cache only if not mmsi = 0 - if (pTargetData->MMSI) { - AISshipNameCache(pTargetData.get(), AISTargetNamesC, AISTargetNamesNC, pTargetData->MMSI); - } - AISTargetList[pTargetData->MMSI] = - pTargetData; // update the hash table entry + if (!pTargetData->area_notices.empty()) { + auto it = AIS_AreaNotice_Sources.find(pTargetData->MMSI); + if (it == AIS_AreaNotice_Sources.end()) + AIS_AreaNotice_Sources[pTargetData->MMSI] = pTargetData; + } - if (!pTargetData->area_notices.empty()) { - auto it = AIS_AreaNotice_Sources.find(pTargetData->MMSI); - if (it == AIS_AreaNotice_Sources.end()) - AIS_AreaNotice_Sources[pTargetData->MMSI] = pTargetData; + // If this is not an ownship message, update the AIS Target in the + // Selectable list, and update the CPA info + if (!pTargetData->b_OwnShip) { + if (pTargetData->b_positionOnceValid) { + long mmsi_long = pTargetData->MMSI; + SelectItem *pSel = pSelectAIS->AddSelectablePoint( + pTargetData->Lat, pTargetData->Lon, (void *)mmsi_long, + SELTYPE_AISTARGET); + pSel->SetUserData(pTargetData->MMSI); } + // Calculate CPA info for this target immediately + UpdateOneCPA(pTargetData.get()); + + // Update this target's track + if (pTargetData->b_show_track) UpdateOneTrack(pTargetData.get()); + } + // TODO add ais message call + plugin_msg.Notify(std::make_shared(*pTargetData), ""); + } else { + // printf("Unrecognised AIS message ID: %d\n", + // pTargetData->MID); + if (new_target) { + // delete pTargetData; // this target is not going to be used + m_n_targets--; + } else { // If this is not an ownship message, update the AIS Target in the - // Selectable list, and update the CPA info + // Selectable list even if the message type was not recognized if (!pTargetData->b_OwnShip) { if (pTargetData->b_positionOnceValid) { long mmsi_long = pTargetData->MMSI; @@ -2345,43 +2373,16 @@ void AisDecoder::CommitAISTarget(std::shared_ptr pTargetData, SELTYPE_AISTARGET); pSel->SetUserData(pTargetData->MMSI); } - - // Calculate CPA info for this target immediately - UpdateOneCPA(pTargetData.get()); - - // Update this target's track - if (pTargetData->b_show_track) UpdateOneTrack(pTargetData.get()); - } - // TODO add ais message call - plugin_msg.Notify(std::make_shared(*pTargetData), ""); - } else { - // printf("Unrecognised AIS message ID: %d\n", - // pTargetData->MID); - if (new_target) { - //delete pTargetData; // this target is not going to be used - m_n_targets--; - } else { - // If this is not an ownship message, update the AIS Target in the - // Selectable list even if the message type was not recognized - if (!pTargetData->b_OwnShip) { - if (pTargetData->b_positionOnceValid) { - long mmsi_long = pTargetData->MMSI; - SelectItem *pSel = pSelectAIS->AddSelectablePoint( - pTargetData->Lat, pTargetData->Lon, (void *)mmsi_long, - SELTYPE_AISTARGET); - pSel->SetUserData(pTargetData->MMSI); - } - } } } - + } } - - -void AisDecoder::getAISTarget(long mmsi, std::shared_ptr &pTargetData, - std::shared_ptr &pStaleTarget, bool &bnewtarget, - int &last_report_ticks, wxDateTime &now) { +void AisDecoder::getAISTarget(long mmsi, + std::shared_ptr &pTargetData, + std::shared_ptr &pStaleTarget, + bool &bnewtarget, int &last_report_ticks, + wxDateTime &now) { now = wxDateTime::Now(); auto it = AISTargetList.find(mmsi); if (it == AISTargetList.end()) // not found @@ -2407,16 +2408,16 @@ void AisDecoder::getAISTarget(long mmsi, std::shared_ptr &pTarget pSelectAIS->DeleteSelectablePoint((void *)mmsi, SELTYPE_AISTARGET); } -void AisDecoder::getMmsiProperties(std::shared_ptr &pTargetData) { +void AisDecoder::getMmsiProperties( + std::shared_ptr &pTargetData) { for (unsigned int i = 0; i < g_MMSI_Props_Array.GetCount(); i++) { if (pTargetData->MMSI == g_MMSI_Props_Array[i]->MMSI) { - MmsiProperties * props = g_MMSI_Props_Array[i]; + MmsiProperties *props = g_MMSI_Props_Array[i]; pTargetData->b_isFollower = props->m_bFollower; pTargetData->b_mPropPersistTrack = props->m_bPersistentTrack; if (TRACKTYPE_NEVER == props->TrackType) { pTargetData->b_show_track = false; - } - else if (TRACKTYPE_ALWAYS == props->TrackType) { + } else if (TRACKTYPE_ALWAYS == props->TrackType) { pTargetData->b_show_track = true; } break; @@ -2424,14 +2425,15 @@ void AisDecoder::getMmsiProperties(std::shared_ptr &pTargetData) } } -std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool b_take_dsc) { +std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, + bool b_take_dsc) { double dsc_lat = 0.; double dsc_lon = 0.; double dsc_mins, dsc_degs, dsc_tmp, dsc_addr; double dse_tmp; double dse_lat = 0.; double dse_lon = 0.; - long dsc_fmt, dsc_quadrant,dsc_cat, dsc_nature; + long dsc_fmt, dsc_quadrant, dsc_cat, dsc_nature; int dsc_mmsi = 0; int dsc_tx_mmsi = 0; @@ -2443,7 +2445,7 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool int mmsi = 0; - std::shared_ptrpTargetData = NULL; + std::shared_ptr pTargetData = NULL; // parse a DSC Position message $CDDSx,..... // Use a tokenizer to pull out the first 9 fields @@ -2457,26 +2459,26 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool m_dsc_last_string = str; token = tkz.GetNextToken(); // format specifier - token.ToLong(&dsc_fmt); // (02-area,12-distress,16-allships,20-individual,...) + token.ToLong( + &dsc_fmt); // (02-area,12-distress,16-allships,20-individual,...) token = tkz.GetNextToken(); // address i.e. mmsi*10 for received msg, or // area spec or sender mmsi for (12) and (16) if (dsc_fmt == 12 || dsc_fmt == 16) { dsc_mmsi = wxAtoi(token.Mid(0, 9)); - } - else { + } else { token.ToDouble(&dsc_addr); - dsc_mmsi = 0 - (int)( dsc_addr / 10 ); // as per NMEA 0183 3.01 + dsc_mmsi = 0 - (int)(dsc_addr / 10); // as per NMEA 0183 3.01 } token = tkz.GetNextToken(); // category token.ToLong(&dsc_cat); // 12 - Distress (relayed) - token = tkz.GetNextToken(); // nature of distress or telecommand1 - if (!token.IsSameAs(wxEmptyString)) { // 00-12 = nature of distress + token = tkz.GetNextToken(); // nature of distress or telecommand1 + if (!token.IsSameAs(wxEmptyString)) { // 00-12 = nature of distress token.ToLong(&dsc_nature); - } - else dsc_nature = 99; + } else + dsc_nature = 99; token = tkz.GetNextToken(); // comm type or telecommand2 @@ -2485,17 +2487,17 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool token = tkz.GetNextToken(); // time or tel. no. token = tkz.GetNextToken(); // mmsi of ship in distress, relay - if (dsc_fmt == 16 && dsc_cat == 12 && !token.IsSameAs(wxEmptyString) ) { - //wxString dmmsi = token.Mid(0,9); - dsc_tx_mmsi = dsc_mmsi; // mmsi of relay issuer + if (dsc_fmt == 16 && dsc_cat == 12 && !token.IsSameAs(wxEmptyString)) { + // wxString dmmsi = token.Mid(0,9); + dsc_tx_mmsi = dsc_mmsi; // mmsi of relay issuer dsc_mmsi = wxAtoi(token.Mid(0, 9)); } token = tkz.GetNextToken(); // nature of distress, relay if (dsc_fmt == 16 && dsc_cat == 12) { - if (!token.IsSameAs(wxEmptyString)) { // 00-12 = nature of distress + if (!token.IsSameAs(wxEmptyString)) { // 00-12 = nature of distress token.ToLong(&dsc_nature); - } - else dsc_nature = 99; + } else + dsc_nature = 99; } token = tkz.GetNextToken(); // acknowledgement token = tkz.GetNextToken(); // expansion indicator @@ -2538,11 +2540,12 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool token = tkz.GetNextToken(); // sentence number token = tkz.GetNextToken(); // query/rely flag token = tkz.GetNextToken(); // vessel MMSI - dse_mmsi = wxAtoi(token.Mid(0, 9)); // ITU-R M.493-10 �5.2 - //token.ToDouble(&dse_addr); - //0 - (int)(dse_addr / 10); // as per NMEA 0183 3.01 + dse_mmsi = wxAtoi(token.Mid( + 0, 9)); // ITU-R M.493-10 �5.2 + // token.ToDouble(&dse_addr); + // 0 - (int)(dse_addr / 10); // as per NMEA 0183 3.01 -# if 0 +#if 0 token = tkz.GetNextToken(); // code field token = tkz.GetNextToken(); // data field - position - 2*4 digits latlon .mins @@ -2552,35 +2555,29 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool dse_lat = dse_lat / 600000.0; dse_lon = dse_lon / 600000.0; #endif - // DSE Sentence may contain multiple dse expansion data items - while (tkz.HasMoreTokens()) { - dseSymbol = tkz.GetNextToken(); //dse expansion data symbol - token = tkz.GetNextToken(); // dse expansion data - if (dseSymbol.IsSameAs(_T("00"))) { // Position - token.ToDouble(&dse_tmp); - dse_lat = (int)(dse_tmp / 10000.0); - dse_lon = (int)(dse_tmp - dse_lat * 10000.0); - dse_lat = dse_lat / 600000.0; - dse_lon = dse_lon / 600000.0; - } - else if (dseSymbol.IsSameAs(_T("01"))) { // Source & Datum - } - else if (dseSymbol.IsSameAs(_T("02"))) { // SOG - token.ToDouble(&dse_tmp); - dse_sog = dse_tmp / 10.0; - } - else if (dseSymbol.IsSameAs(_T("03"))) { // COG - token.ToDouble(&dse_tmp); - dse_cog = dse_tmp / 10.0; - } - else if (dseSymbol.IsSameAs(_T("04"))) { // Station Information - dse_shipName = DecodeDSEExpansionCharacters(token); - } - else if (dseSymbol.IsSameAs(_T("05"))) { // Geographic Information - } - else if (dseSymbol.IsSameAs(_T("06"))) { // Persons On Board - } - } + // DSE Sentence may contain multiple dse expansion data items + while (tkz.HasMoreTokens()) { + dseSymbol = tkz.GetNextToken(); // dse expansion data symbol + token = tkz.GetNextToken(); // dse expansion data + if (dseSymbol.IsSameAs(_T("00"))) { // Position + token.ToDouble(&dse_tmp); + dse_lat = (int)(dse_tmp / 10000.0); + dse_lon = (int)(dse_tmp - dse_lat * 10000.0); + dse_lat = dse_lat / 600000.0; + dse_lon = dse_lon / 600000.0; + } else if (dseSymbol.IsSameAs(_T("01"))) { // Source & Datum + } else if (dseSymbol.IsSameAs(_T("02"))) { // SOG + token.ToDouble(&dse_tmp); + dse_sog = dse_tmp / 10.0; + } else if (dseSymbol.IsSameAs(_T("03"))) { // COG + token.ToDouble(&dse_tmp); + dse_cog = dse_tmp / 10.0; + } else if (dseSymbol.IsSameAs(_T("04"))) { // Station Information + dse_shipName = DecodeDSEExpansionCharacters(token); + } else if (dseSymbol.IsSameAs(_T("05"))) { // Geographic Information + } else if (dseSymbol.IsSameAs(_T("06"))) { // Persons On Board + } + } mmsi = abs((int)dse_mmsi); } @@ -2607,7 +2604,8 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool m_ptentative_dsctarget->StaticReportTicks = now.GetTicks(); m_ptentative_dsctarget->MMSI = mmsi; - m_ptentative_dsctarget->NavStatus = 99; //Undefind. "-" in the AIS target list + m_ptentative_dsctarget->NavStatus = + 99; // Undefind. "-" in the AIS target list m_ptentative_dsctarget->Lat = dsc_lat; m_ptentative_dsctarget->Lon = dsc_lon; m_ptentative_dsctarget->b_positionOnceValid = true; @@ -2652,9 +2650,9 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool m_ptentative_dsctarget->Lon + ((m_ptentative_dsctarget->Lon) >= 0 ? dse_lon : -dse_lon); if (dse_shipName.length() > 0) { - memset(m_ptentative_dsctarget->ShipName,'\0',SHIP_NAME_LEN); - snprintf(m_ptentative_dsctarget->ShipName, dse_shipName.length(), - "%s", dse_shipName.ToAscii().data()); + memset(m_ptentative_dsctarget->ShipName, '\0', SHIP_NAME_LEN); + snprintf(m_ptentative_dsctarget->ShipName, dse_shipName.length(), + "%s", dse_shipName.ToAscii().data()); } m_ptentative_dsctarget->COG = dse_cog; m_ptentative_dsctarget->SOG = dse_sog; @@ -2675,12 +2673,13 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool std::vector ptrack = std::move(pTargetData->m_ptrack); pTargetData->CloneFrom( - m_ptentative_dsctarget.get()); // this will make an empty track list + m_ptentative_dsctarget + .get()); // this will make an empty track list pTargetData->m_ptrack = std::move(ptrack); // and substitute the old track list - //delete m_ptentative_dsctarget; + // delete m_ptentative_dsctarget; } // Reset for next time @@ -2715,23 +2714,23 @@ std::shared_ptr AisDecoder::ProcessDSx(const wxString &str, bool // DSE Expansion characters, decode table from ITU-R M.825 wxString AisDecoder::DecodeDSEExpansionCharacters(wxString dseData) { - wxString result; - char lookupTable[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' ', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', - 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', '.', ',', '-', '/', ' ' }; - - for (size_t i = 0; i < dseData.length(); i += 2) { - result.append(1, lookupTable[strtol(dseData.Mid(i, 2).data(), NULL, 10)]); - } - return result; + wxString result; + char lookupTable[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' ', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', + 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', + 'W', 'X', 'Y', 'Z', '.', ',', '-', '/', ' '}; + + for (size_t i = 0; i < dseData.length(); i += 2) { + result.append(1, lookupTable[strtol(dseData.Mid(i, 2).data(), NULL, 10)]); + } + return result; } //---------------------------------------------------------------------------- // Parse a NMEA VDM/VDO Bitstring //---------------------------------------------------------------------------- bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, - std::shared_ptr ptd) { + std::shared_ptr ptd) { bool parse_result = false; bool b_posn_report = false; @@ -2740,10 +2739,10 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, int message_ID = bstr->GetInt(1, 6); // Parse on message ID ptd->MID = message_ID; - // Save for Ais8_001_31 and ais8_367_33 (class AIS_METEO) + // Save for Ais8_001_31 and ais8_367_33 (class AIS_METEO) int met_mmsi = ptd->MMSI; - // MMSI is always in the same spot in the bitstream + // MMSI is always in the same spot in the bitstream ptd->MMSI = bstr->GetInt(9, 30); switch (message_ID) { @@ -2824,8 +2823,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, ptd->blue_paddle = bstr->GetInt(144, 2); ptd->b_blue_paddle = (ptd->blue_paddle == 2); // paddle is set - if (!ptd->b_isDSCtarget) - ptd->Class = AIS_CLASS_A; + if (!ptd->b_isDSCtarget) ptd->Class = AIS_CLASS_A; // Check for SART and friends by looking at first two digits of MMSI int mmsi_start = ptd->MMSI / 10000000; @@ -2886,8 +2884,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, ptd->m_utc_sec = bstr->GetInt(134, 6); - if (!ptd->b_isDSCtarget) - ptd->Class = AIS_CLASS_B; + if (!ptd->b_isDSCtarget) ptd->Class = AIS_CLASS_B; parse_result = true; // so far so good b_posn_report = true; @@ -2936,8 +2933,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, ptd->DimC = bstr->GetInt(290, 6); ptd->DimD = bstr->GetInt(296, 6); - if (!ptd->b_isDSCtarget) - ptd->Class = AIS_CLASS_B; + if (!ptd->b_isDSCtarget) ptd->Class = AIS_CLASS_B; parse_result = true; // so far so good b_posn_report = true; @@ -2967,8 +2963,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, // It can be both a CLASS A and a CLASS B vessel - We have decided for // CLASS A // TODO: Lookup to see if we have seen it as a CLASS B, and adjust. - if (!ptd->b_isDSCtarget) - ptd->Class = AIS_CLASS_A; + if (!ptd->b_isDSCtarget) ptd->Class = AIS_CLASS_A; ptd->NavStatus = bstr->GetInt(39, 4); @@ -3031,8 +3026,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, case 5: { n_msg5++; - if (!ptd->b_isDSCtarget) - ptd->Class = AIS_CLASS_A; + if (!ptd->b_isDSCtarget) ptd->Class = AIS_CLASS_A; // Get the AIS Version indicator // 0 = station compliant with Recommendation ITU-R M.1371-1 @@ -3200,7 +3194,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, if (offpos) ptd->NavStatus += 1; } - bstr->GetStr( 44, 120, &ptd->ShipName[0], SHIP_NAME_LEN); + bstr->GetStr(44, 120, &ptd->ShipName[0], SHIP_NAME_LEN); // short name only, extension wont fit in Ship structure if (bstr->GetBitCount() > 276) { @@ -3304,18 +3298,22 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, an.start_time + wxTimeSpan::Minutes(an.duration_minutes); } - // Default case, the IMO format https://www.e-navigation.nl/content/area-notice-0 + // Default case, the IMO format + // https://www.e-navigation.nl/content/area-notice-0 int subarea_len = 87; int lon_len = 25; int lat_len = 24; float pos_scale = 60000.0; int prec_size = 3; - if(dac == 366) { // Deprecated US format https://www.e-navigation.nl/content/area-notice-1 + if (dac == + 366) { // Deprecated US format + // https://www.e-navigation.nl/content/area-notice-1 subarea_len = 90; lon_len = 28; lat_len = 27; pos_scale = 600000.0; - prec_size = 0; // Not present in the in US format between coordinates and radius for some shapes + prec_size = 0; // Not present in the in US format between + // coordinates and radius for some shapes } int subarea_count = (bstr->GetBitCount() - 111) / subarea_len; @@ -3334,17 +3332,31 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, scale_factor = scale_multipliers[bstr->GetInt(base + 4, 2)]; switch (sa.shape) { case AIS8_001_22_SHAPE_SECTOR: - sa.left_bound_deg = bstr->GetInt(base + 6 + lon_len + lat_len + prec_size + 12, 9); - sa.right_bound_deg = bstr->GetInt(base + 6 + lon_len + lat_len + prec_size + 12 + 9, 9); + sa.left_bound_deg = bstr->GetInt( + base + 6 + lon_len + lat_len + prec_size + 12, 9); + sa.right_bound_deg = bstr->GetInt( + base + 6 + lon_len + lat_len + prec_size + 12 + 9, 9); case AIS8_001_22_SHAPE_CIRCLE: - sa.radius_m = bstr->GetInt(base + 6 + lon_len + lat_len + 3, 12) * scale_factor; + sa.radius_m = + bstr->GetInt(base + 6 + lon_len + lat_len + 3, 12) * + scale_factor; // FALL THROUGH case AIS8_001_22_SHAPE_RECT: - sa.longitude = bstr->GetInt(base + 6, lon_len, true) / pos_scale; - sa.latitude = bstr->GetInt(base + 6 + lon_len, lat_len, true) / pos_scale; - sa.e_dim_m = bstr->GetInt(base + 6 + lon_len + lat_len + prec_size, 8) * scale_factor; - sa.n_dim_m = bstr->GetInt(base + 6 + lon_len + lat_len + prec_size + 8, 8) * scale_factor; - sa.orient_deg = bstr->GetInt(base + 6 + lon_len + lat_len + prec_size + 8 + 8, 9); + sa.longitude = + bstr->GetInt(base + 6, lon_len, true) / pos_scale; + sa.latitude = + bstr->GetInt(base + 6 + lon_len, lat_len, true) / + pos_scale; + sa.e_dim_m = + bstr->GetInt(base + 6 + lon_len + lat_len + prec_size, + 8) * + scale_factor; + sa.n_dim_m = + bstr->GetInt( + base + 6 + lon_len + lat_len + prec_size + 8, 8) * + scale_factor; + sa.orient_deg = bstr->GetInt( + base + 6 + lon_len + lat_len + prec_size + 8 + 8, 9); break; case AIS8_001_22_SHAPE_POLYLINE: case AIS8_001_22_SHAPE_POLYGON: @@ -3362,10 +3374,10 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, } } - // Meteorological and Hydrographic data ref: IMO SN.1/Circ.289 + // Meteorological and Hydrographic data ref: IMO SN.1/Circ.289 if (fi == 31) { if (bstr->GetBitCount() >= 360) { - //Ais8_001_31 mmsi can have been changed. + // Ais8_001_31 mmsi can have been changed. if (met_mmsi != 666) ptd->MMSI = met_mmsi; // Default out of bounce values. @@ -3376,27 +3388,27 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, int lat = bstr->GetInt(82, 24); if (lon & 0x01000000) // negative? - lon |= 0xFE000000; + lon |= 0xFE000000; lon_tentative = lon / 60000.; - if (lat & 0x00800000) //negative? - lat |= 0xFF000000; + if (lat & 0x00800000) // negative? + lat |= 0xFF000000; lat_tentative = lat / 60000.; ptd->Lon = lon_tentative; ptd->Lat = lat_tentative; - // Try to make unique name for each station based on position + // Try to make unique name for each station based on position wxString x = ptd->ShipName; if (x.Find("METEO") == wxNOT_FOUND) { - double id1, id2; - wxString slat = wxString::Format("%0.3f", lat_tentative); - wxString slon = wxString::Format("%0.3f", lon_tentative); - slat.ToDouble(&id1); - slon.ToDouble(&id2); - wxString nameID = "METEO "; - nameID << wxString::Format("%0.3f", abs(id1) + abs(id2)).Right(3); - strncpy(ptd->ShipName, nameID, SHIP_NAME_LEN - 1); + double id1, id2; + wxString slat = wxString::Format("%0.3f", lat_tentative); + wxString slon = wxString::Format("%0.3f", lon_tentative); + slat.ToDouble(&id1); + slon.ToDouble(&id2); + wxString nameID = "METEO "; + nameID << wxString::Format("%0.3f", abs(id1) + abs(id2)).Right(3); + strncpy(ptd->ShipName, nameID, SHIP_NAME_LEN - 1); } ptd->met_data.pos_acc = bstr->GetInt(106, 1); @@ -3425,8 +3437,8 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, ptd->met_data.airpress_tend = bstr->GetInt(192, 2); int horVis = bstr->GetInt(194, 8); - if (horVis & 0x80u) { // if MSB = 1 - horVis &= 0x7F; // We print >x.x + if (horVis & 0x80u) { // if MSB = 1 + horVis &= 0x7F; // We print >x.x ptd->met_data.hor_vis_GT = true; } else ptd->met_data.hor_vis_GT = false; @@ -3474,11 +3486,12 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, } if (dac == 367 && fi == 33) { // ais8_367_33 - // US data acording to DAC367_FI33_em_version_release_3-23mar15_0 - // We use only the same kind of data as of ais8_001_31 from these reports. + // US data acording to DAC367_FI33_em_version_release_3-23mar15_0 + // We use only the same kind of data as of ais8_001_31 from these + // reports. const int size = bstr->GetBitCount(); if (size >= 168) { - // Change to meteo mmsi-ID + // Change to meteo mmsi-ID if (met_mmsi != 666) ptd->MMSI = met_mmsi; const int startbits = 56; const int slotsize = 112; @@ -3491,7 +3504,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, ptd->met_data.minute = bstr->GetInt(slotbit + 71, 6); int Site_ID = bstr->GetInt(slotbit + 77, 7); - // Name the station acc to site ID until message type 1 + // Name the station acc to site ID until message type 1 if (!ptd->b_nameValid) { wxString nameID = "METEO Site: "; nameID << Site_ID; @@ -3499,7 +3512,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, ptd->b_nameValid = true; } - if (type == 0) { //Location + if (type == 0) { // Location int lon = bstr->GetInt(slotbit + 90, 28); if (lon & 0x08000000) // negative? lon |= 0xf0000000; @@ -3516,7 +3529,7 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, ptd->b_nameValid = true; } else if (type == 2) { // Wind - // Description 1 and 2 are real time values. + // Description 1 and 2 are real time values. int descr = bstr->GetInt(slotbit + 116, 3); if (descr == 1 || descr == 2) { ptd->met_data.wind_kn = bstr->GetInt(slotbit + 84, 7); @@ -3530,14 +3543,14 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, int descr = bstr->GetInt(slotbit + 108, 3); if (descr == 1 || descr == 2) { int wltype = bstr->GetInt(slotbit + 84, 1); - int wl = bstr->GetInt(slotbit + 85, 16); // cm - if (wl & 0x00004000) // negative? + int wl = bstr->GetInt(slotbit + 85, 16); // cm + if (wl & 0x00004000) // negative? wl |= 0xffff0000; - if (wltype == 1) // 0 = deviation from datum; 1 = water depth - ptd->met_data.water_level = wl/100.; // m + if (wltype == 1) // 0 = deviation from datum; 1 = water depth + ptd->met_data.water_level = wl / 100.; // m else - ptd->met_data.water_lev_dev = wl / 100.; // m + ptd->met_data.water_lev_dev = wl / 100.; // m } ptd->met_data.water_lev_trend = bstr->GetInt(slotbit + 101, 2); ptd->met_data.vertical_ref = bstr->GetInt(slotbit + 103, 5); @@ -3550,27 +3563,32 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, int readLevel = bstr->GetInt(slotbit + 119, 9); } else if (type == 7) { // Sea state - int swell_descr = bstr->GetInt(slotbit + 111, 3); // Use 1 || 2 real data + int swell_descr = + bstr->GetInt(slotbit + 111, 3); // Use 1 || 2 real data if (swell_descr == 1 || swell_descr == 2) { - ptd->met_data.swell_height = bstr->GetInt(slotbit + 84, 8) / 10.0; + ptd->met_data.swell_height = + bstr->GetInt(slotbit + 84, 8) / 10.0; ptd->met_data.swell_per = bstr->GetInt(slotbit + 92, 6); ptd->met_data.swell_dir = bstr->GetInt(slotbit + 98, 9); } - ptd->met_data.seastate = bstr->GetInt(slotbit + 107, 4); // Bf + ptd->met_data.seastate = bstr->GetInt(slotbit + 107, 4); // Bf int wt_descr = bstr->GetInt(slotbit + 131, 3); if (wt_descr == 1 || wt_descr == 2) - ptd->met_data.water_temp = bstr->GetInt(slotbit + 114, 10) / 10. - 10.; + ptd->met_data.water_temp = + bstr->GetInt(slotbit + 114, 10) / 10. - 10.; int wawe_descr = bstr->GetInt(slotbit + 157, 3); - if (wawe_descr == 1 || wawe_descr == 2) { // Only real data - ptd->met_data.wave_height = bstr->GetInt(slotbit + 134, 8) / 10.0; + if (wawe_descr == 1 || wawe_descr == 2) { // Only real data + ptd->met_data.wave_height = + bstr->GetInt(slotbit + 134, 8) / 10.0; ptd->met_data.wave_period = bstr->GetInt(slotbit + 142, 6); ptd->met_data.wave_dir = bstr->GetInt(slotbit + 148, 9); } ptd->met_data.salinity = bstr->GetInt(slotbit + 160, 9 / 10.0); } else if (type == 8) { // Salinity - ptd->met_data.water_temp = bstr->GetInt(slotbit + 84, 10) / 10.0 - 10.0; + ptd->met_data.water_temp = + bstr->GetInt(slotbit + 84, 10) / 10.0 - 10.0; ptd->met_data.salinity = bstr->GetInt(slotbit + 120, 9) / 10.0; } else if (type == 9) { // Weather @@ -3578,20 +3596,21 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, if (tmp & 0x00000400) // negative? tmp |= 0xFFFFF800; ptd->met_data.air_temp = tmp / 10.; - int pp , precip = bstr->GetInt(slotbit + 98, 2); - switch (precip) { // Adapt to IMO precipitation - case 0: - pp = 1; - case 1: - pp = 5; - case 2: - pp = 4; - case 3: - pp = 7; + int pp, precip = bstr->GetInt(slotbit + 98, 2); + switch (precip) { // Adapt to IMO precipitation + case 0: + pp = 1; + case 1: + pp = 5; + case 2: + pp = 4; + case 3: + pp = 7; } ptd->met_data.precipitation = pp; ptd->met_data.hor_vis = bstr->GetInt(slotbit + 100, 8) / 10.0; - ptd->met_data.dew_point = bstr->GetInt(slotbit + 108, 10) / 10.0 - 20.0; + ptd->met_data.dew_point = + bstr->GetInt(slotbit + 108, 10) / 10.0 - 20.0; ptd->met_data.airpress = bstr->GetInt(slotbit + 121, 9) + 799; ptd->met_data.airpress_tend = bstr->GetInt(slotbit + 130, 2); ptd->met_data.salinity = bstr->GetInt(slotbit + 135, 9) / 10.0; @@ -3600,9 +3619,9 @@ bool AisDecoder::Parse_VDXBitstring(AisBitstring *bstr, // Description 1 and 2 are real time values. int descr = bstr->GetInt(slotbit + 113, 3); if (descr == 1 || descr == 2) { - ptd->met_data.wind_kn = bstr->GetInt(slotbit + 84, 7); - ptd->met_data.wind_gust_kn = bstr->GetInt(slotbit + 91, 7); - ptd->met_data.wind_dir = bstr->GetInt(slotbit + 98, 9); + ptd->met_data.wind_kn = bstr->GetInt(slotbit + 84, 7); + ptd->met_data.wind_gust_kn = bstr->GetInt(slotbit + 91, 7); + ptd->met_data.wind_dir = bstr->GetInt(slotbit + 98, 9); } } } @@ -3743,7 +3762,6 @@ void AisDecoder::UpdateOneTrack(AisTargetData *ptarget) { } } - // Avoid duplicate track points // Do not add track point if time since last point is < 2 seconds. if ((ptarget->PositionReportTicks - ptarget->LastPositionReportTicks) > 2) { @@ -3774,7 +3792,7 @@ void AisDecoder::UpdateOneTrack(AisTargetData *ptarget) { TrackPoint *tp1 = t->AddNewPoint(point, wxDateTime(ptrackpoint.m_time).ToUTC()); - if(tp) + if (tp) pSelect->AddSelectableTrackSegment(tp->m_lat, tp->m_lon, tp1->m_lat, tp1->m_lon, tp, tp1, t); @@ -3783,18 +3801,17 @@ void AisDecoder::UpdateOneTrack(AisTargetData *ptarget) { // pRouteManagerDialog->UpdateTrkListCtrl(); } else { - - // Walk the list, removing any track points that are older than the - // stipulated time - time_t test_time = - wxDateTime::Now().GetTicks() - (time_t)(g_AISShowTracks_Mins * 60); - - ptarget->m_ptrack.erase( - std::remove_if(ptarget->m_ptrack.begin(), ptarget->m_ptrack.end(), - [=](const AISTargetTrackPoint &track) { - return track.m_time < test_time; - }), - ptarget->m_ptrack.end()); + // Walk the list, removing any track points that are older than the + // stipulated time + time_t test_time = + wxDateTime::Now().GetTicks() - (time_t)(g_AISShowTracks_Mins * 60); + + ptarget->m_ptrack.erase( + std::remove_if(ptarget->m_ptrack.begin(), ptarget->m_ptrack.end(), + [=](const AISTargetTrackPoint &track) { + return track.m_time < test_time; + }), + ptarget->m_ptrack.end()); } } } @@ -3805,7 +3822,7 @@ void AisDecoder::DeletePersistentTrack(Track *track) { if (iterator->second == track) { int mmsi = iterator->first; m_persistent_tracks.erase(iterator); - //Last tracks for this target? + // Last tracks for this target? if (0 == m_persistent_tracks.count(mmsi)) { for (unsigned int i = 0; i < g_MMSI_Props_Array.GetCount(); i++) { if (mmsi == g_MMSI_Props_Array[i]->MMSI) { @@ -3814,7 +3831,8 @@ void AisDecoder::DeletePersistentTrack(Track *track) { // Ask if mmsi props should be changed. // Avoid creation of a new track while messaging - std::shared_ptr td = Get_Target_Data_From_MMSI(mmsi); + std::shared_ptr td = + Get_Target_Data_From_MMSI(mmsi); if (td) { props->m_bPersistentTrack = false; td->b_mPropPersistTrack = false; @@ -3837,7 +3855,7 @@ void AisDecoder::UpdateAllAlarms(void) { // Iterate thru all the targets for (const auto &it : GetTargetList()) { - std::shared_ptr td = it.second; + std::shared_ptr td = it.second; if (NULL != td) { // Maintain General Alert @@ -3863,7 +3881,8 @@ void AisDecoder::UpdateAllAlarms(void) { m_bGeneralAlert = true; // DSC Distress targets always alert - if (( td->Class == AIS_DSC ) && ( ( td->ShipType == 12 ) || ( td->ShipType == 16 ) )) + if ((td->Class == AIS_DSC) && + ((td->ShipType == 12) || (td->ShipType == 16))) m_bGeneralAlert = true; } @@ -3874,7 +3893,8 @@ void AisDecoder::UpdateAllAlarms(void) { this_alarm = AIS_ALERT_SET; // DSC Distress targets always alert - if ((td->Class == AIS_DSC) && (( td->ShipType == 12 ) || ( td->ShipType == 16 )) ) + if ((td->Class == AIS_DSC) && + ((td->ShipType == 12) || (td->ShipType == 16))) this_alarm = AIS_ALERT_SET; if (g_bCPAWarn && td->b_active && td->b_positionOnceValid && @@ -3925,7 +3945,8 @@ void AisDecoder::UpdateAllAlarms(void) { // SART and DSC targets always maintain ack timeout if (g_bAIS_ACK_Timeout || (td->Class == AIS_SART) || - ((td->Class == AIS_DSC) && ((td->ShipType == 12) || (td->ShipType == 16)) )) { + ((td->Class == AIS_DSC) && + ((td->ShipType == 12) || (td->ShipType == 16)))) { if (td->b_in_ack_timeout) { wxTimeSpan delta = wxDateTime::Now() - td->m_ack_time; if (delta.GetMinutes() > g_AckTimeout_Mins) @@ -4100,7 +4121,8 @@ void AisDecoder::OnTimerAIS(wxTimerEvent &event) { wxDateTime now = wxDateTime::Now(); now.MakeGMT(); - std::unordered_map> ¤t_targets = GetTargetList(); + std::unordered_map> ¤t_targets = + GetTargetList(); auto it = current_targets.begin(); std::vector remove_array; // collector for MMSI of targets to be removed @@ -4111,7 +4133,8 @@ void AisDecoder::OnTimerAIS(wxTimerEvent &event) { current_targets.erase(it); break; // leave the loop } - //std::shared_ptr xtd(std::make_shared(*it->second)); + // std::shared_ptr + // xtd(std::make_shared(*it->second)); std::shared_ptr xtd = it->second; int target_posn_age = now.GetTicks() - xtd->PositionReportTicks; @@ -4150,7 +4173,8 @@ void AisDecoder::OnTimerAIS(wxTimerEvent &event) { iECD_LostTimeOut = 60; } - if ((target_posn_age > iECD_LostTimeOut) && (xtd->Class != AIS_GPSG_BUDDY)) + if ((target_posn_age > iECD_LostTimeOut) && + (xtd->Class != AIS_GPSG_BUDDY)) xtd->b_active = false; removelost_Mins = (2 * iECD_LostTimeOut) / 60.; @@ -4220,7 +4244,7 @@ void AisDecoder::OnTimerAIS(wxTimerEvent &event) { if (itd != current_targets.end()) { std::shared_ptr td = itd->second; current_targets.erase(itd); - //delete td; + // delete td; } } @@ -4265,12 +4289,13 @@ void AisDecoder::OnTimerAIS(wxTimerEvent &event) { } } } - } else if ((td->Class == AIS_DSC) && ((td->ShipType == 12) || (td->ShipType == 16)) ) { + } else if ((td->Class == AIS_DSC) && + ((td->ShipType == 12) || (td->ShipType == 16))) { if (td->b_active) { if ((AIS_ALERT_SET == td->n_alert_state) && !td->b_in_ack_timeout) { palert_target_dsc = td; - } - else { // Reset DCS flag to open for a real AIS for the same target + } else { // Reset DCS flag to open for a real AIS for the same + // target td->b_isDSCtarget = false; } } @@ -4303,14 +4328,12 @@ void AisDecoder::OnTimerAIS(wxTimerEvent &event) { palert_target = palert_target_dsc; audioType = AISAUDIO_DSC; } - } - else { + } else { // Alert is currently shown, get target from from knowable GUI palert_target = Get_Target_Data_From_MMSI(m_callbacks.get_target_mmsi()); } - // Show or update the alert - if (palert_target) - info_update.Notify(palert_target, ""); + // Show or update the alert + if (palert_target) info_update.Notify(palert_target, ""); TimerAIS.Start(TIMER_AIS_MSEC, wxTIMER_CONTINUOUS); } @@ -4464,8 +4487,8 @@ void AISshipNameCache(AisTargetData *pTargetData, // else there IS a valid name, lets check if it is in one of the hash lists. else if ((pTargetData->MID == 5) || (pTargetData->MID == 24) || (pTargetData->MID == 19) || - (pTargetData->MID == 123) || // 123: Has got a name from SignalK - (pTargetData->MID == 124) ) { // 124: Has got a name from n2k + (pTargetData->MID == 123) || // 123: Has got a name from SignalK + (pTargetData->MID == 124)) { // 124: Has got a name from n2k // This message contains ship static data, so has a name field pTargetData->b_nameFromCache = false; ship_name = trimAISField(pTargetData->ShipName); @@ -4515,8 +4538,9 @@ void AISshipNameCache(AisTargetData *pTargetData, (*AISTargetNamesNC)[mmsi] = ship_name; } if (g_bUseOnlyConfirmedAISName) { // copy back previous name - pTargetData->ShipName[SHIP_NAME_LEN - 1] ='\0'; - strncpy(pTargetData->ShipName, "Unknown ", SHIP_NAME_LEN - 1); + pTargetData->ShipName[SHIP_NAME_LEN - 1] = '\0'; + strncpy(pTargetData->ShipName, "Unknown ", + SHIP_NAME_LEN - 1); } } } @@ -4543,13 +4567,14 @@ wxString GetShipNameFromFile(int nmmsi) { return name; } - // Assign a unique meteo mmsi related to position -int AisMeteoNewMmsi(int orig_mmsi, int m_lat,int m_lon, int lon_bits = 0, int siteID = 0) { +// Assign a unique meteo mmsi related to position +int AisMeteoNewMmsi(int orig_mmsi, int m_lat, int m_lon, int lon_bits = 0, + int siteID = 0) { bool found = false; int new_mmsi = 0; if ((!lon_bits || lon_bits == 999) && siteID) { - // Check if a ais8_367_33 data report belongs to a present site - // Or SignalK data (lon_bits == 999) + // Check if a ais8_367_33 data report belongs to a present site + // Or SignalK data (lon_bits == 999) auto &points = AisMeteoPoints::GetInstance().GetPoints(); if (points.size()) { for (const auto &point : points) { @@ -4563,7 +4588,7 @@ int AisMeteoNewMmsi(int orig_mmsi, int m_lat,int m_lon, int lon_bits = 0, int si } } if (!found && !lon_bits) { - // ais8_367_33 + // ais8_367_33 return 0; } } @@ -4589,8 +4614,8 @@ int AisMeteoNewMmsi(int orig_mmsi, int m_lat,int m_lon, int lon_bits = 0, int si lat_tentative = m_lat / 600000.; } - // Since buoys can move we use position precision not better - // than 50 m to be able to compare previous messages + // Since buoys can move we use position precision not better + // than 50 m to be able to compare previous messages wxString slon = wxString::Format("%0.3f", lon_tentative); wxString slat = wxString::Format("%0.3f", lat_tentative); @@ -4601,14 +4626,13 @@ int AisMeteoNewMmsi(int orig_mmsi, int m_lat,int m_lon, int lon_bits = 0, int si // 199 is INMARSAT-A MID, should not occur ever in AIS stream. // 1992 to 1993 are already used so here we use 1994+ static int nextMeteommsi = 199400000; - auto& points = AisMeteoPoints::GetInstance().GetPoints(); + auto &points = AisMeteoPoints::GetInstance().GetPoints(); if (lon_bits != 999 && points.size()) { // 999 comes from SignalK wxString t_lat, t_lon; - for (const auto& point: points) { + for (const auto &point : points) { // Does this station position exist - if (slat.IsSameAs(point.lat) && - slon.IsSameAs(point.lon)) { + if (slat.IsSameAs(point.lat) && slon.IsSameAs(point.lon)) { // Created before. Continue new_mmsi = point.mmsi; found = true; @@ -4619,7 +4643,8 @@ int AisMeteoNewMmsi(int orig_mmsi, int m_lat,int m_lon, int lon_bits = 0, int si if (!found) { // Create a new post nextMeteommsi++; - points.push_back(AisMeteoPoint(nextMeteommsi, slat, slon, siteID, orig_mmsi)); + points.push_back( + AisMeteoPoint(nextMeteommsi, slat, slon, siteID, orig_mmsi)); new_mmsi = nextMeteommsi; } return new_mmsi; diff --git a/model/src/ais_target_data.cpp b/model/src/ais_target_data.cpp index 927b09c319..f05ea44be7 100644 --- a/model/src/ais_target_data.cpp +++ b/model/src/ais_target_data.cpp @@ -84,7 +84,6 @@ wxString trimAISField(char *data) { return field; } - wxString ais_get_status(int index) { static const wxString ais_status[] = { _("Underway using Engine"), @@ -143,6 +142,7 @@ wxString aisMeteoPrecipType(int precip) { break; case 4: prec = "Mixed / ice"; + break; case 5: prec = "Snow"; break; @@ -170,6 +170,7 @@ wxString aisMeteoWaterLevelRef(int refID) { break; case 4: ref = "MHHW"; + break; case 5: ref = "MHW"; break; @@ -201,7 +202,7 @@ wxString aisMeteoWaterLevelRef(int refID) { return ref; } -AisTargetData::AisTargetData(AisTargetCallbacks cb ) : m_callbacks(cb) { +AisTargetData::AisTargetData(AisTargetCallbacks cb) : m_callbacks(cb) { strncpy(ShipName, "Unknown ", SHIP_NAME_LEN); strncpy(CallSign, " ", 8); strncpy(Destination, " ", DESTINATION_LEN); @@ -412,7 +413,7 @@ void AisTargetData::CloneFrom(AisTargetData *q) { } AisTargetData::~AisTargetData() { m_ptrack.clear(); } -//AisTargetData::~AisTargetData() { m_pMetPoint.clear(); } //TODO Needed? +// AisTargetData::~AisTargetData() { m_pMetPoint.clear(); } //TODO Needed? wxString AisTargetData::GetFullName(void) { wxString retName; @@ -507,11 +508,11 @@ wxString AisTargetData::BuildQueryResult(void) { if (met_data.stationID) { // Facilitate to find a Meteo target on SignalK wxString SK_ID = wxString::Format(_T("%06d"), (met_data.stationID - 1000000)); - html << " " << "SK-ID: " << SK_ID; + html << " " + << "SK-ID: " << SK_ID; } html << rowEnd << _T(""); - } - else + } else html << _T("") << rowStart << _("MMSI") @@ -528,8 +529,8 @@ wxString AisTargetData::BuildQueryResult(void) { ? _("Nation") : _("Flag")) << rowEnd << _T("") << rowStartH - << _T("") - << GetCountryCode(true) << rowEnd << _T("
"); + << _T("") << GetCountryCode(true) << rowEnd + << _T(""); wxString navStatStr; if ((Class != AIS_BASE) && (Class != AIS_CLASS_B) && (Class != AIS_SART) && @@ -651,24 +652,24 @@ wxString AisTargetData::BuildQueryResult(void) { << _T("") << navStatStr; html << rowEnd << _T("") << _T("") << sizeString << rowEnd; - } - else if (Class == AIS_DSC && (ShipType == 12 || ShipType == 16) ) { - if (ShipType == 16) { //Distress relay - html << _T("") << _T("") << _("Distress relay"); + } else if (Class == AIS_DSC && (ShipType == 12 || ShipType == 16)) { + if (ShipType == 16) { // Distress relay + html << _T("") + << _T("") << _("Distress relay"); if (m_dscTXmmsi > 2000000) { wxString mmsirelay = wxString::Format(_T(" %09d"), abs(m_dscTXmmsi)); html << _T(" ") << _("by:") << mmsirelay; } html << _T("") << sizeString << rowEnd; } - html << _T("") << _("Nature of distress: ") - << rowEnd << _T(""); + html << _T("") << _("Nature of distress: ") << rowEnd + << _T(""); if (m_dscNature < 13) { - html << _T("") << _T("") << GetNatureofDistress(m_dscNature) - << _T("") << sizeString << rowEnd << _T(""); + html << _T("") + << _T("") << GetNatureofDistress(m_dscNature) << _T("") + << sizeString << rowEnd << _T(""); } - } - else if ((Class != AIS_BASE) && (Class != AIS_DSC)) { + } else if ((Class != AIS_BASE) && (Class != AIS_DSC)) { html << _T("") << _T("") << AISTypeStr; if (navStatStr.Length()) html << _T(", ") << navStatStr; @@ -694,7 +695,8 @@ wxString AisTargetData::BuildQueryResult(void) { << rowStartH << _T("") << toSDMM(1, Lat) << _T("") << FormatTimeAdaptive(target_age) << rowEnd << rowStartH << _T("") << toSDMM(2, Lon); - if (Class != AIS_METEO) html << rowEnd; + if (Class != AIS_METEO) + html << rowEnd; else { wxString meteoTime = wxString::Format(" %02d:%02d", met_data.hour, met_data.minute); @@ -750,11 +752,11 @@ wxString AisTargetData::BuildQueryResult(void) { if (crs < 360) { wxString magString, trueString; if (g_bShowMag) - magString << wxString::Format(wxString("%03d%c(M)"), - static_cast(m_callbacks.get_mag(COG)), - 0x00B0); + magString << wxString::Format( + wxString("%03d%c(M)"), static_cast(m_callbacks.get_mag(COG)), + 0x00B0); if (g_bShowTrue) - trueString << wxString::Format( wxString("%03d%c "), (int)crs, 0x00B0 ); + trueString << wxString::Format(wxString("%03d%c "), (int)crs, 0x00B0); courseStr << trueString << magString; } else if (COG == 360.0) @@ -820,7 +822,7 @@ wxString AisTargetData::BuildQueryResult(void) { static_cast(m_callbacks.get_mag(Brg)), 0x00B0); if (g_bShowTrue) - trueString << wxString::Format( wxString("%03d%c "), (int)Brg, 0x00B0 ); + trueString << wxString::Format(wxString("%03d%c "), (int)Brg, 0x00B0); brgStr << trueString << magString; } else @@ -894,27 +896,30 @@ wxString AisTargetData::BuildQueryResult(void) { if (Class == AIS_METEO) { if (met_data.wind_kn < 122) { double userwindspeed = toUsrWindSpeed(met_data.wind_kn); - wxString wspeed = wxString::Format("%0.1f %s %d%c", userwindspeed, getUsrWindSpeedUnit(), - met_data.wind_dir, 0x00B0); + wxString wspeed = + wxString::Format("%0.1f %s %d%c", userwindspeed, + getUsrWindSpeedUnit(), met_data.wind_dir, 0x00B0); double userwindgustspeed = toUsrWindSpeed(met_data.wind_gust_kn); wxString wspeedGust = wxString::Format("%.0f %s %d%c", userwindgustspeed, - getUsrWindSpeedUnit(), met_data.wind_gust_dir, 0x00B0); + getUsrWindSpeedUnit(), + met_data.wind_gust_dir, 0x00B0); if (met_data.wind_gust_kn >= 126) wspeedGust = wxEmptyString; html << vertSpacer << rowStart << _("Wind speed") - << _T("") - << _("Wind gust") + << _T("") << _("Wind gust") << _T("") << rowStartH << _T("") << wspeed << _T("") << wspeedGust << rowEnd; } - if (met_data.water_lev_dev < 30. || met_data.water_level > -32. || met_data.current < 25.5) { + if (met_data.water_lev_dev < 30. || met_data.water_level > -32. || + met_data.current < 25.5) { wxString wlevel_txt = _("Water level deviation"); wxString wlevel; if (met_data.water_lev_dev < 30.) { double userlevel = toUsrDepth(met_data.water_lev_dev); - wlevel = wxString::Format("%.1f %s %s", userlevel, getUsrDepthUnit(), + wlevel = + wxString::Format("%.1f %s %s", userlevel, getUsrDepthUnit(), ais_meteo_get_trend(met_data.water_lev_trend)); if (met_data.vertical_ref < 14) { wlevel_txt = _("Water level dev. Ref: "); @@ -925,7 +930,8 @@ wxString AisTargetData::BuildQueryResult(void) { } else if (met_data.water_level > -32.) { double userlevel = toUsrDepth(met_data.water_level); - wlevel = wxString::Format("%.1f %s %s", userlevel, getUsrDepthUnit(), + wlevel = + wxString::Format("%.1f %s %s", userlevel, getUsrDepthUnit(), ais_meteo_get_trend(met_data.water_lev_trend)); wlevel_txt = _("Water level"); if (met_data.water_level <= -32.) wlevel = wxEmptyString; @@ -936,31 +942,29 @@ wxString AisTargetData::BuildQueryResult(void) { if (met_data.current >= 25.5) current = wxEmptyString; html << vertSpacer << rowStart << wlevel_txt - << _T("") - << _("Surface current ") << _T("") << rowStartH - << _T("") << wlevel << _T("") - << current << rowEnd; + << _T("") + << _("Surface current ") << _T("") << rowStartH + << _T("") << wlevel << _T("") + << current << rowEnd; } if (met_data.wave_height < 24.6 || met_data.swell_height < 24.6) { double userwave = toUsrDepth(met_data.wave_height); - wxString wave = - wxString::Format("%.1f %s %d%c %d %s ", userwave, getUsrDepthUnit(), - met_data.wave_dir, 0x00B0, - met_data.wave_period, _("s")); + wxString wave = wxString::Format("%.1f %s %d%c %d %s ", userwave, + getUsrDepthUnit(), met_data.wave_dir, + 0x00B0, met_data.wave_period, _("s")); if (met_data.wave_height >= 24.6) wave = wxEmptyString; double userswell = toUsrDepth(met_data.swell_height); - wxString swell = - wxString::Format("%.1f %s %d%c %d %s", userswell, getUsrDepthUnit(), - met_data.swell_dir, 0x00B0, - met_data.swell_per, _("s")); + wxString swell = wxString::Format("%.1f %s %d%c %d %s", userswell, + getUsrDepthUnit(), met_data.swell_dir, + 0x00B0, met_data.swell_per, _("s")); if (met_data.swell_height >= 25.) swell = wxEmptyString; html << vertSpacer << rowStart << _("Waves height & period") << _T("") - << _("Swell height & period ") - << _T("") << rowStartH << _T("") << wave + << _("Swell height & period ") << _T("") + << rowStartH << _T("") << wave << _T("") << swell << rowEnd; } @@ -970,16 +974,17 @@ wxString AisTargetData::BuildQueryResult(void) { wxString::Format("%.1f%c%s", usertemp, 0x00B0, getUsrTempUnit()); if (met_data.air_temp == -102.4) airtemp = wxEmptyString; - wxString airpress = wxString::Format( - "%d hPa %s", met_data.airpress, - ais_meteo_get_trend(met_data.airpress_tend)); + wxString airpress = + wxString::Format("%d hPa %s", met_data.airpress, + ais_meteo_get_trend(met_data.airpress_tend)); const int ap = met_data.airpress; if (ap < 800 || ap >= 1310) airpress = wxEmptyString; html << vertSpacer << rowStart << _("Air Temperatur") - << _T("") << _("Air pressure") - << _T("") << rowStartH << _T("") << airtemp - << _T("") << airpress << rowEnd; + << _T("") + << _("Air pressure") << _T("") << rowStartH + << _T("") << airtemp << _T("") + << airpress << rowEnd; } if (met_data.rel_humid < 101 || met_data.dew_point < 50.) { @@ -1014,8 +1019,8 @@ wxString AisTargetData::BuildQueryResult(void) { } if (met_data.precipitation < 7 || met_data.hor_vis < 12.7) { - wxString precip = wxString::Format("%s", - aisMeteoPrecipType(met_data.precipitation)); + wxString precip = + wxString::Format("%s", aisMeteoPrecipType(met_data.precipitation)); if (met_data.precipitation >= 6) precip = wxEmptyString; double userVisDist = toUsrDistance(met_data.hor_vis); @@ -1148,11 +1153,11 @@ wxString AisTargetData::GetRolloverString(void) { if (crs < 360) { wxString magString, trueString; if (g_bShowMag) - magString << wxString::Format(wxString("%03d%c(M) "), - static_cast(m_callbacks.get_mag(COG)), - 0x00B0); + magString << wxString::Format( + wxString("%03d%c(M) "), + static_cast(m_callbacks.get_mag(COG)), 0x00B0); if (g_bShowTrue) - trueString << wxString::Format( wxString("%03d%c "), (int)crs, 0x00B0 ); + trueString << wxString::Format(wxString("%03d%c "), (int)crs, 0x00B0); result << trueString << magString; } @@ -1176,7 +1181,8 @@ wxString AisTargetData::GetRolloverString(void) { if (result.Len()) result << "\n"; double userwindspeed = toUsrWindSpeed(met_data.wind_kn); result << _("Wind speed"); - result << wxString::Format(": %0.1f %s", userwindspeed, getUsrWindSpeedUnit()) + result << wxString::Format(": %0.1f %s", userwindspeed, + getUsrWindSpeedUnit()) << wxString::Format(" %d%c ", met_data.wind_dir, 0x00B0); } @@ -1184,9 +1190,8 @@ wxString AisTargetData::GetRolloverString(void) { if (result.Len()) result << "\n"; result << _("Water level deviation"); double userdepth; - userdepth = toUsrDepth(met_data.water_lev_dev); - result << wxString::Format(": %.1f %s", userdepth, - getUsrDepthUnit()); + userdepth = toUsrDepth(met_data.water_lev_dev); + result << wxString::Format(": %.1f %s", userdepth, getUsrDepthUnit()); } else if (met_data.water_level > -32.) { if (result.Len()) result << "\n"; @@ -1196,7 +1201,7 @@ wxString AisTargetData::GetRolloverString(void) { result << wxString::Format(": %.1f %s", userdepth, getUsrDepthUnit()); } - if (met_data.current < 25.) { + if (met_data.current < 25.) { if (result.Len()) result << "\n"; result << _("Current"); result << wxString::Format(": %.1f ", met_data.current) << _("kts") @@ -1337,7 +1342,7 @@ wxString AisTargetData::Get_class_string(bool b_short) { case AIS_GPSG_BUDDY: return b_short ? _("Buddy") : _("GPSGate Buddy"); case AIS_DSC: - if (ShipType == 12 || ( ShipType == 16 && m_dscNature < 13)) + if (ShipType == 12 || (ShipType == 16 && m_dscNature < 13)) return b_short ? _("DSC") : _("DSC Distress"); else return b_short ? _("DSC") : _("DSC Position Report"); @@ -1357,14 +1362,20 @@ wxString AisTargetData::Get_class_string(bool b_short) { wxString AisTargetData::GetNatureofDistress(int dscnature) { // Natures of distress from: Rec. ITU-R M.493-10. - wxString dscDistressType[] = { _("Fire, explosion"), _("Flooding"), - _("Collision"), _("Grounding"), - _("Listing, in danger of capsizing"), _("Sinking"), - _("Disabled and adrift"), _("Undesignated distress"), - _("Abandoning ship"), _("Piracy/armed robbery attack"), - _("Man overboard"), _T("-"), _("EPIRB emission") }; - if (dscnature >= 0 && dscnature < 13) - return dscDistressType[dscnature]; + wxString dscDistressType[] = {_("Fire, explosion"), + _("Flooding"), + _("Collision"), + _("Grounding"), + _("Listing, in danger of capsizing"), + _("Sinking"), + _("Disabled and adrift"), + _("Undesignated distress"), + _("Abandoning ship"), + _("Piracy/armed robbery attack"), + _("Man overboard"), + _T("-"), + _("EPIRB emission")}; + if (dscnature >= 0 && dscnature < 13) return dscDistressType[dscnature]; return wxEmptyString; } @@ -1384,7 +1395,7 @@ bool AisTargetData::IsValidMID(int mid) { // Get country name and code according to ITU 2023-02 // (http://www.itu.int/en/ITU-R/terrestrial/fmd/Pages/mid.aspx) -wxString AisTargetData::GetCountryCode( bool b_CntryLongStr) { +wxString AisTargetData::GetCountryCode(bool b_CntryLongStr) { /***** Check for a valid MID *****/ // Meteo adaption int tmpMmsi = met_data.original_mmsi ? met_data.original_mmsi : MMSI; @@ -1964,7 +1975,6 @@ wxString AisTargetData::GetCountryCode( bool b_CntryLongStr) { #endif } - wxString ais_get_type(int index) { static const wxString ais_type[] = { _("Fishing Vessel"), // 30 0 diff --git a/model/src/base_platform.cpp b/model/src/base_platform.cpp index fdf3ce39fe..31eac71671 100644 --- a/model/src/base_platform.cpp +++ b/model/src/base_platform.cpp @@ -297,7 +297,7 @@ wxString& AbstractPlatform::GetPrivateDataDir() { if (!m_PrivateDataDir.IsEmpty() && g_configdir.empty()) return m_PrivateDataDir; if (!g_configdir.empty()) { - wxString path = g_configdir; + wxString path = g_configdir; if (path.Last() == wxFileName::GetPathSeparator()) path.RemoveLast(); m_default_private_datadir = path; return m_default_private_datadir; // FIXME (leamas) normalize and trust @@ -330,7 +330,7 @@ wxString& AbstractPlatform::DefaultPrivateDataDir() { appendOSDirSlash(&m_PrivateDataDir); m_PrivateDataDir.Append(_T("opencpn")); #else - m_PrivateDataDir = std_path.GetUserDataDir(); // should be ~/.opencpn + m_PrivateDataDir = std_path.GetUserDataDir(); // should be ~/.opencpn #endif if (g_bportable) m_PrivateDataDir = GetHomeDir(); @@ -780,20 +780,16 @@ void AbstractPlatform::HideBusySpinner() { // getDisplaySize - - #if defined(__ANDROID__) wxSize BasePlatform::getDisplaySize() { return getAndroidDisplayDimensions(); } #else -wxSize BasePlatform::getDisplaySize() { - return wxSize(0, 0); -} +wxSize BasePlatform::getDisplaySize() { return wxSize(0, 0); } #endif // GetDisplaySizeMM double BasePlatform::GetDisplaySizeMM() { - if(m_displaySizeMMOverride.size() > 0 && m_displaySizeMMOverride[0] > 0) { + if (m_displaySizeMMOverride.size() > 0 && m_displaySizeMMOverride[0] > 0) { return m_displaySizeMMOverride[0]; } double ret = 0; @@ -821,12 +817,10 @@ double BasePlatform::GetDisplayDPmm() { } #endif - -double AbstractPlatform::GetDisplayDIPMult(wxWindow *win) { +double AbstractPlatform::GetDisplayDIPMult(wxWindow* win) { double rv = 1.0; #ifdef __WXMSW__ - if (win) - rv = (double)(win->ToDIP(100))/100.; + if (win) rv = (double)(win->ToDIP(100)) / 100.; #endif return rv; } @@ -844,8 +838,8 @@ const GUID GUID_CLASS_MONITOR = {0x4d36e96e, 0xe325, 0x11ce, 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}; // Assumes hDevRegKey is valid -bool GetMonitorSizeFromEDID(const HKEY hDevRegKey, int *WidthMm, - int *HeightMm) { +bool GetMonitorSizeFromEDID(const HKEY hDevRegKey, int* WidthMm, + int* HeightMm) { DWORD dwType, AcutalValueNameLength = NAME_SIZE; TCHAR valueName[NAME_SIZE]; @@ -871,7 +865,7 @@ bool GetMonitorSizeFromEDID(const HKEY hDevRegKey, int *WidthMm, return false; // EDID not found } -bool GetSizeForDevID(wxString &TargetDevID, int *WidthMm, int *HeightMm) { +bool GetSizeForDevID(wxString& TargetDevID, int* WidthMm, int* HeightMm) { HDEVINFO devInfo = SetupDiGetClassDevsEx(&GUID_CLASS_MONITOR, // class GUID NULL, // enumerator @@ -911,7 +905,7 @@ bool GetSizeForDevID(wxString &TargetDevID, int *WidthMm, int *HeightMm) { return bRes; } -bool AbstractPlatform::GetWindowsMonitorSize(int *width, int *height) { +bool AbstractPlatform::GetWindowsMonitorSize(int* width, int* height) { bool bFoundDevice = true; if (m_monitorWidth < 10) { diff --git a/model/src/catalog_handler.cpp b/model/src/catalog_handler.cpp index 7e56122084..b7867423fb 100644 --- a/model/src/catalog_handler.cpp +++ b/model/src/catalog_handler.cpp @@ -57,9 +57,8 @@ static const char* const API_ENDPOINT = "https://api.github.com/repos"; // static const char* const API_PATH = "/leamas/plugins/branches"; static const char* const API_PATH = "/OpenCPN/plugins/branches"; -CatalogHandler::CatalogHandler() : - status(ServerStatus::UNKNOWN), - m_catalog_status(ServerStatus::UNKNOWN){ +CatalogHandler::CatalogHandler() + : status(ServerStatus::UNKNOWN), m_catalog_status(ServerStatus::UNKNOWN) { if (g_catalog_channel == "") { g_catalog_channel = DEFAULT_CHANNEL; } @@ -79,13 +78,10 @@ std::string CatalogHandler::GetDefaultUrl() { return url; } -catalog_status CatalogHandler::GetCatalogStatus(){ - return m_catalog_status; -} - -CatalogCtx *CatalogHandler::GetActiveCatalogContext() { +catalog_status CatalogHandler::GetCatalogStatus() { return m_catalog_status; } - if (m_catalog_status == ServerStatus::OK){ +CatalogCtx* CatalogHandler::GetActiveCatalogContext() { + if (m_catalog_status == ServerStatus::OK) { return &m_catalogctx; } @@ -112,11 +108,10 @@ bool CatalogHandler::AddMetadataToActiveContext(PluginMetadata metadata) { if (m_catalog_status == ServerStatus::OK) { m_catalogctx.plugins.push_back(metadata); return true; - } - else return false; + } else + return false; } - catalog_status CatalogHandler::DownloadCatalog(std::ostream* stream) { std::string path(g_catalog_custom_url.ToStdString()); if (path == "") { @@ -204,12 +199,11 @@ catalog_status CatalogHandler::DoParseCatalog(const std::string xml, const auto& haystack = ctx->parsed_metas; auto found = std::find_if(haystack.begin(), haystack.end(), match); if (found != haystack.end()) { - continue; + continue; } ctx->parsed_metas.push_back(url); if (DownloadCatalog(&xml, url) != ServerStatus::OK) { - wxLogMessage("CatalogHandler: Cannot download meta-url: %s", - url.c_str()); + wxLogMessage("CatalogHandler: Cannot download meta-url: %s", url.c_str()); } else { ok = DoParseCatalog(xml.str(), ctx) == ServerStatus::OK; if (!ok) break; @@ -323,8 +317,6 @@ void CatalogHandler::ClearCatalogData() { m_catalogctx.parsed_metas.clear(); m_catalogctx.version.clear(); m_catalogctx.date.clear(); - - } std::string CatalogHandler::GetCustomUrl() { diff --git a/model/src/catalog_parser.cpp b/model/src/catalog_parser.cpp index a77490a457..a6b33a2028 100644 --- a/model/src/catalog_parser.cpp +++ b/model/src/catalog_parser.cpp @@ -41,7 +41,6 @@ static void add_node(pugi::xml_node root, const std::string& name, child.append_child(pugi::node_pcdata).set_value(value.c_str()); } - std::string PluginMetadata::to_string() { pugi::xml_document doc; auto root = doc.append_child("plugin"); @@ -70,7 +69,7 @@ std::string PluginMetadata::to_string() { } static void ParseValue(pugi::xml_node node, const std::string& name, - std::string& value) { + std::string& value) { auto child = node.child(name.c_str()); if (child) value = ocpn::trim(child.first_child().value()); } @@ -79,32 +78,31 @@ static void ParseBool(pugi::xml_node node, const std::string& name, bool& value) { auto child = node.child(name.c_str()); if (child) { - auto text = ocpn::trim(child.first_child().value()); + auto text = ocpn::trim(child.first_child().value()); value = text == "yes" || text == "true"; } } bool ParsePlugin(pugi::xml_node root, PluginMetadata& plugin) { - ParseValue(root, "name", plugin.name); - ParseValue(root, "version", plugin.version); - ParseValue(root, "release", plugin.release); - ParseValue(root, "summary", plugin.summary); - ParseValue(root, "api-version", plugin.api_version); - ParseValue(root, "author", plugin.author); - ParseValue(root, "description", plugin.description); - ParseValue(root, "source", plugin.source); - ParseValue(root, "tarball-url", plugin.tarball_url); - ParseValue(root, "info-url", plugin.info_url); - ParseValue(root, "target", plugin.target); - ParseValue(root, "target-version", plugin.target_version); - ParseValue(root, "target-arch", plugin.target_arch); - ParseValue(root, "target-checksum", plugin.checksum); - ParseBool(root, "open-source", plugin.openSource); - ParseBool(root, "is-imported", plugin.is_imported); - return root.child("name") ? true : false; + ParseValue(root, "name", plugin.name); + ParseValue(root, "version", plugin.version); + ParseValue(root, "release", plugin.release); + ParseValue(root, "summary", plugin.summary); + ParseValue(root, "api-version", plugin.api_version); + ParseValue(root, "author", plugin.author); + ParseValue(root, "description", plugin.description); + ParseValue(root, "source", plugin.source); + ParseValue(root, "tarball-url", plugin.tarball_url); + ParseValue(root, "info-url", plugin.info_url); + ParseValue(root, "target", plugin.target); + ParseValue(root, "target-version", plugin.target_version); + ParseValue(root, "target-arch", plugin.target_arch); + ParseValue(root, "target-checksum", plugin.checksum); + ParseBool(root, "open-source", plugin.openSource); + ParseBool(root, "is-imported", plugin.is_imported); + return root.child("name") ? true : false; } - bool ParsePlugin(const std::string& xml, PluginMetadata& plugin) { pugi::xml_document doc; doc.load_string(xml.c_str()); @@ -116,9 +114,7 @@ bool ParsePlugin(const std::string& xml, PluginMetadata& plugin) { return ParsePlugin(doc.child("plugin"), plugin); } - bool ParseCatalog(const std::string xml, CatalogCtx* ctx) { - bool ok = true; PluginMetadata* plugin = 0; pugi::xml_document doc; diff --git a/model/src/certificates.cpp b/model/src/certificates.cpp index eb5f0ad561..966441bafc 100644 --- a/model/src/certificates.cpp +++ b/model/src/certificates.cpp @@ -39,90 +39,88 @@ #include "openssl/applink.c" #endif - /* Generates a 2048-bit RSA key. */ -EVP_PKEY * generate_key() -{ - /* Allocate memory for the EVP_PKEY structure. */ - EVP_PKEY * pkey = EVP_PKEY_new(); - if(!pkey) - { - std::cerr << "Unable to create EVP_PKEY structure." << std::endl; - return NULL; - } - - /* Generate the RSA key and assign it to pkey. */ - RSA * rsa = RSA_generate_key(2048, RSA_F4, NULL, NULL); - if(!EVP_PKEY_assign_RSA(pkey, rsa)) - { - std::cerr << "Unable to generate 2048-bit RSA key." << std::endl; - EVP_PKEY_free(pkey); - return NULL; - } - - /* The key has been generated, return it. */ - return pkey; +EVP_PKEY *generate_key() { + /* Allocate memory for the EVP_PKEY structure. */ + EVP_PKEY *pkey = EVP_PKEY_new(); + if (!pkey) { + std::cerr << "Unable to create EVP_PKEY structure." << std::endl; + return NULL; + } + + /* Generate the RSA key and assign it to pkey. */ + RSA *rsa = RSA_generate_key(2048, RSA_F4, NULL, NULL); + if (!EVP_PKEY_assign_RSA(pkey, rsa)) { + std::cerr << "Unable to generate 2048-bit RSA key." << std::endl; + EVP_PKEY_free(pkey); + return NULL; + } + + /* The key has been generated, return it. */ + return pkey; } -int cs_cert_set_subject_alt_name(X509 *x509_cert, std::string name) -{ - const char *subject_alt_name = name.c_str(); //"IP: 192.168.1.1"; - X509_EXTENSION *extension_san = NULL; - ASN1_OCTET_STRING *subject_alt_name_ASN1 = NULL; - int ret = -1; - - subject_alt_name_ASN1 = ASN1_OCTET_STRING_new(); - if (!subject_alt_name_ASN1) { - goto err; - } - ASN1_OCTET_STRING_set(subject_alt_name_ASN1, (unsigned char*) subject_alt_name, strlen(subject_alt_name)); - if (!X509_EXTENSION_create_by_NID(&extension_san, NID_subject_alt_name, 0, subject_alt_name_ASN1)) { - goto err; - } - ASN1_OCTET_STRING_free(subject_alt_name_ASN1); - ret = X509_add_ext(x509_cert, extension_san, -1); - if (!ret) { - goto err; - } - X509_EXTENSION_free(extension_san); - return 0; +int cs_cert_set_subject_alt_name(X509 *x509_cert, std::string name) { + const char *subject_alt_name = name.c_str(); //"IP: 192.168.1.1"; + X509_EXTENSION *extension_san = NULL; + ASN1_OCTET_STRING *subject_alt_name_ASN1 = NULL; + int ret = -1; + + subject_alt_name_ASN1 = ASN1_OCTET_STRING_new(); + if (!subject_alt_name_ASN1) { + goto err; + } + ASN1_OCTET_STRING_set(subject_alt_name_ASN1, + (unsigned char *)subject_alt_name, + strlen(subject_alt_name)); + if (!X509_EXTENSION_create_by_NID(&extension_san, NID_subject_alt_name, 0, + subject_alt_name_ASN1)) { + goto err; + } + ASN1_OCTET_STRING_free(subject_alt_name_ASN1); + ret = X509_add_ext(x509_cert, extension_san, -1); + if (!ret) { + goto err; + } + X509_EXTENSION_free(extension_san); + return 0; err: - if (subject_alt_name_ASN1) ASN1_OCTET_STRING_free(subject_alt_name_ASN1); - if (extension_san) X509_EXTENSION_free(extension_san); - return -1; + if (subject_alt_name_ASN1) ASN1_OCTET_STRING_free(subject_alt_name_ASN1); + if (extension_san) X509_EXTENSION_free(extension_san); + return -1; } - /* Generates a self-signed x509 certificate. */ -X509 * generate_x509(EVP_PKEY * pkey, std::string ip_v4) -{ - /* Allocate memory for the X509 structure. */ - X509 * x509 = X509_new(); - if(!x509) - { - std::cerr << "Unable to create X509 structure." << std::endl; - return NULL; - } +X509 *generate_x509(EVP_PKEY *pkey, std::string ip_v4) { + /* Allocate memory for the X509 structure. */ + X509 *x509 = X509_new(); + if (!x509) { + std::cerr << "Unable to create X509 structure." << std::endl; + return NULL; + } - /* Set the serial number. */ - ASN1_INTEGER_set(X509_get_serialNumber(x509), 1); + /* Set the serial number. */ + ASN1_INTEGER_set(X509_get_serialNumber(x509), 1); - /* This certificate is valid from now until exactly one year from now. */ + /* This certificate is valid from now until exactly one year from now. */ - X509_gmtime_adj(X509_get_notBefore(x509), 0); - X509_gmtime_adj(X509_get_notAfter(x509), 31536000L); + X509_gmtime_adj(X509_get_notBefore(x509), 0); + X509_gmtime_adj(X509_get_notAfter(x509), 31536000L); - /* Set the public key for our certificate. */ - X509_set_pubkey(x509, pkey); + /* Set the public key for our certificate. */ + X509_set_pubkey(x509, pkey); - /* We want to copy the subject name to the issuer name. */ - X509_NAME * name = X509_get_subject_name(x509); + /* We want to copy the subject name to the issuer name. */ + X509_NAME *name = X509_get_subject_name(x509); - /* Set the country code and common name. */ - X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned char *)"CA", -1, -1, 0); - X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned char *)"MyCompany", -1, -1, 0); - X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char *)"localhost", -1, -1, 0); + /* Set the country code and common name. */ + X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned char *)"CA", -1, + -1, 0); + X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, + (unsigned char *)"MyCompany", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, + (unsigned char *)"localhost", -1, -1, 0); #if 0 // Here is one way to add SAN records to certificate. @@ -150,104 +148,93 @@ X509 * generate_x509(EVP_PKEY * pkey, std::string ip_v4) sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); #endif - std::string ext_name("IP: "); - ext_name += ip_v4; - cs_cert_set_subject_alt_name(x509, ext_name); + std::string ext_name("IP: "); + ext_name += ip_v4; + cs_cert_set_subject_alt_name(x509, ext_name); - /* Now set the issuer name. */ - X509_set_issuer_name(x509, name); + /* Now set the issuer name. */ + X509_set_issuer_name(x509, name); - /* Actually sign the certificate with our key. */ - if(!X509_sign(x509, pkey, EVP_sha1())) - { - std::cerr << "Error signing certificate." << std::endl; - X509_free(x509); - return NULL; - } + /* Actually sign the certificate with our key. */ + if (!X509_sign(x509, pkey, EVP_sha1())) { + std::cerr << "Error signing certificate." << std::endl; + X509_free(x509); + return NULL; + } - return x509; + return x509; } -bool write_to_disk(EVP_PKEY * pkey, X509 * x509, std::string cert_directory) -{ - /* Open the PEM file for writing the key to disk. */ - std::string key_file = cert_directory; - key_file += "key.pem"; - FILE * pkey_file = fopen(key_file.c_str(), "wb"); - if(!pkey_file) - { - std::cerr << "Unable to open \"key.pem\" for writing." << std::endl; - return false; - } - - /* Write the key to disk. */ - bool ret = PEM_write_PrivateKey(pkey_file, pkey, NULL, NULL, 0, NULL, NULL); - fclose(pkey_file); - - if(!ret) - { - std::cerr << "Unable to write private key to disk." << std::endl; - return false; - } - - /* Open the PEM file for writing the certificate to disk. */ - std::string cert_file = cert_directory; - cert_file += "cert.pem"; - - FILE * x509_file = fopen(cert_file.c_str(), "wb"); - if(!x509_file) - { - std::cerr << "Unable to open \"cert.pem\" for writing." << std::endl; - return false; - } - - /* Write the certificate to disk. */ - ret = PEM_write_X509(x509_file, x509); - fclose(x509_file); - - if(!ret) - { - std::cerr << "Unable to write certificate to disk." << std::endl; - return false; - } - - return true; +bool write_to_disk(EVP_PKEY *pkey, X509 *x509, std::string cert_directory) { + /* Open the PEM file for writing the key to disk. */ + std::string key_file = cert_directory; + key_file += "key.pem"; + FILE *pkey_file = fopen(key_file.c_str(), "wb"); + if (!pkey_file) { + std::cerr << "Unable to open \"key.pem\" for writing." << std::endl; + return false; + } + + /* Write the key to disk. */ + bool ret = PEM_write_PrivateKey(pkey_file, pkey, NULL, NULL, 0, NULL, NULL); + fclose(pkey_file); + + if (!ret) { + std::cerr << "Unable to write private key to disk." << std::endl; + return false; + } + + /* Open the PEM file for writing the certificate to disk. */ + std::string cert_file = cert_directory; + cert_file += "cert.pem"; + + FILE *x509_file = fopen(cert_file.c_str(), "wb"); + if (!x509_file) { + std::cerr << "Unable to open \"cert.pem\" for writing." << std::endl; + return false; + } + + /* Write the certificate to disk. */ + ret = PEM_write_X509(x509_file, x509); + fclose(x509_file); + + if (!ret) { + std::cerr << "Unable to write certificate to disk." << std::endl; + return false; + } + + return true; } -int make_certificate(std::string ipv4, std::string destination_dir) -{ - /* Generate the key. */ - if (getenv("OCPN_DEBUG_CERT")) - std::cout << "Generating RSA key..." << std::endl; +int make_certificate(std::string ipv4, std::string destination_dir) { + /* Generate the key. */ + if (getenv("OCPN_DEBUG_CERT")) + std::cout << "Generating RSA key..." << std::endl; - EVP_PKEY * pkey = generate_key(); - if(!pkey) - return 1; + EVP_PKEY *pkey = generate_key(); + if (!pkey) return 1; - /* Generate the certificate. */ - if (getenv("OCPN_DEBUG_CERT")) - std::cout << "Generating x509 certificate..." << std::endl; + /* Generate the certificate. */ + if (getenv("OCPN_DEBUG_CERT")) + std::cout << "Generating x509 certificate..." << std::endl; - X509 * x509 = generate_x509(pkey, ipv4); - if(!x509) - { - EVP_PKEY_free(pkey); - return 1; - } + X509 *x509 = generate_x509(pkey, ipv4); + if (!x509) { + EVP_PKEY_free(pkey); + return 1; + } - /* Write the private key and certificate out to disk. */ - if (getenv("OCPN_DEBUG_CERT")) - std::cout << "Writing key and certificate to disk..." << std::endl; + /* Write the private key and certificate out to disk. */ + if (getenv("OCPN_DEBUG_CERT")) + std::cout << "Writing key and certificate to disk..." << std::endl; - bool ret = write_to_disk(pkey, x509, destination_dir); - EVP_PKEY_free(pkey); - X509_free(x509); + bool ret = write_to_disk(pkey, x509, destination_dir); + EVP_PKEY_free(pkey); + X509_free(x509); - if(ret) - { - if (getenv("OCPN_DEBUG_CERT")) std::cout << "Success!" << std::endl; - return 0; - } - else - return 1; + if (ret) { + if (getenv("OCPN_DEBUG_CERT")) std::cout << "Success!" << std::endl; + return 0; + } else + return 1; } diff --git a/model/src/cli_platform.cpp b/model/src/cli_platform.cpp index 9a9d005738..ec6f74d307 100644 --- a/model/src/cli_platform.cpp +++ b/model/src/cli_platform.cpp @@ -1,4 +1,4 @@ - /*************************************************************************** +/*************************************************************************** * Copyright (C) 2019 Alec Leamas * * * * This program is free software; you can redistribute it and/or modify * diff --git a/model/src/cmdline.cpp b/model/src/cmdline.cpp index 8c71b3bfce..76df0b6247 100644 --- a/model/src/cmdline.cpp +++ b/model/src/cmdline.cpp @@ -19,7 +19,6 @@ #include "model/cmdline.h" - int g_unit_test_1 = 0; int g_unit_test_2 = 0; bool g_start_fullscreen = false; diff --git a/model/src/comm_ais.cpp b/model/src/comm_ais.cpp index 07849036d3..96b2677bf8 100644 --- a/model/src/comm_ais.cpp +++ b/model/src/comm_ais.cpp @@ -38,8 +38,7 @@ static const long long lNaN = 0xfff8000000000000; //---------------------------------------------------------------------------------- // Decode a single AIVDO sentence to a Generic Position Report //---------------------------------------------------------------------------------- -AisError DecodeSingleVDO(const wxString &str, - GenericPosDatEx *pos) { +AisError DecodeSingleVDO(const wxString &str, GenericPosDatEx *pos) { // Make some simple tests for validity if (str.Len() > 128) return AIS_NMEAVDX_TOO_LONG; @@ -47,7 +46,7 @@ AisError DecodeSingleVDO(const wxString &str, if (!pos) return AIS_GENERIC_ERROR; - //if (!ctx.accumulator) return AIS_GENERIC_ERROR; + // if (!ctx.accumulator) return AIS_GENERIC_ERROR; // We only process AIVDO messages if (!str.Mid(1, 5).IsSameAs(_T("AIVDO"))) return AIS_GENERIC_ERROR; @@ -83,8 +82,7 @@ AisError DecodeSingleVDO(const wxString &str, // First and only part of a one-part sentence if ((1 == nsentences) && (1 == isentence)) { string_to_parse = tkz.GetNextToken(); // the encapsulated data - } - else { + } else { wxASSERT_MSG(false, wxT("Multipart AIVDO detected")); return AIS_INCOMPLETE_MULTIPART; // and non-zero return } @@ -93,7 +91,7 @@ AisError DecodeSingleVDO(const wxString &str, AisBitstring strbit(string_to_parse.mb_str()); auto TargetData = std::make_unique( - *AisTargetDataMaker::GetInstance().GetTargetData()); + *AisTargetDataMaker::GetInstance().GetTargetData()); bool bdecode_result = Parse_VDXBitstring(&strbit, TargetData.get()); @@ -143,8 +141,7 @@ AisError DecodeSingleVDO(const wxString &str, //---------------------------------------------------------------------------- // Parse a NMEA VDM/VDO Bitstring //---------------------------------------------------------------------------- -bool Parse_VDXBitstring(AisBitstring* bstr, - AisTargetData* ptd) { +bool Parse_VDXBitstring(AisBitstring *bstr, AisTargetData *ptd) { bool parse_result = false; bool b_posn_report = false; @@ -160,7 +157,6 @@ bool Parse_VDXBitstring(AisBitstring* bstr, case 1: // Position Report case 2: case 3: { - ptd->NavStatus = bstr->GetInt(39, 4); ptd->SOG = 0.1 * (bstr->GetInt(51, 10)); @@ -175,7 +171,7 @@ bool Parse_VDXBitstring(AisBitstring* bstr, double lat_tentative = lat / 600000.; if ((lon_tentative <= 180.) && (lat_tentative <= 90.)) - // Ship does not report Lat or Lon "unavailable" + // Ship does not report Lat or Lon "unavailable" { ptd->Lon = lon_tentative; ptd->Lat = lat_tentative; @@ -233,8 +229,7 @@ bool Parse_VDXBitstring(AisBitstring* bstr, ptd->blue_paddle = bstr->GetInt(144, 2); ptd->b_blue_paddle = (ptd->blue_paddle == 2); // paddle is set - if (!ptd->b_isDSCtarget) - ptd->Class = AIS_CLASS_A; + if (!ptd->b_isDSCtarget) ptd->Class = AIS_CLASS_A; // Check for SART and friends by looking at first two digits of MMSI int mmsi_start = ptd->MMSI / 10000000; @@ -278,7 +273,7 @@ bool Parse_VDXBitstring(AisBitstring* bstr, double lat_tentative = lat / 600000.; if ((lon_tentative <= 180.) && (lat_tentative <= 90.)) - // Ship does not report Lat or Lon "unavailable" + // Ship does not report Lat or Lon "unavailable" { ptd->Lon = lon_tentative; ptd->Lat = lat_tentative; @@ -293,8 +288,7 @@ bool Parse_VDXBitstring(AisBitstring* bstr, ptd->m_utc_sec = bstr->GetInt(134, 6); - if (!ptd->b_isDSCtarget) - ptd->Class = AIS_CLASS_B; + if (!ptd->b_isDSCtarget) ptd->Class = AIS_CLASS_B; parse_result = true; // so far so good b_posn_report = true; diff --git a/model/src/comm_appmsg.cpp b/model/src/comm_appmsg.cpp index a63c249152..2b6cc5252c 100644 --- a/model/src/comm_appmsg.cpp +++ b/model/src/comm_appmsg.cpp @@ -65,7 +65,6 @@ double PosPartsToDegrees(float degrees, float minutes, return degrees + minutes / 60 + percent_of_minute / 6000; } - /* Position implementation */ Position::Position(double _lat, double _lon, Type t) @@ -85,7 +84,7 @@ std::string Position::to_string() const { return buf.str(); } -std::string Position::TypeToStr(const Type t) const { +std::string Position::TypeToStr(const Type t) const { switch (t) { case Type::NE: return "NE"; @@ -102,8 +101,8 @@ std::string Position::TypeToStr(const Type t) const { case Type::Undef: return "Undefined"; break; - } - return "??"; // Not reached, but compiler complains. + } + return "??"; // Not reached, but compiler complains. } Position::Type Position::LatLongToType(double lat, double lon) { @@ -127,8 +126,7 @@ static double GgaPartToDouble(const std::string& s) { if (dotpos < 2) return nan(""); auto degrees = s.substr(0, dotpos - 2); auto minutes = s.substr(dotpos - 2); - return std::stod(degrees) + std::stod(minutes)/60; - + return std::stod(degrees) + std::stod(minutes) / 60; } Position Position::ParseGGA(const std::string gga) { @@ -150,7 +148,6 @@ Position Position::ParseGGA(const std::string gga) { return lat != nan("") && lon != nan("") ? Position(lat, lon) : Position(); } - /* Appmsg implementation */ std::string AppMsg::TypeToString(const AppMsg::Type t) const { diff --git a/model/src/comm_bridge.cpp b/model/src/comm_bridge.cpp index 883b4af8ba..9154822f21 100644 --- a/model/src/comm_bridge.cpp +++ b/model/src/comm_bridge.cpp @@ -47,7 +47,6 @@ #include "model/own_ship.h" #include "model/multiplexer.h" - // comm event definitions wxDEFINE_EVENT(EVT_N2K_129029, ObservedEvt); wxDEFINE_EVENT(EVT_N2K_129025, ObservedEvt); @@ -75,7 +74,7 @@ extern Multiplexer* g_pMUX; bool debug_priority = 0; -void ClearNavData(NavData &d){ +void ClearNavData(NavData& d) { d.gLat = NAN; d.gLon = NAN; d.gSog = NAN; @@ -88,23 +87,20 @@ void ClearNavData(NavData &d){ } /** -* Send BasicNavDataMsg based on global state in gLat, gLon, etc -* on appmsg_bus -*/ + * Send BasicNavDataMsg based on global state in gLat, gLon, etc + * on appmsg_bus + */ static void SendBasicNavdata(int vflag) { auto msg = std::make_shared( gLat, gLon, gSog, gCog, gVar, gHdt, vflag, wxDateTime::Now().GetTicks()); AppMsgBus::GetInstance().Notify(std::move(msg)); } - static inline double GeodesicRadToDeg(double rads) { return rads * 180.0 / M_PI; } -static inline double MS2KNOTS(double ms) { - return ms * 1.9438444924406; -} +static inline double MS2KNOTS(double ms) { return ms * 1.9438444924406; } // CommBridge implementation @@ -117,7 +113,6 @@ CommBridge::CommBridge() {} CommBridge::~CommBridge() {} bool CommBridge::Initialize() { - InitializePriorityContainers(); ClearPriorityMaps(); @@ -129,45 +124,42 @@ bool CommBridge::Initialize() { m_watchdog_timer.SetOwner(this, WATCHDOG_TIMER); m_watchdog_timer.Start(1000, wxTIMER_CONTINUOUS); - n_LogWatchdogPeriod = 3600; //every 60 minutes, - //reduced after first position Rx + n_LogWatchdogPeriod = 3600; // every 60 minutes, + // reduced after first position Rx // Initialize the comm listeners InitCommListeners(); // Initialize a listener for driver state changes driver_change_listener.Listen( - CommDriverRegistry::GetInstance().evt_driverlist_change.key, this, - EVT_DRIVER_CHANGE); - Bind(EVT_DRIVER_CHANGE, [&](wxCommandEvent ev) { - OnDriverStateChange(); }); - + CommDriverRegistry::GetInstance().evt_driverlist_change.key, this, + EVT_DRIVER_CHANGE); + Bind(EVT_DRIVER_CHANGE, [&](wxCommandEvent ev) { OnDriverStateChange(); }); return true; } void CommBridge::PresetWatchdogs() { - m_watchdogs.position_watchdog = 20; // A bit longer watchdog for startup latency. + m_watchdogs.position_watchdog = + 20; // A bit longer watchdog for startup latency. m_watchdogs.velocity_watchdog = 20; m_watchdogs.variation_watchdog = 20; m_watchdogs.heading_watchdog = 20; m_watchdogs.satellite_watchdog = 20; } -void CommBridge::SelectNextLowerPriority(const std::unordered_map &map, - PriorityContainer &pc) { - +void CommBridge::SelectNextLowerPriority( + const std::unordered_map& map, PriorityContainer& pc) { int best_prio = 100; for (auto it = map.begin(); it != map.end(); it++) { - if (it->second > pc.active_priority){ - best_prio = wxMin(best_prio, it->second); - } + if (it->second > pc.active_priority) { + best_prio = wxMin(best_prio, it->second); } + } - pc.active_priority = best_prio; - pc.active_source.clear(); - pc.active_identifier.clear(); - + pc.active_priority = best_prio; + pc.active_source.clear(); + pc.active_identifier.clear(); } void CommBridge::OnWatchdogTimer(wxTimerEvent& event) { @@ -176,15 +168,15 @@ void CommBridge::OnWatchdogTimer(wxTimerEvent& event) { if (m_watchdogs.position_watchdog <= 0) { if (m_watchdogs.position_watchdog % 5 == 0) { // Send AppMsg telling of watchdog expiry - auto msg = std::make_shared(GPSWatchdogMsg::WDSource::position, - m_watchdogs.position_watchdog); + auto msg = std::make_shared( + GPSWatchdogMsg::WDSource::position, m_watchdogs.position_watchdog); auto& msgbus = AppMsgBus::GetInstance(); msgbus.Notify(std::move(msg)); if (m_watchdogs.position_watchdog % n_LogWatchdogPeriod == 0) { wxString logmsg; - logmsg.Printf(_T(" ***GPS Watchdog timeout at Lat:%g Lon: %g"), gLat, - gLon); + logmsg.Printf(_T(" ***GPS Watchdog timeout at Lat:%g Lon: %g"), + gLat, gLon); wxLogMessage(logmsg); } } @@ -208,8 +200,8 @@ void CommBridge::OnWatchdogTimer(wxTimerEvent& event) { wxLogMessage(_T(" ***Velocity Watchdog timeout...")); if (m_watchdogs.velocity_watchdog % 5 == 0) { // Send AppMsg telling of watchdog expiry - auto msg = std::make_shared(GPSWatchdogMsg::WDSource::velocity, - m_watchdogs.velocity_watchdog); + auto msg = std::make_shared( + GPSWatchdogMsg::WDSource::velocity, m_watchdogs.velocity_watchdog); auto& msgbus = AppMsgBus::GetInstance(); msgbus.Notify(std::move(msg)); } @@ -253,14 +245,14 @@ void CommBridge::OnWatchdogTimer(wxTimerEvent& event) { // Are there any other lower priority sources? // If so, adopt that one. - SelectNextLowerPriority(priority_map_satellites, active_priority_satellites); + SelectNextLowerPriority(priority_map_satellites, + active_priority_satellites); } } void CommBridge::MakeHDTFromHDM() { // Here is the one place we try to create gHdt from gHdm and gVar, - if (!std::isnan(gHdm)) { // Set gVar if needed from manual entry. gVar will be overwritten if // WMM plugin is available @@ -322,7 +314,6 @@ void CommBridge::InitCommListeners() { HandleN2K_129540(UnpackEvtPointer(ev)); }); - // NMEA0183 // RMC Nmea0183Msg n0183_msg_RMC("RMC"); @@ -403,29 +394,25 @@ void CommBridge::InitCommListeners() { Bind(EVT_SIGNALK, [&](ObservedEvt ev) { HandleSignalK(UnpackEvtPointer(ev)); }); - } -void CommBridge::OnDriverStateChange(){ - +void CommBridge::OnDriverStateChange() { // Reset all active priority states PresetPriorityContainers(); - } -std::string CommBridge::GetPriorityMap(std::unordered_map &map){ - - #define MAX_SOURCES 10 +std::string CommBridge::GetPriorityMap( + std::unordered_map& map) { +#define MAX_SOURCES 10 std::string sa[MAX_SOURCES]; std::string result; - for (auto& it: map) { - if ((it.second >= 0) && (it.second < MAX_SOURCES)) - sa[it.second] = it.first; + for (auto& it : map) { + if ((it.second >= 0) && (it.second < MAX_SOURCES)) sa[it.second] = it.first; } - //build the packed string result - for (int i=0 ; i < MAX_SOURCES ; i++){ + // build the packed string result + for (int i = 0; i < MAX_SOURCES; i++) { if (sa[i].size()) { result += sa[i]; result += "|"; @@ -435,10 +422,7 @@ std::string CommBridge::GetPriorityMap(std::unordered_map &map return result; } - - -std::vector CommBridge::GetPriorityMaps(){ - +std::vector CommBridge::GetPriorityMaps() { std::vector result; result.push_back(GetPriorityMap(priority_map_position)); @@ -447,11 +431,12 @@ std::vector CommBridge::GetPriorityMaps(){ result.push_back(GetPriorityMap(priority_map_variation)); result.push_back(GetPriorityMap(priority_map_satellites)); - return result; } -void CommBridge::ApplyPriorityMap(std::unordered_map& priority_map, wxString &new_prio, int category){ +void CommBridge::ApplyPriorityMap( + std::unordered_map& priority_map, wxString& new_prio, + int category) { priority_map.clear(); wxStringTokenizer tk(new_prio, "|"); int index = 0; @@ -463,35 +448,33 @@ void CommBridge::ApplyPriorityMap(std::unordered_map& priority } } - -void CommBridge::ApplyPriorityMaps(std::vector new_maps){ - +void CommBridge::ApplyPriorityMaps(std::vector new_maps) { wxString new_prio_string; - new_prio_string = wxString( new_maps[0].c_str()); + new_prio_string = wxString(new_maps[0].c_str()); ApplyPriorityMap(priority_map_position, new_prio_string, 0); - new_prio_string = wxString( new_maps[1].c_str()); + new_prio_string = wxString(new_maps[1].c_str()); ApplyPriorityMap(priority_map_velocity, new_prio_string, 1); - new_prio_string = wxString( new_maps[2].c_str()); + new_prio_string = wxString(new_maps[2].c_str()); ApplyPriorityMap(priority_map_heading, new_prio_string, 2); - new_prio_string = wxString( new_maps[3].c_str()); + new_prio_string = wxString(new_maps[3].c_str()); ApplyPriorityMap(priority_map_variation, new_prio_string, 3); - new_prio_string = wxString( new_maps[4].c_str()); + new_prio_string = wxString(new_maps[4].c_str()); ApplyPriorityMap(priority_map_satellites, new_prio_string, 4); } -void CommBridge::PresetPriorityContainer(PriorityContainer &pc, - const std::unordered_map &priority_map){ +void CommBridge::PresetPriorityContainer( + PriorityContainer& pc, + const std::unordered_map& priority_map) { // Extract some info from the preloaded map // Find the key corresponding to priority 0, the highest std::string key0; - for (auto& it: priority_map) { - if (it.second == 0) - key0 = it.first; + for (auto& it : priority_map) { + if (it.second == 0) key0 = it.first; } wxString this_key(key0.c_str()); @@ -511,8 +494,7 @@ void CommBridge::PresetPriorityContainer(PriorityContainer &pc, pc.active_source_address = source_address; } - -void CommBridge::PresetPriorityContainers(){ +void CommBridge::PresetPriorityContainers() { PresetPriorityContainer(active_priority_position, priority_map_position); PresetPriorityContainer(active_priority_velocity, priority_map_velocity); PresetPriorityContainer(active_priority_heading, priority_map_heading); @@ -520,14 +502,12 @@ void CommBridge::PresetPriorityContainers(){ PresetPriorityContainer(active_priority_satellites, priority_map_satellites); } - bool CommBridge::HandleN2K_129029(std::shared_ptr n2k_msg) { - std::vector v = n2k_msg->payload; // extract and verify PGN uint64_t pgn = 0; - unsigned char *c = (unsigned char *)&pgn; + unsigned char* c = (unsigned char*)&pgn; *c++ = v.at(3); *c++ = v.at(4); *c++ = v.at(5); @@ -535,56 +515,56 @@ bool CommBridge::HandleN2K_129029(std::shared_ptr n2k_msg) { NavData temp_data; ClearNavData(temp_data); - if (!m_decoder.DecodePGN129029(v, temp_data)) - return false; + if (!m_decoder.DecodePGN129029(v, temp_data)) return false; int valid_flag = 0; - if (!N2kIsNA(temp_data.gLat) && !N2kIsNA(temp_data.gLon)){ - if (EvalPriority(n2k_msg, active_priority_position, priority_map_position)) { + if (!N2kIsNA(temp_data.gLat) && !N2kIsNA(temp_data.gLon)) { + if (EvalPriority(n2k_msg, active_priority_position, + priority_map_position)) { gLat = temp_data.gLat; gLon = temp_data.gLon; valid_flag += POS_UPDATE; valid_flag += POS_VALID; m_watchdogs.position_watchdog = gps_watchdog_timeout_ticks; - n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log + n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log } } - if (temp_data.n_satellites >= 0){ - if (EvalPriority(n2k_msg, active_priority_satellites, priority_map_satellites)) { - g_SatsInView = temp_data.n_satellites; - g_bSatValid = true; - m_watchdogs.satellite_watchdog = sat_watchdog_timeout_ticks; - } - } + if (temp_data.n_satellites >= 0) { + if (EvalPriority(n2k_msg, active_priority_satellites, + priority_map_satellites)) { + g_SatsInView = temp_data.n_satellites; + g_bSatValid = true; + m_watchdogs.satellite_watchdog = sat_watchdog_timeout_ticks; + } + } SendBasicNavdata(valid_flag); return true; } bool CommBridge::HandleN2K_129025(std::shared_ptr n2k_msg) { - std::vector v = n2k_msg->payload; NavData temp_data; ClearNavData(temp_data); - if (!m_decoder.DecodePGN129025(v, temp_data)) - return false; + if (!m_decoder.DecodePGN129025(v, temp_data)) return false; int valid_flag = 0; - if (!N2kIsNA(temp_data.gLat) && !N2kIsNA(temp_data.gLon)){ - if (EvalPriority(n2k_msg, active_priority_position, priority_map_position)) { + if (!N2kIsNA(temp_data.gLat) && !N2kIsNA(temp_data.gLon)) { + if (EvalPriority(n2k_msg, active_priority_position, + priority_map_position)) { gLat = temp_data.gLat; gLon = temp_data.gLon; valid_flag += POS_UPDATE; valid_flag += POS_VALID; m_watchdogs.position_watchdog = gps_watchdog_timeout_ticks; - n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log + n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log } } - //FIXME (dave) How to notify user of errors? - else{ + // FIXME (dave) How to notify user of errors? + else { } SendBasicNavdata(valid_flag); @@ -592,18 +572,17 @@ bool CommBridge::HandleN2K_129025(std::shared_ptr n2k_msg) { } bool CommBridge::HandleN2K_129026(std::shared_ptr n2k_msg) { - std::vector v = n2k_msg->payload; NavData temp_data; ClearNavData(temp_data); - if (!m_decoder.DecodePGN129026(v, temp_data)) - return false; + if (!m_decoder.DecodePGN129026(v, temp_data)) return false; int valid_flag = 0; - if (!N2kIsNA(temp_data.gSog)){ // gCog as reported by net may be NaN, but OK - if (EvalPriority(n2k_msg, active_priority_velocity, priority_map_velocity)) { + if (!N2kIsNA(temp_data.gSog)) { // gCog as reported by net may be NaN, but OK + if (EvalPriority(n2k_msg, active_priority_velocity, + priority_map_velocity)) { gSog = MS2KNOTS(temp_data.gSog); valid_flag += SOG_UPDATE; @@ -614,8 +593,7 @@ bool CommBridge::HandleN2K_129026(std::shared_ptr n2k_msg) { valid_flag += COG_UPDATE; m_watchdogs.velocity_watchdog = gps_watchdog_timeout_ticks; } - } - else{ + } else { } SendBasicNavdata(valid_flag); @@ -623,25 +601,24 @@ bool CommBridge::HandleN2K_129026(std::shared_ptr n2k_msg) { } bool CommBridge::HandleN2K_127250(std::shared_ptr n2k_msg) { - std::vector v = n2k_msg->payload; NavData temp_data; ClearNavData(temp_data); - if (!m_decoder.DecodePGN127250(v, temp_data)) - return false; + if (!m_decoder.DecodePGN127250(v, temp_data)) return false; int valid_flag = 0; - if (!N2kIsNA(temp_data.gVar)){ - if (EvalPriority(n2k_msg, active_priority_variation, priority_map_variation)) { + if (!N2kIsNA(temp_data.gVar)) { + if (EvalPriority(n2k_msg, active_priority_variation, + priority_map_variation)) { gVar = GeodesicRadToDeg(temp_data.gVar); valid_flag += VAR_UPDATE; m_watchdogs.variation_watchdog = gps_watchdog_timeout_ticks; } } - if (!N2kIsNA(temp_data.gHdt)){ + if (!N2kIsNA(temp_data.gHdt)) { if (EvalPriority(n2k_msg, active_priority_heading, priority_map_heading)) { gHdt = GeodesicRadToDeg(temp_data.gHdt); valid_flag += HDT_UPDATE; @@ -649,12 +626,12 @@ bool CommBridge::HandleN2K_127250(std::shared_ptr n2k_msg) { } } - if (!N2kIsNA(temp_data.gHdm)){ + if (!N2kIsNA(temp_data.gHdm)) { gHdm = GeodesicRadToDeg(temp_data.gHdm); if (EvalPriority(n2k_msg, active_priority_heading, priority_map_heading)) { MakeHDTFromHDM(); valid_flag += HDT_UPDATE; - if(!std::isnan(gHdt)) + if (!std::isnan(gHdt)) m_watchdogs.heading_watchdog = gps_watchdog_timeout_ticks; } } @@ -664,18 +641,17 @@ bool CommBridge::HandleN2K_127250(std::shared_ptr n2k_msg) { } bool CommBridge::HandleN2K_129540(std::shared_ptr n2k_msg) { - std::vector v = n2k_msg->payload; NavData temp_data; ClearNavData(temp_data); - if (!m_decoder.DecodePGN129540(v, temp_data)) - return false; + if (!m_decoder.DecodePGN129540(v, temp_data)) return false; int valid_flag = 0; - if (temp_data.n_satellites >= 0){ - if (EvalPriority(n2k_msg, active_priority_satellites, priority_map_satellites)) { + if (temp_data.n_satellites >= 0) { + if (EvalPriority(n2k_msg, active_priority_satellites, + priority_map_satellites)) { g_SatsInView = temp_data.n_satellites; g_bSatValid = true; m_watchdogs.satellite_watchdog = sat_watchdog_timeout_ticks; @@ -692,12 +668,12 @@ bool CommBridge::HandleN0183_RMC(std::shared_ptr n0183_msg) { ClearNavData(temp_data); bool bvalid = true; - if (!m_decoder.DecodeRMC(str, temp_data)) - bvalid = false; + if (!m_decoder.DecodeRMC(str, temp_data)) bvalid = false; int valid_flag = 0; - if (EvalPriority(n0183_msg, active_priority_position, priority_map_position)) { - if(bvalid) { + if (EvalPriority(n0183_msg, active_priority_position, + priority_map_position)) { + if (bvalid) { gLat = temp_data.gLat; gLon = temp_data.gLon; valid_flag += POS_VALID; @@ -707,8 +683,9 @@ bool CommBridge::HandleN0183_RMC(std::shared_ptr n0183_msg) { valid_flag += POS_UPDATE; } - if (EvalPriority(n0183_msg, active_priority_velocity, priority_map_velocity)) { - if(bvalid) { + if (EvalPriority(n0183_msg, active_priority_velocity, + priority_map_velocity)) { + if (bvalid) { gSog = temp_data.gSog; valid_flag += SOG_UPDATE; gCog = temp_data.gCog; @@ -717,9 +694,10 @@ bool CommBridge::HandleN0183_RMC(std::shared_ptr n0183_msg) { } } - if (!std::isnan(temp_data.gVar)){ - if (EvalPriority(n0183_msg, active_priority_variation, priority_map_variation)) { - if(bvalid) { + if (!std::isnan(temp_data.gVar)) { + if (EvalPriority(n0183_msg, active_priority_variation, + priority_map_variation)) { + if (bvalid) { gVar = temp_data.gVar; valid_flag += VAR_UPDATE; m_watchdogs.variation_watchdog = gps_watchdog_timeout_ticks; @@ -736,17 +714,15 @@ bool CommBridge::HandleN0183_HDT(std::shared_ptr n0183_msg) { NavData temp_data; ClearNavData(temp_data); - if (!m_decoder.DecodeHDT(str, temp_data)) - return false; + if (!m_decoder.DecodeHDT(str, temp_data)) return false; int valid_flag = 0; if (EvalPriority(n0183_msg, active_priority_heading, priority_map_heading)) { - gHdt = temp_data.gHdt; - valid_flag += HDT_UPDATE; - m_watchdogs.heading_watchdog = gps_watchdog_timeout_ticks; + gHdt = temp_data.gHdt; + valid_flag += HDT_UPDATE; + m_watchdogs.heading_watchdog = gps_watchdog_timeout_ticks; } - SendBasicNavdata(valid_flag); return true; } @@ -762,21 +738,21 @@ bool CommBridge::HandleN0183_HDG(std::shared_ptr n0183_msg) { bool bHDM = false; if (EvalPriority(n0183_msg, active_priority_heading, priority_map_heading)) { - gHdm = temp_data.gHdm; - m_watchdogs.heading_watchdog = gps_watchdog_timeout_ticks; - bHDM = true; + gHdm = temp_data.gHdm; + m_watchdogs.heading_watchdog = gps_watchdog_timeout_ticks; + bHDM = true; } - if (!std::isnan(temp_data.gVar)){ - if (EvalPriority(n0183_msg, active_priority_variation, priority_map_variation)) { + if (!std::isnan(temp_data.gVar)) { + if (EvalPriority(n0183_msg, active_priority_variation, + priority_map_variation)) { gVar = temp_data.gVar; valid_flag += VAR_UPDATE; m_watchdogs.variation_watchdog = gps_watchdog_timeout_ticks; } } - if (bHDM) - MakeHDTFromHDM(); + if (bHDM) MakeHDTFromHDM(); SendBasicNavdata(valid_flag); return true; @@ -811,7 +787,8 @@ bool CommBridge::HandleN0183_VTG(std::shared_ptr n0183_msg) { int valid_flag = 0; - if (EvalPriority(n0183_msg, active_priority_velocity, priority_map_velocity)) { + if (EvalPriority(n0183_msg, active_priority_velocity, + priority_map_velocity)) { gSog = temp_data.gSog; valid_flag += SOG_UPDATE; gCog = temp_data.gCog; @@ -832,8 +809,9 @@ bool CommBridge::HandleN0183_GSV(std::shared_ptr n0183_msg) { int valid_flag = 0; - if (EvalPriority(n0183_msg, active_priority_satellites, priority_map_satellites)) { - if (temp_data.n_satellites >= 0){ + if (EvalPriority(n0183_msg, active_priority_satellites, + priority_map_satellites)) { + if (temp_data.n_satellites >= 0) { g_SatsInView = temp_data.n_satellites; g_bSatValid = true; @@ -851,12 +829,13 @@ bool CommBridge::HandleN0183_GGA(std::shared_ptr n0183_msg) { ClearNavData(temp_data); bool bvalid = true; - if (!m_decoder.DecodeGGA(str, temp_data)) - bvalid = false;; + if (!m_decoder.DecodeGGA(str, temp_data)) bvalid = false; + ; int valid_flag = 0; - if (EvalPriority(n0183_msg, active_priority_position, priority_map_position)) { + if (EvalPriority(n0183_msg, active_priority_position, + priority_map_position)) { if (bvalid) { gLat = temp_data.gLat; gLon = temp_data.gLon; @@ -867,7 +846,8 @@ bool CommBridge::HandleN0183_GGA(std::shared_ptr n0183_msg) { valid_flag += POS_UPDATE; } - if (EvalPriority(n0183_msg, active_priority_satellites, priority_map_satellites)) { + if (EvalPriority(n0183_msg, active_priority_satellites, + priority_map_satellites)) { if (bvalid) { if (temp_data.n_satellites >= 0) { g_SatsInView = temp_data.n_satellites; @@ -888,12 +868,12 @@ bool CommBridge::HandleN0183_GLL(std::shared_ptr n0183_msg) { ClearNavData(temp_data); bool bvalid = true; - if (!m_decoder.DecodeGLL(str, temp_data)) - bvalid = false; + if (!m_decoder.DecodeGLL(str, temp_data)) bvalid = false; int valid_flag = 0; - if (EvalPriority(n0183_msg, active_priority_position, priority_map_position)) { + if (EvalPriority(n0183_msg, active_priority_position, + priority_map_position)) { if (bvalid) { gLat = temp_data.gLat; gLon = temp_data.gLon; @@ -909,7 +889,7 @@ bool CommBridge::HandleN0183_GLL(std::shared_ptr n0183_msg) { } bool CommBridge::HandleN0183_AIVDO( - std::shared_ptr n0183_msg) { + std::shared_ptr n0183_msg) { std::string str = n0183_msg->payload; GenericPosDatEx gpd; @@ -921,20 +901,21 @@ bool CommBridge::HandleN0183_AIVDO( nerr = DecodeSingleVDO(sentence, &gpd); if (nerr == AIS_NoError) { - - if (!std::isnan(gpd.kLat) && !std::isnan(gpd.kLon)){ - if (EvalPriority(n0183_msg, active_priority_position, priority_map_position)) { + if (!std::isnan(gpd.kLat) && !std::isnan(gpd.kLon)) { + if (EvalPriority(n0183_msg, active_priority_position, + priority_map_position)) { gLat = gpd.kLat; gLon = gpd.kLon; valid_flag += POS_UPDATE; valid_flag += POS_VALID; m_watchdogs.position_watchdog = gps_watchdog_timeout_ticks; - n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log + n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log } } - if (!std::isnan(gpd.kCog) && !std::isnan(gpd.kSog)){ - if (EvalPriority(n0183_msg, active_priority_velocity, priority_map_velocity)) { + if (!std::isnan(gpd.kCog) && !std::isnan(gpd.kSog)) { + if (EvalPriority(n0183_msg, active_priority_velocity, + priority_map_velocity)) { gSog = gpd.kSog; valid_flag += SOG_UPDATE; gCog = gpd.kCog; @@ -944,7 +925,8 @@ bool CommBridge::HandleN0183_AIVDO( } if (!std::isnan(gpd.kHdt)) { - if (EvalPriority(n0183_msg, active_priority_heading, priority_map_heading)) { + if (EvalPriority(n0183_msg, active_priority_heading, + priority_map_heading)) { gHdt = gpd.kHdt; valid_flag += HDT_UPDATE; m_watchdogs.heading_watchdog = gps_watchdog_timeout_ticks; @@ -956,12 +938,11 @@ bool CommBridge::HandleN0183_AIVDO( return true; } -bool CommBridge::HandleSignalK(std::shared_ptr sK_msg){ +bool CommBridge::HandleSignalK(std::shared_ptr sK_msg) { std::string str = sK_msg->raw_message; // Here we ignore messages involving contexts other than ownship - if (sK_msg->context_self != sK_msg->context) - return false; + if (sK_msg->context_self != sK_msg->context) return false; g_ownshipMMSI_SK = sK_msg->context_self; @@ -972,22 +953,22 @@ bool CommBridge::HandleSignalK(std::shared_ptr sK_msg){ int valid_flag = 0; - if (!std::isnan(temp_data.gLat) && !std::isnan(temp_data.gLon)){ + if (!std::isnan(temp_data.gLat) && !std::isnan(temp_data.gLon)) { if (EvalPriority(sK_msg, active_priority_position, priority_map_position)) { gLat = temp_data.gLat; gLon = temp_data.gLon; valid_flag += POS_UPDATE; valid_flag += POS_VALID; m_watchdogs.position_watchdog = gps_watchdog_timeout_ticks; - n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log + n_LogWatchdogPeriod = N_ACTIVE_LOG_WATCHDOG; // allow faster dog log } } - if (!std::isnan(temp_data.gSog)){ + if (!std::isnan(temp_data.gSog)) { if (EvalPriority(sK_msg, active_priority_velocity, priority_map_velocity)) { gSog = temp_data.gSog; valid_flag += SOG_UPDATE; - if((gSog > 0.05) && !std::isnan(temp_data.gCog)){ + if ((gSog > 0.05) && !std::isnan(temp_data.gCog)) { gCog = temp_data.gCog; valid_flag += COG_UPDATE; } @@ -995,7 +976,7 @@ bool CommBridge::HandleSignalK(std::shared_ptr sK_msg){ } } - if (!std::isnan(temp_data.gHdt)){ + if (!std::isnan(temp_data.gHdt)) { if (EvalPriority(sK_msg, active_priority_heading, priority_map_heading)) { gHdt = temp_data.gHdt; valid_flag += HDT_UPDATE; @@ -1003,7 +984,7 @@ bool CommBridge::HandleSignalK(std::shared_ptr sK_msg){ } } - if (!std::isnan(temp_data.gHdm)){ + if (!std::isnan(temp_data.gHdm)) { if (EvalPriority(sK_msg, active_priority_heading, priority_map_heading)) { gHdm = temp_data.gHdm; MakeHDTFromHDM(); @@ -1012,8 +993,9 @@ bool CommBridge::HandleSignalK(std::shared_ptr sK_msg){ } } - if (!std::isnan(temp_data.gVar)){ - if (EvalPriority(sK_msg, active_priority_variation, priority_map_variation)) { + if (!std::isnan(temp_data.gVar)) { + if (EvalPriority(sK_msg, active_priority_variation, + priority_map_variation)) { gVar = temp_data.gVar; valid_flag += VAR_UPDATE; m_watchdogs.variation_watchdog = gps_watchdog_timeout_ticks; @@ -1021,8 +1003,9 @@ bool CommBridge::HandleSignalK(std::shared_ptr sK_msg){ } bool sat_update = false; - if (temp_data.n_satellites > 0){ - if (EvalPriority(sK_msg, active_priority_satellites, priority_map_satellites)) { + if (temp_data.n_satellites > 0) { + if (EvalPriority(sK_msg, active_priority_satellites, + priority_map_satellites)) { g_SatsInView = temp_data.n_satellites; g_bSatValid = true; sat_update = true; @@ -1041,20 +1024,18 @@ bool CommBridge::HandleSignalK(std::shared_ptr sK_msg){ if (valid_flag & VAR_UPDATE) content += "VAR;"; if (sat_update) content += "SAT;"; - if (content.empty()) - content = "Not used by OCPN, maybe passed to plugins"; + if (content.empty()) content = "Not used by OCPN, maybe passed to plugins"; logmsg += content; std::string source = sK_msg->source->to_string(); - g_pMUX->LogInputMessage( logmsg, source, false, false); + g_pMUX->LogInputMessage(logmsg, source, false, false); } SendBasicNavdata(valid_flag); return true; } - -void CommBridge::InitializePriorityContainers(){ +void CommBridge::InitializePriorityContainers() { active_priority_position.active_priority = 0; active_priority_velocity.active_priority = 0; active_priority_heading.active_priority = 0; @@ -1086,18 +1067,18 @@ void CommBridge::InitializePriorityContainers(){ active_priority_satellites.active_source_address = -1; active_priority_void.active_priority = -1; +} - } - -void CommBridge::ClearPriorityMaps(){ - priority_map_position.clear(); +void CommBridge::ClearPriorityMaps() { + priority_map_position.clear(); priority_map_velocity.clear(); priority_map_heading.clear(); priority_map_variation.clear(); priority_map_satellites.clear(); } -PriorityContainer& CommBridge::GetPriorityContainer(const std::string category){ +PriorityContainer& CommBridge::GetPriorityContainer( + const std::string category) { if (!category.compare("position")) return active_priority_position; else if (!category.compare("velocity")) @@ -1112,39 +1093,37 @@ PriorityContainer& CommBridge::GetPriorityContainer(const std::string category){ return active_priority_void; } -void CommBridge::UpdateAndApplyMaps(std::vector new_maps){ +void CommBridge::UpdateAndApplyMaps(std::vector new_maps) { ApplyPriorityMaps(new_maps); SaveConfig(); PresetPriorityContainers(); } - -bool CommBridge::LoadConfig( void ) -{ - if( TheBaseConfig() ) { +bool CommBridge::LoadConfig(void) { + if (TheBaseConfig()) { TheBaseConfig()->SetPath("/Settings/CommPriority"); std::vector new_maps; std::string s_prio; wxString pri_string; - TheBaseConfig()->Read("PriorityPosition", &pri_string ); + TheBaseConfig()->Read("PriorityPosition", &pri_string); s_prio = std::string(pri_string.c_str()); new_maps.push_back(s_prio); - TheBaseConfig()->Read("PriorityVelocity", &pri_string ); + TheBaseConfig()->Read("PriorityVelocity", &pri_string); s_prio = std::string(pri_string.c_str()); new_maps.push_back(s_prio); - TheBaseConfig()->Read("PriorityHeading", &pri_string ); + TheBaseConfig()->Read("PriorityHeading", &pri_string); s_prio = std::string(pri_string.c_str()); new_maps.push_back(s_prio); - TheBaseConfig()->Read("PriorityVariation", &pri_string ); + TheBaseConfig()->Read("PriorityVariation", &pri_string); s_prio = std::string(pri_string.c_str()); new_maps.push_back(s_prio); - TheBaseConfig()->Read("PrioritySatellites", &pri_string ); + TheBaseConfig()->Read("PrioritySatellites", &pri_string); s_prio = std::string(pri_string.c_str()); new_maps.push_back(s_prio); @@ -1153,75 +1132,68 @@ bool CommBridge::LoadConfig( void ) return true; } -bool CommBridge::SaveConfig( void ) -{ - if( TheBaseConfig() ) { +bool CommBridge::SaveConfig(void) { + if (TheBaseConfig()) { TheBaseConfig()->SetPath("/Settings/CommPriority"); wxString pri_string; pri_string = wxString(GetPriorityMap(priority_map_position).c_str()); - TheBaseConfig()->Write( "PriorityPosition", pri_string ); + TheBaseConfig()->Write("PriorityPosition", pri_string); pri_string = wxString(GetPriorityMap(priority_map_velocity).c_str()); - TheBaseConfig()->Write( "PriorityVelocity", pri_string ); + TheBaseConfig()->Write("PriorityVelocity", pri_string); pri_string = wxString(GetPriorityMap(priority_map_heading).c_str()); - TheBaseConfig()->Write( "PriorityHeading", pri_string ); + TheBaseConfig()->Write("PriorityHeading", pri_string); pri_string = wxString(GetPriorityMap(priority_map_variation).c_str()); - TheBaseConfig()->Write( "PriorityVariation", pri_string ); + TheBaseConfig()->Write("PriorityVariation", pri_string); pri_string = wxString(GetPriorityMap(priority_map_satellites).c_str()); - TheBaseConfig()->Write( "PrioritySatellites", pri_string ); + TheBaseConfig()->Write("PrioritySatellites", pri_string); } return true; } - -std::string CommBridge::GetPriorityKey(std::shared_ptr msg){ +std::string CommBridge::GetPriorityKey(std::shared_ptr msg) { std::string source = msg->source->to_string(); std::string listener_key = msg->key(); - std::string this_identifier; std::string this_address("0"); - if(msg->bus == NavAddr::Bus::N0183){ + if (msg->bus == NavAddr::Bus::N0183) { auto msg_0183 = std::dynamic_pointer_cast(msg); - if (msg_0183){ + if (msg_0183) { this_identifier = msg_0183->talker; this_identifier += msg_0183->type; } - } - else if(msg->bus == NavAddr::Bus::N2000){ + } else if (msg->bus == NavAddr::Bus::N2000) { auto msg_n2k = std::dynamic_pointer_cast(msg); - if (msg_n2k){ + if (msg_n2k) { this_identifier = msg_n2k->PGN.to_string(); unsigned char n_source = msg_n2k->payload.at(7); char ss[4]; - sprintf(ss,"%d",n_source); + sprintf(ss, "%d", n_source); this_address = std::string(ss); } - } - else if(msg->bus == NavAddr::Bus::Signalk){ + } else if (msg->bus == NavAddr::Bus::Signalk) { auto msg_sk = std::dynamic_pointer_cast(msg); - if (msg_sk){ - auto addr_sk = std::static_pointer_cast(msg->source); + if (msg_sk) { + auto addr_sk = + std::static_pointer_cast(msg->source); source = addr_sk->to_string(); this_identifier = "signalK"; this_address = msg->source->iface; } } - - return source + ":" + this_address + ";" + this_identifier; - + return source + ":" + this_address + ";" + this_identifier; } -bool CommBridge::EvalPriority(std::shared_ptr msg, - PriorityContainer& active_priority, - std::unordered_map& priority_map) { - +bool CommBridge::EvalPriority( + std::shared_ptr msg, PriorityContainer& active_priority, + std::unordered_map& priority_map) { std::string this_key = GetPriorityKey(msg); if (debug_priority) printf("This Key: %s\n", this_key.c_str()); @@ -1248,49 +1220,53 @@ bool CommBridge::EvalPriority(std::shared_ptr msg, this_priority = priority_map[this_key]; for (auto it = priority_map.begin(); it != priority_map.end(); it++) { - if (debug_priority) printf(" priority_map: %s %d\n", it->first.c_str(), it->second); + if (debug_priority) + printf(" priority_map: %s %d\n", it->first.c_str(), + it->second); } - //Incoming message priority lower than currently active priority? - // If so, drop the message - if (this_priority > active_priority.active_priority){ - if (debug_priority) printf(" Drop low priority: %s %d %d \n", source.c_str(), this_priority, - active_priority.active_priority); + // Incoming message priority lower than currently active priority? + // If so, drop the message + if (this_priority > active_priority.active_priority) { + if (debug_priority) + printf(" Drop low priority: %s %d %d \n", source.c_str(), + this_priority, active_priority.active_priority); return false; } // A channel returning, after being watchdogged out. - if (this_priority < active_priority.active_priority){ + if (this_priority < active_priority.active_priority) { active_priority.active_priority = this_priority; active_priority.active_source = source; active_priority.active_identifier = this_identifier; active_priority.active_source_address = source_address; - if (debug_priority) printf(" Restoring high priority: %s %d\n", source.c_str(), this_priority); + if (debug_priority) + printf(" Restoring high priority: %s %d\n", source.c_str(), + this_priority); return true; } - // Do we see two sources with the same priority? // If so, we take the first one, and deprioritize this one. - if (active_priority.active_source.size()){ - + if (active_priority.active_source.size()) { if (debug_priority) printf("source: %s\n", source.c_str()); - if (debug_priority) printf("active_source: %s\n", active_priority.active_source.c_str()); - - if (source.compare(active_priority.active_source) != 0){ + if (debug_priority) + printf("active_source: %s\n", active_priority.active_source.c_str()); + if (source.compare(active_priority.active_source) != 0) { // Auto adjust the priority of the this message down - //First, find the lowest priority in use in this map - int lowest_priority = -10; // safe enough + // First, find the lowest priority in use in this map + int lowest_priority = -10; // safe enough for (auto it = priority_map.begin(); it != priority_map.end(); it++) { - if (it->second > lowest_priority) - lowest_priority = it->second; + if (it->second > lowest_priority) lowest_priority = it->second; } priority_map[this_key] = lowest_priority + 1; - if (debug_priority) printf(" Lowering priority A: %s :%d\n", source.c_str(), priority_map[this_key]); + if (debug_priority) + printf(" Lowering priority A: %s :%d\n", source.c_str(), + priority_map[this_key]); return false; } } @@ -1298,27 +1274,30 @@ bool CommBridge::EvalPriority(std::shared_ptr msg, // For N0183 message, has the Mnemonic (id) changed? // Example: RMC and AIVDO from same source. - - if(msg->bus == NavAddr::Bus::N0183){ + if (msg->bus == NavAddr::Bus::N0183) { auto msg_0183 = std::dynamic_pointer_cast(msg); - if (msg_0183){ - if (active_priority.active_identifier.size()){ - - if (debug_priority) printf("this_identifier: %s\n", this_identifier.c_str()); - if (debug_priority) printf("active_priority.active_identifier: %s\n", active_priority.active_identifier.c_str()); - - if (this_identifier.compare(active_priority.active_identifier) != 0){ + if (msg_0183) { + if (active_priority.active_identifier.size()) { + if (debug_priority) + printf("this_identifier: %s\n", this_identifier.c_str()); + if (debug_priority) + printf("active_priority.active_identifier: %s\n", + active_priority.active_identifier.c_str()); + + if (this_identifier.compare(active_priority.active_identifier) != 0) { // if necessary, auto adjust the priority of the this message down - //and drop it - if (priority_map[this_key] == active_priority.active_priority){ - int lowest_priority = -10; // safe enough - for (auto it = priority_map.begin(); it != priority_map.end(); it++) { - if (it->second > lowest_priority) - lowest_priority = it->second; + // and drop it + if (priority_map[this_key] == active_priority.active_priority) { + int lowest_priority = -10; // safe enough + for (auto it = priority_map.begin(); it != priority_map.end(); + it++) { + if (it->second > lowest_priority) lowest_priority = it->second; } priority_map[this_key] = lowest_priority + 1; - if (debug_priority) printf(" Lowering priority B: %s :%d\n", source.c_str(), priority_map[this_key]); + if (debug_priority) + printf(" Lowering priority B: %s :%d\n", source.c_str(), + priority_map[this_key]); } return false; @@ -1329,22 +1308,24 @@ bool CommBridge::EvalPriority(std::shared_ptr msg, // Similar for n2k PGN... - else if(msg->bus == NavAddr::Bus::N2000){ + else if (msg->bus == NavAddr::Bus::N2000) { auto msg_n2k = std::dynamic_pointer_cast(msg); - if (msg_n2k){ - if (active_priority.active_identifier.size()){ - if (this_identifier.compare(active_priority.active_identifier) != 0){ - // if necessary, auto adjust the priority of the this message down - //and drop it - if (priority_map[this_key] == active_priority.active_priority){ - int lowest_priority = -10; // safe enough - for (auto it = priority_map.begin(); it != priority_map.end(); it++) { - if (it->second > lowest_priority) - lowest_priority = it->second; + if (msg_n2k) { + if (active_priority.active_identifier.size()) { + if (this_identifier.compare(active_priority.active_identifier) != 0) { + // if necessary, auto adjust the priority of the this message down + // and drop it + if (priority_map[this_key] == active_priority.active_priority) { + int lowest_priority = -10; // safe enough + for (auto it = priority_map.begin(); it != priority_map.end(); + it++) { + if (it->second > lowest_priority) lowest_priority = it->second; } priority_map[this_key] = lowest_priority + 1; - if (debug_priority) printf(" Lowering priority: %s :%d\n", source.c_str(), priority_map[this_key]); + if (debug_priority) + printf(" Lowering priority: %s :%d\n", source.c_str(), + priority_map[this_key]); } return false; @@ -1353,12 +1334,12 @@ bool CommBridge::EvalPriority(std::shared_ptr msg, } } - // Update the records active_priority.active_source = source; active_priority.active_identifier = this_identifier; active_priority.active_source_address = source_address; - if (debug_priority) printf(" Accepting high priority: %s %d\n", source.c_str(), this_priority); + if (debug_priority) + printf(" Accepting high priority: %s %d\n", source.c_str(), this_priority); return true; } diff --git a/model/src/comm_can_util.cpp b/model/src/comm_can_util.cpp index 33f232aa5a..1a4b929d22 100644 --- a/model/src/comm_can_util.cpp +++ b/model/src/comm_can_util.cpp @@ -59,17 +59,17 @@ bool IsFastMessagePGN(unsigned pgn) { unsigned long BuildCanID(int priority, int source, int destination, int pgn) { // build CanID unsigned long cid = 0; - unsigned char pf = (unsigned char) (pgn >> 8); - if (pf < 240){ - cid = ((unsigned long)(priority & 0x7))<<26 | pgn<<8 | ((unsigned long)destination)<<8 | (unsigned long)source; - } - else { - cid = ((unsigned long)(priority & 0x7))<<26 | pgn<<8 | (unsigned long)source; + unsigned char pf = (unsigned char)(pgn >> 8); + if (pf < 240) { + cid = ((unsigned long)(priority & 0x7)) << 26 | pgn << 8 | + ((unsigned long)destination) << 8 | (unsigned long)source; + } else { + cid = ((unsigned long)(priority & 0x7)) << 26 | pgn << 8 | + (unsigned long)source; } return cid; } - // CanHeader implementation CanHeader::CanHeader(const CanFrame frame) { @@ -85,7 +85,6 @@ CanHeader::CanHeader(const CanFrame frame) { priority = (buf[3] & 0x1c) >> 2; } - bool CanHeader::IsFastMessage() const { return IsFastMessagePGN(static_cast(pgn)); #if 0 @@ -107,12 +106,13 @@ bool CanHeader::IsFastMessage() const { // FastMessage implementation bool FastMessageMap::IsEntryExpired(unsigned int i) { - return (wxDateTime::Now() - entries[i].time_arrived - > wxTimeSpan(0, 0, kEntryMaxAgeSecs)); + return (wxDateTime::Now() - entries[i].time_arrived > + wxTimeSpan(0, 0, kEntryMaxAgeSecs)); } void FastMessageMap::CheckGc() { - bool last_run_over_age = (wxDateTime::Now() - last_gc_run) > wxTimeSpan(0, 0, kGcIntervalSecs); + bool last_run_over_age = + (wxDateTime::Now() - last_gc_run) > wxTimeSpan(0, 0, kGcIntervalSecs); if (last_run_over_age || entries.size() > kGcThreshold) { GarbageCollector(); last_gc_run = wxDateTime::Now(); @@ -242,5 +242,3 @@ void FastMessageMap::Remove(int pos) { if ((unsigned int)(pos + 1) >= entries.size()) entries.erase(entries.begin() + pos); } - - diff --git a/model/src/comm_decoder.cpp b/model/src/comm_decoder.cpp index 5cda726ec4..d117830e25 100644 --- a/model/src/comm_decoder.cpp +++ b/model/src/comm_decoder.cpp @@ -41,7 +41,6 @@ #include "model/geodesic.h" #include "model/own_ship.h" - bool CommDecoder::ParsePosition(const LATLONG& Position, double& lat, double& lon) { bool ll_valid = true; @@ -181,7 +180,8 @@ bool CommDecoder::DecodeVTG(std::string s, NavData& temp_data) { // FIXME (dave)if (g_own_ship_sog_cog_calc) return false; - if (!std::isnan(m_NMEA0183.Vtg.SpeedKnots)) temp_data.gSog = m_NMEA0183.Vtg.SpeedKnots; + if (!std::isnan(m_NMEA0183.Vtg.SpeedKnots)) + temp_data.gSog = m_NMEA0183.Vtg.SpeedKnots; if (!std::isnan(m_NMEA0183.Vtg.SpeedKnots) && !std::isnan(m_NMEA0183.Vtg.TrackDegreesTrue)) { @@ -250,13 +250,12 @@ bool CommDecoder::DecodeGGA(std::string s, NavData& temp_data) { return true; } - //--------------------------------------------------------------------- // NMEA2000 PGN Decode //--------------------------------------------------------------------- -bool CommDecoder::DecodePGN129026(std::vector v, NavData& temp_data) { - +bool CommDecoder::DecodePGN129026(std::vector v, + NavData& temp_data) { unsigned char SID; tN2kHeadingReference ref; double COG, SOG; @@ -271,7 +270,8 @@ bool CommDecoder::DecodePGN129026(std::vector v, NavData& temp_d return false; } -bool CommDecoder::DecodePGN129029(std::vector v, NavData& temp_data) { +bool CommDecoder::DecodePGN129029(std::vector v, + NavData& temp_data) { unsigned char SID; uint16_t DaysSince1970; double SecondsSinceMidnight; @@ -285,13 +285,11 @@ bool CommDecoder::DecodePGN129029(std::vector v, NavData& temp_d uint16_t ReferenceSationID; double AgeOfCorrection; - if (ParseN2kPGN129029(v, SID, DaysSince1970, SecondsSinceMidnight, - Latitude, Longitude, Altitude, - GNSStype, GNSSmethod, - nSatellites, HDOP, PDOP, GeoidalSeparation, - nReferenceStations, ReferenceStationType, ReferenceSationID, - AgeOfCorrection - )) { + if (ParseN2kPGN129029(v, SID, DaysSince1970, SecondsSinceMidnight, Latitude, + Longitude, Altitude, GNSStype, GNSSmethod, nSatellites, + HDOP, PDOP, GeoidalSeparation, nReferenceStations, + ReferenceStationType, ReferenceSationID, + AgeOfCorrection)) { temp_data.gLat = Latitude; temp_data.gLon = Longitude; temp_data.SID = SID; @@ -300,11 +298,9 @@ bool CommDecoder::DecodePGN129029(std::vector v, NavData& temp_d // One supposes that PGN 129540 should be used instead // Here we decide that if a fix is valid, nSatellites must be > 0 to be // reported in this PGN 129029 - if ( (GNSSmethod == N2kGNSSm_GNSSfix) || - (GNSSmethod == N2kGNSSm_DGNSS) || - (GNSSmethod == N2kGNSSm_PreciseGNSS)){ - if (nSatellites > 0) - temp_data.n_satellites = nSatellites; + if ((GNSSmethod == N2kGNSSm_GNSSfix) || (GNSSmethod == N2kGNSSm_DGNSS) || + (GNSSmethod == N2kGNSSm_PreciseGNSS)) { + if (nSatellites > 0) temp_data.n_satellites = nSatellites; } return true; @@ -313,13 +309,13 @@ bool CommDecoder::DecodePGN129029(std::vector v, NavData& temp_d return false; } -bool CommDecoder::DecodePGN127250(std::vector v, NavData& temp_data) { - +bool CommDecoder::DecodePGN127250(std::vector v, + NavData& temp_data) { unsigned char SID; double Heading, Deviation, Variation; tN2kHeadingReference ref; - if (ParseN2kPGN127250(v, SID, Heading, Deviation, Variation, ref)){ + if (ParseN2kPGN127250(v, SID, Heading, Deviation, Variation, ref)) { temp_data.gHdt = N2kDoubleNA; temp_data.gHdm = N2kDoubleNA; if (ref == tN2kHeadingReference::N2khr_true) @@ -335,12 +331,11 @@ bool CommDecoder::DecodePGN127250(std::vector v, NavData& temp_d return false; } -bool CommDecoder::DecodePGN129025(std::vector v, NavData& temp_data) { - +bool CommDecoder::DecodePGN129025(std::vector v, + NavData& temp_data) { double Latitude, Longitude; - if (ParseN2kPGN129025(v, Latitude, Longitude)){ - + if (ParseN2kPGN129025(v, Latitude, Longitude)) { temp_data.gLat = Latitude; temp_data.gLon = Longitude; return true; @@ -349,10 +344,11 @@ bool CommDecoder::DecodePGN129025(std::vector v, NavData& temp_d return false; } -bool CommDecoder::DecodePGN129540(std::vector v, NavData& temp_data) { - +bool CommDecoder::DecodePGN129540(std::vector v, + NavData& temp_data) { unsigned char SID; - uint8_t NumberOfSVs;; + uint8_t NumberOfSVs; + ; tN2kRangeResidualMode Mode; if (ParseN2kPGN129540(v, SID, Mode, NumberOfSVs)) { @@ -364,15 +360,15 @@ bool CommDecoder::DecodePGN129540(std::vector v, NavData& temp_d return false; } -bool CommDecoder::DecodeSignalK(std::string s, NavData& temp_data){ +bool CommDecoder::DecodeSignalK(std::string s, NavData& temp_data) { rapidjson::Document root; root.Parse(s); - if (root.HasParseError()) - return false; + if (root.HasParseError()) return false; if (root.HasMember("updates") && root["updates"].IsArray()) { - for (rapidjson::Value::ConstValueIterator itr = root["updates"].Begin(); itr != root["updates"].End(); ++itr) { + for (rapidjson::Value::ConstValueIterator itr = root["updates"].Begin(); + itr != root["updates"].End(); ++itr) { handleUpdate(*itr, temp_data); } } @@ -380,7 +376,8 @@ bool CommDecoder::DecodeSignalK(std::string s, NavData& temp_data){ return true; } -void CommDecoder::handleUpdate(const rapidjson::Value &update, NavData& temp_data) { +void CommDecoder::handleUpdate(const rapidjson::Value& update, + NavData& temp_data) { wxString sfixtime = ""; if (update.HasMember("timestamp")) { @@ -391,17 +388,18 @@ void CommDecoder::handleUpdate(const rapidjson::Value &update, NavData& temp_dat } if (update.HasMember("values") && update["values"].IsArray()) { - for (rapidjson::Value::ConstValueIterator itr = update["values"].Begin(); itr != update["values"].End(); ++itr) { + for (rapidjson::Value::ConstValueIterator itr = update["values"].Begin(); + itr != update["values"].End(); ++itr) { updateItem(*itr, sfixtime, temp_data); } } } -void CommDecoder::updateItem(const rapidjson::Value &item, - wxString &sfixtime, NavData& temp_data) { +void CommDecoder::updateItem(const rapidjson::Value& item, wxString& sfixtime, + NavData& temp_data) { bool bposValid = false; if (item.HasMember("path") && item.HasMember("value")) { - const wxString &update_path = item["path"].GetString(); + const wxString& update_path = item["path"].GetString(); if (update_path == _T("navigation.gnss.methodQuality")) { // Record statically the GNSS status for this source in a hashmap @@ -441,9 +439,8 @@ void CommDecoder::updateItem(const rapidjson::Value &item, /*bposValid &&*/ !item["value"].IsNull()) { updateNavigationCourseOverGround(item["value"], sfixtime, temp_data); } else if (update_path == _T("navigation.courseOverGroundMagnetic")) { - } - else if (update_path == - _T("navigation.gnss.satellites")) // From GGA sats in use + } else if (update_path == + _T("navigation.gnss.satellites")) // From GGA sats in use { updateGnssSatellites(item["value"], sfixtime, temp_data); } else if (update_path == @@ -451,13 +448,13 @@ void CommDecoder::updateItem(const rapidjson::Value &item, { updateGnssSatellites(item["value"], sfixtime, temp_data); } else if (update_path == _T("navigation.headingTrue")) { - if(!item["value"].IsNull()) + if (!item["value"].IsNull()) updateHeadingTrue(item["value"], sfixtime, temp_data); } else if (update_path == _T("navigation.headingMagnetic")) { - if(!item["value"].IsNull()) + if (!item["value"].IsNull()) updateHeadingMagnetic(item["value"], sfixtime, temp_data); } else if (update_path == _T("navigation.magneticVariation")) { - if(!item["value"].IsNull()) + if (!item["value"].IsNull()) updateMagneticVariance(item["value"], sfixtime, temp_data); } else { // wxLogMessage(wxString::Format(_T("** Signal K unhandled update: %s"), @@ -466,8 +463,9 @@ void CommDecoder::updateItem(const rapidjson::Value &item, } } -bool CommDecoder::updateNavigationPosition( - const rapidjson::Value &value, const wxString &sfixtime, NavData& temp_data) { +bool CommDecoder::updateNavigationPosition(const rapidjson::Value& value, + const wxString& sfixtime, + NavData& temp_data) { if ((value.HasMember("latitude") && value["latitude"].IsDouble()) && (value.HasMember("longitude") && value["longitude"].IsDouble())) { // wxLogMessage(_T(" ***** Position Update")); @@ -479,27 +477,27 @@ bool CommDecoder::updateNavigationPosition( } } - -void CommDecoder::updateNavigationSpeedOverGround( - const rapidjson::Value &value, const wxString &sfixtime, NavData& temp_data){ +void CommDecoder::updateNavigationSpeedOverGround(const rapidjson::Value& value, + const wxString& sfixtime, + NavData& temp_data) { double sog_ms = value.GetDouble(); - double sog_knot = sog_ms * 1.9438444924406; // m/s to knots + double sog_knot = sog_ms * 1.9438444924406; // m/s to knots // wxLogMessage(wxString::Format(_T(" ***** SOG: %f, %f"), sog_ms, sog_knot)); temp_data.gSog = sog_knot; } void CommDecoder::updateNavigationCourseOverGround( - const rapidjson::Value &value, const wxString &sfixtime, NavData& temp_data) { + const rapidjson::Value& value, const wxString& sfixtime, + NavData& temp_data) { double cog_rad = value.GetDouble(); double cog_deg = GEODESIC_RAD2DEG(cog_rad); // wxLogMessage(wxString::Format(_T(" ***** COG: %f, %f"), cog_rad, cog_deg)); temp_data.gCog = cog_deg; } -void CommDecoder::updateGnssSatellites(const rapidjson::Value &value, - const wxString &sfixtime, +void CommDecoder::updateGnssSatellites(const rapidjson::Value& value, + const wxString& sfixtime, NavData& temp_data) { - if (value.IsInt()) { if (value.GetInt() > 0) { temp_data.n_satellites = value.GetInt(); @@ -515,20 +513,20 @@ void CommDecoder::updateGnssSatellites(const rapidjson::Value &value, } } -void CommDecoder::updateHeadingTrue(const rapidjson::Value &value, - const wxString &sfixtime, +void CommDecoder::updateHeadingTrue(const rapidjson::Value& value, + const wxString& sfixtime, NavData& temp_data) { temp_data.gHdt = GEODESIC_RAD2DEG(value.GetDouble()); } -void CommDecoder::updateHeadingMagnetic( - const rapidjson::Value &value, const wxString &sfixtime, - NavData& temp_data) { +void CommDecoder::updateHeadingMagnetic(const rapidjson::Value& value, + const wxString& sfixtime, + NavData& temp_data) { temp_data.gHdm = GEODESIC_RAD2DEG(value.GetDouble()); } -void CommDecoder::updateMagneticVariance( - const rapidjson::Value &value, const wxString &sfixtime, - NavData& temp_data) { +void CommDecoder::updateMagneticVariance(const rapidjson::Value& value, + const wxString& sfixtime, + NavData& temp_data) { temp_data.gVar = GEODESIC_RAD2DEG(value.GetDouble()); } diff --git a/model/src/comm_drv_factory.cpp b/model/src/comm_drv_factory.cpp index e364f8701d..c97d030cb2 100644 --- a/model/src/comm_drv_factory.cpp +++ b/model/src/comm_drv_factory.cpp @@ -91,9 +91,8 @@ std::shared_ptr MakeCommDriver( return driver; break; } - case PROTO_NMEA2000:{ - auto driver = - std::make_shared(params, msgbus); + case PROTO_NMEA2000: { + auto driver = std::make_shared(params, msgbus); registry.Activate(driver); return driver; @@ -107,8 +106,7 @@ std::shared_ptr MakeCommDriver( } #if defined(__linux__) && !defined(__ANDROID__) && !defined(__WXOSX__) - case SOCKETCAN: - { + case SOCKETCAN: { auto driver = CommDriverN2KSocketCAN::Create(params, msgbus); registry.Activate(driver); return driver; @@ -138,11 +136,6 @@ std::shared_ptr MakeCommDriver( return NULL; }; +void initIXNetSystem() { CommDriverSignalKNet::initIXNetSystem(); }; -void initIXNetSystem() { - CommDriverSignalKNet::initIXNetSystem(); -}; - -void uninitIXNetSystem() { - CommDriverSignalKNet::uninitIXNetSystem(); -}; \ No newline at end of file +void uninitIXNetSystem() { CommDriverSignalKNet::uninitIXNetSystem(); }; diff --git a/model/src/comm_drv_file.cpp b/model/src/comm_drv_file.cpp index 646b237cc3..0317c29cd5 100644 --- a/model/src/comm_drv_file.cpp +++ b/model/src/comm_drv_file.cpp @@ -23,7 +23,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * **************************************************************************/ - // For compilers that support precompilation, includes "wx.h". +// For compilers that support precompilation, includes "wx.h". #include #ifndef WX_PRECOMP @@ -61,7 +61,7 @@ FileCommDriver::FileCommDriver(const string& opath) : FileCommDriver(opath, "", kVoidDriverListener) {} std::shared_ptr FileCommDriver::GetAddress() { - return std::make_shared(NavAddrTest(output_path)); + return std::make_shared(NavAddrTest(output_path)); } bool FileCommDriver::SendMessage(std::shared_ptr msg, @@ -98,8 +98,8 @@ static shared_ptr LineToMessage(const string& line, if (true) { // Create a separate scope. N2kName name(N2kName::Parse(words[2])); vector payload(HexToChar(words[3])); -// FIXME (Leamas) -// return make_shared(name, payload, src); + // FIXME (Leamas) + // return make_shared(name, payload, src); return make_shared(); } break; diff --git a/model/src/comm_drv_n0183_android_bt.cpp b/model/src/comm_drv_n0183_android_bt.cpp index 626e43ce27..a518edca58 100644 --- a/model/src/comm_drv_n0183_android_bt.cpp +++ b/model/src/comm_drv_n0183_android_bt.cpp @@ -90,30 +90,35 @@ class n0183_atomic_queue { mutable std::mutex m_mutex; }; -#define OUT_QUEUE_LENGTH 20 -#define MAX_OUT_QUEUE_MESSAGE_LENGTH 100 +#define OUT_QUEUE_LENGTH 20 +#define MAX_OUT_QUEUE_MESSAGE_LENGTH 100 -wxDEFINE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_BT, CommDriverN0183AndroidBTEvent); +wxDEFINE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_BT, + CommDriverN0183AndroidBTEvent); -CommDriverN0183AndroidBTEvent::CommDriverN0183AndroidBTEvent( wxEventType commandType, int id = 0) - : wxEvent(id, commandType){}; +CommDriverN0183AndroidBTEvent::CommDriverN0183AndroidBTEvent( + wxEventType commandType, int id = 0) + : wxEvent(id, commandType) {}; -CommDriverN0183AndroidBTEvent::~CommDriverN0183AndroidBTEvent(){}; +CommDriverN0183AndroidBTEvent::~CommDriverN0183AndroidBTEvent() {}; -void CommDriverN0183AndroidBTEvent::SetPayload(std::shared_ptr> data) { - m_payload = data; +void CommDriverN0183AndroidBTEvent::SetPayload( + std::shared_ptr> data) { + m_payload = data; +} +std::shared_ptr> +CommDriverN0183AndroidBTEvent::GetPayload() { + return m_payload; } -std::shared_ptr> CommDriverN0183AndroidBTEvent::GetPayload() { return m_payload; } - // required for sending with wxPostEvent() +// required for sending with wxPostEvent() wxEvent* CommDriverN0183AndroidBTEvent::Clone() const { - CommDriverN0183AndroidBTEvent* newevent = - new CommDriverN0183AndroidBTEvent(*this); - newevent->m_payload = this->m_payload; - return newevent; + CommDriverN0183AndroidBTEvent* newevent = + new CommDriverN0183AndroidBTEvent(*this); + newevent->m_payload = this->m_payload; + return newevent; }; - template class circular_buffer { public: @@ -166,20 +171,30 @@ class circular_buffer { bool full_ = 0; }; -CommDriverN0183AndroidBT::CommDriverN0183AndroidBT(const ConnectionParams* params, - DriverListener& listener) +CommDriverN0183AndroidBT::CommDriverN0183AndroidBT( + const ConnectionParams* params, DriverListener& listener) : CommDriverN0183(NavAddr::Bus::N0183, ((ConnectionParams*)params)->GetStrippedDSPort()), m_bok(false), m_portstring(params->GetDSPort()), m_params(*params), m_listener(listener) { - //m_BaudRate = wxString::Format("%i", params->Baudrate), SetSecThreadInActive(); + // m_BaudRate = wxString::Format("%i", params->Baudrate), + // SetSecThreadInActive(); this->attributes["commPort"] = params->Port.ToStdString(); + this->attributes["userComment"] = params->UserComment.ToStdString(); + dsPortType iosel = params->IOSelect; + std::string s_iosel = std::string("IN"); + if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "OUT"; + } else if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "IN/OUT"; + } + this->attributes["ioDirection"] = s_iosel; // Prepare the wxEventHandler to accept events from the actual hardware thread - Bind(wxEVT_COMMDRIVER_N0183_ANDROID_BT, &CommDriverN0183AndroidBT::handle_N0183_MSG, - this); + Bind(wxEVT_COMMDRIVER_N0183_ANDROID_BT, + &CommDriverN0183AndroidBT::handle_N0183_MSG, this); Open(); } @@ -192,7 +207,7 @@ bool CommDriverN0183AndroidBT::Open() { wxString port_uc = m_params.GetDSPort().Upper(); - androidStartBT( this, port_uc ); + androidStartBT(this, port_uc); return true; } @@ -202,31 +217,26 @@ void CommDriverN0183AndroidBT::Close() { androidStopBT(); - Unbind(wxEVT_COMMDRIVER_N0183_ANDROID_BT, &CommDriverN0183AndroidBT::handle_N0183_MSG, - this); + Unbind(wxEVT_COMMDRIVER_N0183_ANDROID_BT, + &CommDriverN0183AndroidBT::handle_N0183_MSG, this); } - void CommDriverN0183AndroidBT::Activate() { CommDriverRegistry::GetInstance().Activate(shared_from_this()); } -bool CommDriverN0183AndroidBT::SendMessage(std::shared_ptr msg, - std::shared_ptr addr) { - +bool CommDriverN0183AndroidBT::SendMessage( + std::shared_ptr msg, std::shared_ptr addr) { auto msg_0183 = std::dynamic_pointer_cast(msg); wxString sentence(msg_0183->payload.c_str()); wxString payload = sentence; - if( !sentence.EndsWith(_T("\r\n")) ) - payload += _T("\r\n"); + if (!sentence.EndsWith(_T("\r\n"))) payload += _T("\r\n"); androidSendBTMessage(payload); return true; } - - void CommDriverN0183AndroidBT::handle_N0183_MSG( CommDriverN0183AndroidBTEvent& event) { auto p = event.GetPayload(); diff --git a/model/src/comm_drv_n0183_android_int.cpp b/model/src/comm_drv_n0183_android_int.cpp index 9946307c59..d8c4ed29f8 100644 --- a/model/src/comm_drv_n0183_android_int.cpp +++ b/model/src/comm_drv_n0183_android_int.cpp @@ -90,30 +90,35 @@ class n0183_atomic_queue { mutable std::mutex m_mutex; }; -#define OUT_QUEUE_LENGTH 20 -#define MAX_OUT_QUEUE_MESSAGE_LENGTH 100 +#define OUT_QUEUE_LENGTH 20 +#define MAX_OUT_QUEUE_MESSAGE_LENGTH 100 -wxDEFINE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_INT, CommDriverN0183AndroidIntEvent); +wxDEFINE_EVENT(wxEVT_COMMDRIVER_N0183_ANDROID_INT, + CommDriverN0183AndroidIntEvent); -CommDriverN0183AndroidIntEvent::CommDriverN0183AndroidIntEvent( wxEventType commandType, int id = 0) - : wxEvent(id, commandType){}; +CommDriverN0183AndroidIntEvent::CommDriverN0183AndroidIntEvent( + wxEventType commandType, int id = 0) + : wxEvent(id, commandType) {}; -CommDriverN0183AndroidIntEvent::~CommDriverN0183AndroidIntEvent(){}; +CommDriverN0183AndroidIntEvent::~CommDriverN0183AndroidIntEvent() {}; -void CommDriverN0183AndroidIntEvent::SetPayload(std::shared_ptr> data) { - m_payload = data; +void CommDriverN0183AndroidIntEvent::SetPayload( + std::shared_ptr> data) { + m_payload = data; +} +std::shared_ptr> +CommDriverN0183AndroidIntEvent::GetPayload() { + return m_payload; } -std::shared_ptr> CommDriverN0183AndroidIntEvent::GetPayload() { return m_payload; } - // required for sending with wxPostEvent() +// required for sending with wxPostEvent() wxEvent* CommDriverN0183AndroidIntEvent::Clone() const { - CommDriverN0183AndroidIntEvent* newevent = - new CommDriverN0183AndroidIntEvent(*this); - newevent->m_payload = this->m_payload; - return newevent; + CommDriverN0183AndroidIntEvent* newevent = + new CommDriverN0183AndroidIntEvent(*this); + newevent->m_payload = this->m_payload; + return newevent; }; - template class circular_buffer { public: @@ -166,8 +171,8 @@ class circular_buffer { bool full_ = 0; }; -CommDriverN0183AndroidInt::CommDriverN0183AndroidInt(const ConnectionParams* params, - DriverListener& listener) +CommDriverN0183AndroidInt::CommDriverN0183AndroidInt( + const ConnectionParams* params, DriverListener& listener) : CommDriverN0183(NavAddr::Bus::N0183, ((ConnectionParams*)params)->GetStrippedDSPort()), m_bok(false), @@ -175,10 +180,19 @@ CommDriverN0183AndroidInt::CommDriverN0183AndroidInt(const ConnectionParams* par m_params(*params), m_listener(listener) { this->attributes["commPort"] = params->Port.ToStdString(); + this->attributes["userComment"] = params->UserComment.ToStdString(); + dsPortType iosel = params->IOSelect; + std::string s_iosel = std::string("IN"); + if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "OUT"; + } else if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "IN/OUT"; + } + this->attributes["ioDirection"] = s_iosel; // Prepare the wxEventHandler to accept events from the actual hardware thread - Bind(wxEVT_COMMDRIVER_N0183_ANDROID_INT, &CommDriverN0183AndroidInt::handle_N0183_MSG, - this); + Bind(wxEVT_COMMDRIVER_N0183_ANDROID_INT, + &CommDriverN0183AndroidInt::handle_N0183_MSG, this); Open(); } @@ -186,7 +200,7 @@ CommDriverN0183AndroidInt::CommDriverN0183AndroidInt(const ConnectionParams* par CommDriverN0183AndroidInt::~CommDriverN0183AndroidInt() { Close(); } bool CommDriverN0183AndroidInt::Open() { - androidStartGPS( this ); + androidStartGPS(this); return true; } @@ -196,23 +210,19 @@ void CommDriverN0183AndroidInt::Close() { androidStopGPS(); - Unbind(wxEVT_COMMDRIVER_N0183_ANDROID_INT, &CommDriverN0183AndroidInt::handle_N0183_MSG, - this); - + Unbind(wxEVT_COMMDRIVER_N0183_ANDROID_INT, + &CommDriverN0183AndroidInt::handle_N0183_MSG, this); } - void CommDriverN0183AndroidInt::Activate() { CommDriverRegistry::GetInstance().Activate(shared_from_this()); } -bool CommDriverN0183AndroidInt::SendMessage(std::shared_ptr msg, - std::shared_ptr addr) { +bool CommDriverN0183AndroidInt::SendMessage( + std::shared_ptr msg, std::shared_ptr addr) { return false; } - - void CommDriverN0183AndroidInt::handle_N0183_MSG( CommDriverN0183AndroidIntEvent& event) { auto p = event.GetPayload(); diff --git a/model/src/comm_drv_n0183_net.cpp b/model/src/comm_drv_n0183_net.cpp index 313655a538..696b32207d 100644 --- a/model/src/comm_drv_n0183_net.cpp +++ b/model/src/comm_drv_n0183_net.cpp @@ -106,8 +106,8 @@ wxDECLARE_EVENT(wxEVT_COMMDRIVER_N0183_NET, CommDriverN0183NetEvent); class CommDriverN0183NetEvent : public wxEvent { public: CommDriverN0183NetEvent(wxEventType commandType = wxEVT_NULL, int id = 0) - : wxEvent(id, commandType){}; - ~CommDriverN0183NetEvent(){}; + : wxEvent(id, commandType) {}; + ~CommDriverN0183NetEvent() {}; // accessors void SetPayload(std::shared_ptr> data) { @@ -167,6 +167,15 @@ CommDriverN0183Net::CommDriverN0183Net(const ConnectionParams* params, char port_char[10]; sprintf(port_char, "%d", params->NetworkPort); this->attributes["netPort"] = std::string(port_char); + this->attributes["userComment"] = params->UserComment.ToStdString(); + dsPortType iosel = params->IOSelect; + std::string s_iosel = std::string("IN"); + if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "OUT"; + } else if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "IN/OUT"; + } + this->attributes["ioDirection"] = s_iosel; // Prepare the wxEventHandler to accept events from the actual hardware thread Bind(wxEVT_COMMDRIVER_N0183_NET, &CommDriverN0183Net::handle_N0183_MSG, this); @@ -342,12 +351,11 @@ void CommDriverN0183Net::OnSocketReadWatchdogTimer(wxTimerEvent& event) { // Reconnect on NO DATA is true, so try to reconnect now. if (GetProtocol() == TCP) { wxSocketClient* tcp_socket = dynamic_cast(GetSock()); - if (tcp_socket) - tcp_socket->Close(); + if (tcp_socket) tcp_socket->Close(); int n_reconnect_delay = wxMax(N_DOG_TIMEOUT - 2, 2); wxLogMessage(wxString::Format(" Reconnection scheduled in %d seconds.", - n_reconnect_delay)); + n_reconnect_delay)); GetSocketTimer()->Start(n_reconnect_delay * 1000, wxTIMER_ONE_SHOT); // Stop DATA watchdog, will be restarted on successful connection. @@ -369,15 +377,13 @@ void CommDriverN0183Net::OnTimerSocket() { tcp_socket->Connect(GetAddr(), FALSE); // schedule another connection attempt, in case this one fails - int n_reconnect_delay = N_DOG_TIMEOUT; - GetSocketTimer()->Start(n_reconnect_delay * 1000, - wxTIMER_ONE_SHOT); + int n_reconnect_delay = N_DOG_TIMEOUT; + GetSocketTimer()->Start(n_reconnect_delay * 1000, wxTIMER_ONE_SHOT); } } } void CommDriverN0183Net::HandleResume() { - // Attempt a stop and restart of connection wxSocketClient* tcp_socket = dynamic_cast(GetSock()); if (tcp_socket) { @@ -386,11 +392,11 @@ void CommDriverN0183Net::HandleResume() { tcp_socket->Close(); // schedule reconnect attempt - int n_reconnect_delay = wxMax(N_DOG_TIMEOUT-2, 2); - wxLogMessage(wxString::Format(" Reconnection scheduled in %d seconds.", n_reconnect_delay)); + int n_reconnect_delay = wxMax(N_DOG_TIMEOUT - 2, 2); + wxLogMessage(wxString::Format(" Reconnection scheduled in %d seconds.", + n_reconnect_delay)); - GetSocketTimer()->Start(n_reconnect_delay * 1000, - wxTIMER_ONE_SHOT); + GetSocketTimer()->Start(n_reconnect_delay * 1000, wxTIMER_ONE_SHOT); } } @@ -552,7 +558,7 @@ void CommDriverN0183Net::OnSocketEvent(wxSocketEvent& event) { m_dog_value = N_DOG_TIMEOUT; // feed the dog if (GetPortType() != DS_TYPE_OUTPUT) { - ///start the DATA watchdog only if NODATA Reconnect is desired + /// start the DATA watchdog only if NODATA Reconnect is desired if (GetParams().NoDataReconnect) GetSocketThreadWatchdogTimer()->Start(1000); } diff --git a/model/src/comm_drv_n0183_serial.cpp b/model/src/comm_drv_n0183_serial.cpp index b33c380b5b..7cde04a174 100644 --- a/model/src/comm_drv_n0183_serial.cpp +++ b/model/src/comm_drv_n0183_serial.cpp @@ -102,9 +102,9 @@ wxDEFINE_EVENT(wxEVT_COMMDRIVER_N0183_SERIAL, CommDriverN0183SerialEvent); CommDriverN0183SerialEvent::CommDriverN0183SerialEvent(wxEventType commandType, int id = 0) - : wxEvent(id, commandType){}; + : wxEvent(id, commandType) {}; -CommDriverN0183SerialEvent::~CommDriverN0183SerialEvent(){}; +CommDriverN0183SerialEvent::~CommDriverN0183SerialEvent() {}; void CommDriverN0183SerialEvent::SetPayload( std::shared_ptr> data) { @@ -222,6 +222,15 @@ CommDriverN0183Serial::CommDriverN0183Serial(const ConnectionParams* params, SetSecThreadInActive(); m_garmin_handler = NULL; this->attributes["commPort"] = params->Port.ToStdString(); + this->attributes["userComment"] = params->UserComment.ToStdString(); + dsPortType iosel = params->IOSelect; + std::string s_iosel = std::string("IN"); + if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "OUT"; + } else if (iosel == DS_TYPE_INPUT_OUTPUT) { + s_iosel = "IN/OUT"; + } + this->attributes["ioDirection"] = s_iosel; // Prepare the wxEventHandler to accept events from the actual hardware thread Bind(wxEVT_COMMDRIVER_N0183_SERIAL, &CommDriverN0183Serial::handle_N0183_MSG, @@ -466,8 +475,9 @@ void CommDriverN0183SerialThread::ThreadMessage(const wxString& msg) { // if (gFrame) gFrame->GetEventHandler()->AddPendingEvent(event); } -ssize_t CommDriverN0183SerialThread::WriteComPortPhysical(const std::string& msg) { - if (!m_serial.isOpen()) return -1; +ssize_t CommDriverN0183SerialThread::WriteComPortPhysical( + const std::string& msg) { + if (!m_serial.isOpen()) return -1; auto ptr = reinterpret_cast(msg.c_str()); size_t written = 0; @@ -614,7 +624,7 @@ void* CommDriverN0183SerialThread::Entry() { b_qdata = !out_que.empty(); } // while b_qdata - } // while not done. + } // while not done. thread_exit: CloseComPortPhysical(); diff --git a/model/src/comm_drv_n2k.cpp b/model/src/comm_drv_n2k.cpp index 7a9073c0cf..5647dc621c 100644 --- a/model/src/comm_drv_n2k.cpp +++ b/model/src/comm_drv_n2k.cpp @@ -34,8 +34,6 @@ #include "model/comm_drv_n2k.h" - - /* commdriverN2K implementation */ CommDriverN2K::CommDriverN2K(const std::string& s) : AbstractCommDriver(NavAddr::Bus::N2000, s) {} @@ -43,10 +41,12 @@ CommDriverN2K::CommDriverN2K(const std::string& s) CommDriverN2K::~CommDriverN2K() {} bool CommDriverN2K::SendMessage(std::shared_ptr msg, - std::shared_ptr addr) {return false;} + std::shared_ptr addr) { + return false; +} -void CommDriverN2K::SetListener(DriverListener& l){}; +void CommDriverN2K::SetListener(DriverListener& l) {}; std::shared_ptr CommDriverN2K::GetAddress(const N2kName& name) { - return std::make_shared(NavAddr2000(iface, name)); + return std::make_shared(NavAddr2000(iface, name)); } diff --git a/model/src/comm_drv_n2k_net.cpp b/model/src/comm_drv_n2k_net.cpp index 6e08374508..15ed0cbbd9 100644 --- a/model/src/comm_drv_n2k_net.cpp +++ b/model/src/comm_drv_n2k_net.cpp @@ -63,7 +63,6 @@ #include #include - #include "model/comm_drv_n2k_net.h" #include "model/comm_navmsg_bus.h" #include "model/idents.h" @@ -73,7 +72,7 @@ static const int kNotFound = -1; -class MrqContainer{ +class MrqContainer { public: struct ip_mreq m_mrq; void SetMrqAddr(unsigned int addr) { @@ -85,56 +84,55 @@ class MrqContainer{ // circular_buffer implementation circular_buffer::circular_buffer(size_t size) - : buf_(std::unique_ptr(new unsigned char[size])), max_size_(size) {} + : buf_(std::unique_ptr(new unsigned char[size])), + max_size_(size) {} -//void circular_buffer::reset() +// void circular_buffer::reset() //{} -//size_t circular_buffer::capacity() const +// size_t circular_buffer::capacity() const //{} -//size_t circular_buffer::size() const +// size_t circular_buffer::size() const //{} bool circular_buffer::empty() const { - // if head and tail are equal, we are empty - return (!full_ && (head_ == tail_)); + // if head and tail are equal, we are empty + return (!full_ && (head_ == tail_)); } bool circular_buffer::full() const { - // If tail is ahead the head by 1, we are full - return full_; + // If tail is ahead the head by 1, we are full + return full_; } void circular_buffer::put(unsigned char item) { - std::lock_guard lock(mutex_); - buf_[head_] = item; - if (full_) tail_ = (tail_ + 1) % max_size_; + std::lock_guard lock(mutex_); + buf_[head_] = item; + if (full_) tail_ = (tail_ + 1) % max_size_; - head_ = (head_ + 1) % max_size_; + head_ = (head_ + 1) % max_size_; - full_ = head_ == tail_; + full_ = head_ == tail_; } unsigned char circular_buffer::get() { - std::lock_guard lock(mutex_); + std::lock_guard lock(mutex_); - if (empty()) return 0; + if (empty()) return 0; - // Read data and advance the tail (we now have a free space) - auto val = buf_[tail_]; - full_ = false; - tail_ = (tail_ + 1) % max_size_; + // Read data and advance the tail (we now have a free space) + auto val = buf_[tail_]; + full_ = false; + tail_ = (tail_ + 1) % max_size_; - return val; + return val; } /// CAN v2.0 29 bit header as used by NMEA 2000 CanHeader::CanHeader() : priority('\0'), source('\0'), destination('\0'), pgn(-1) {}; - - wxDEFINE_EVENT(wxEVT_COMMDRIVER_N2K_NET, CommDriverN2KNetEvent); class CommDriverN2KNetEvent; @@ -143,8 +141,8 @@ wxDECLARE_EVENT(wxEVT_COMMDRIVER_N2K_NET, CommDriverN2KNetEvent); class CommDriverN2KNetEvent : public wxEvent { public: CommDriverN2KNetEvent(wxEventType commandType = wxEVT_NULL, int id = 0) - : wxEvent(id, commandType){}; - ~CommDriverN2KNetEvent(){}; + : wxEvent(id, commandType) {}; + ~CommDriverN2KNetEvent() {}; // accessors void SetPayload(std::shared_ptr> data) { @@ -185,7 +183,7 @@ END_EVENT_TABLE() // CommDriverN0183Net::CommDriverN0183Net() : CommDriverN0183() {} CommDriverN2KNet::CommDriverN2KNet(const ConnectionParams* params, - DriverListener& listener) + DriverListener& listener) : CommDriverN2K(((ConnectionParams*)params)->GetStrippedDSPort()), m_params(*params), m_listener(listener), @@ -209,10 +207,12 @@ CommDriverN2KNet::CommDriverN2KNet(const ConnectionParams* params, m_socketread_watchdog_timer.SetOwner(this, TIMER_SOCKET_N2KNET + 1); this->attributes["netAddress"] = params->NetworkAddress.ToStdString(); char port_char[10]; - sprintf(port_char, "%d",params->NetworkPort); + sprintf(port_char, "%d", params->NetworkPort); this->attributes["netPort"] = std::string(port_char); + this->attributes["userComment"] = params->UserComment.ToStdString(); + this->attributes["ioDirection"] = std::string("IN/OUT"); - // Prepare the wxEventHandler to accept events from the actual hardware thread + // Prepare the wxEventHandler to accept events from the actual hardware thread Bind(wxEVT_COMMDRIVER_N2K_NET, &CommDriverN2KNet::handle_N2K_MSG, this); m_mrq_container = new MrqContainer; @@ -221,13 +221,13 @@ CommDriverN2KNet::CommDriverN2KNet(const ConnectionParams* params, m_bGotESC = false; m_bGotSOT = false; rx_buffer = new unsigned char[RX_BUFFER_SIZE_NET + 1]; - m_circle = new circular_buffer(RX_BUFFER_SIZE_NET); + m_circle = new circular_buffer(RX_BUFFER_SIZE_NET); fast_messages = new FastMessageMap(); - m_order = 0; // initialize the fast message order bits, for TX + m_order = 0; // initialize the fast message order bits, for TX m_n2k_format = N2KFormat_YD_RAW; - // Establish the power events response + // Establish the power events response resume_listener.Init(SystemEvents::GetInstance().evt_resume, [&](ObservedEvt&) { HandleResume(); }); @@ -249,18 +249,20 @@ typedef struct { std::unordered_map prod_info_map; -bool CommDriverN2KNet::HandleMgntMsg(uint64_t pgn, std::vector &payload){ +bool CommDriverN2KNet::HandleMgntMsg(uint64_t pgn, + std::vector& payload) { // Process a few N2K network management messages auto name = PayloadToName(payload); - auto msg = std::make_shared(pgn, payload, GetAddress(name)); + auto msg = + std::make_shared(pgn, payload, GetAddress(name)); bool b_handled = false; - switch(pgn){ + switch (pgn) { case 126996: { // Product information uint8_t src_addr = payload.at(7); - if(src_addr == 75) return false; // skip simulator mgnt messages + if (src_addr == 75) return false; // skip simulator mgnt messages product_info pr_info; - pr_info.Model_ID = std::string((char *) &payload.data()[17], 32); + pr_info.Model_ID = std::string((char*)&payload.data()[17], 32); pr_info.RT_flag = m_TX_flag; prod_info_map[src_addr] = pr_info; @@ -290,11 +292,13 @@ void CommDriverN2KNet::handle_N2K_MSG(CommDriverN2KNetEvent& event) { *c++ = payload->at(4); *c++ = payload->at(5); // memcpy(&v, &data[3], 1); - //printf(" %ld\n", pgn); + // printf(" %ld\n", pgn); auto name = PayloadToName(*payload); - auto msg = std::make_shared(pgn, *payload, GetAddress(name)); - auto msg_all = std::make_shared(1, *payload, GetAddress(name)); + auto msg = + std::make_shared(pgn, *payload, GetAddress(name)); + auto msg_all = + std::make_shared(1, *payload, GetAddress(name)); m_listener.Notify(std::move(msg)); m_listener.Notify(std::move(msg_all)); @@ -347,7 +351,8 @@ void CommDriverN2KNet::OpenNetworkUDP(unsigned int addr) { if ((ntohl(addr) & 0xf0000000) == 0xe0000000) { SetMulticast(true); m_mrq_container->SetMrqAddr(addr); - GetSock()->SetOption(IPPROTO_IP, IP_ADD_MEMBERSHIP, &m_mrq_container->m_mrq, + GetSock()->SetOption(IPPROTO_IP, IP_ADD_MEMBERSHIP, + &m_mrq_container->m_mrq, sizeof(m_mrq_container->m_mrq)); } @@ -413,7 +418,6 @@ void CommDriverN2KNet::OpenNetworkTCP(unsigned int addr) { SetConnectTime(wxDateTime::Now()); } - void CommDriverN2KNet::OnSocketReadWatchdogTimer(wxTimerEvent& event) { m_dog_value--; @@ -422,8 +426,7 @@ void CommDriverN2KNet::OnSocketReadWatchdogTimer(wxTimerEvent& event) { // Reconnect on NO DATA is true, so try to reconnect now. if (GetProtocol() == TCP) { wxSocketClient* tcp_socket = dynamic_cast(GetSock()); - if (tcp_socket) - tcp_socket->Close(); + if (tcp_socket) tcp_socket->Close(); int n_reconnect_delay = wxMax(N_DOG_TIMEOUT - 2, 2); wxLogMessage(wxString::Format(" Reconnection scheduled in %d seconds.", @@ -449,16 +452,13 @@ void CommDriverN2KNet::OnTimerSocket() { tcp_socket->Connect(GetAddr(), FALSE); // schedule another connection attempt, in case this one fails - int n_reconnect_delay = N_DOG_TIMEOUT; - GetSocketTimer()->Start(n_reconnect_delay * 1000, - wxTIMER_ONE_SHOT); + int n_reconnect_delay = N_DOG_TIMEOUT; + GetSocketTimer()->Start(n_reconnect_delay * 1000, wxTIMER_ONE_SHOT); } } } - void CommDriverN2KNet::HandleResume() { - // Attempt a stop and restart of connection wxSocketClient* tcp_socket = dynamic_cast(GetSock()); if (tcp_socket) { @@ -467,24 +467,23 @@ void CommDriverN2KNet::HandleResume() { tcp_socket->Close(); // schedule reconnect attempt - int n_reconnect_delay = wxMax(N_DOG_TIMEOUT-2, 2); - wxLogMessage(wxString::Format(" Reconnection scheduled in %d seconds.", n_reconnect_delay)); + int n_reconnect_delay = wxMax(N_DOG_TIMEOUT - 2, 2); + wxLogMessage(wxString::Format(" Reconnection scheduled in %d seconds.", + n_reconnect_delay)); - GetSocketTimer()->Start(n_reconnect_delay * 1000, - wxTIMER_ONE_SHOT); + GetSocketTimer()->Start(n_reconnect_delay * 1000, wxTIMER_ONE_SHOT); } } bool CommDriverN2KNet::SendMessage(std::shared_ptr msg, - std::shared_ptr addr) { + std::shared_ptr addr) { auto msg_n2k = std::dynamic_pointer_cast(msg); auto dest_addr_n2k = std::static_pointer_cast(addr); return SendN2KNetwork(msg_n2k, dest_addr_n2k); } -std::vector CommDriverN2KNet::PushCompleteMsg(const CanHeader header, - int position, - const can_frame frame) { +std::vector CommDriverN2KNet::PushCompleteMsg( + const CanHeader header, int position, const can_frame frame) { std::vector data; data.push_back(0x93); data.push_back(0x13); @@ -504,8 +503,8 @@ std::vector CommDriverN2KNet::PushCompleteMsg(const CanHeader hea return data; } -std::vector CommDriverN2KNet::PushFastMsgFragment(const CanHeader& header, - int position) { +std::vector CommDriverN2KNet::PushFastMsgFragment( + const CanHeader& header, int position) { std::vector data; data.push_back(0x93); data.push_back(fast_messages->entries[position].expected_length + 11); @@ -550,8 +549,7 @@ void CommDriverN2KNet::HandleCanFrameInput(can_frame frame) { if ((frame.data[0] & 0x1F) == 0) { position = fast_messages->AddNewEntry(); ready = fast_messages->InsertEntry(header, frame.data, position); - } - else + } else ready = false; } else { // An existing fast message entry is present, append the frame @@ -569,16 +567,13 @@ void CommDriverN2KNet::HandleCanFrameInput(can_frame frame) { } // Intercept network management messages not used by OCPN navigation core. - if (HandleMgntMsg( header.pgn, vec)) - return; - + if (HandleMgntMsg(header.pgn, vec)) return; // Message is ready CommDriverN2KNetEvent Nevent(wxEVT_COMMDRIVER_N2K_NET, 0); - auto payload = std::make_shared >(vec); + auto payload = std::make_shared>(vec); Nevent.SetPayload(payload); AddPendingEvent(Nevent); - } } @@ -590,7 +585,6 @@ bool isASCII(std::vector packet) { } N2K_Format CommDriverN2KNet::DetectFormat(std::vector packet) { - // A simplistic attempt at identifying which of the various available // on-wire (or air) formats being emitted by a configured // Actisense N2k<->ethernet device. @@ -599,17 +593,17 @@ N2K_Format CommDriverN2KNet::DetectFormat(std::vector packet) { std::string payload = std::string(packet.begin(), packet.end()); if (payload.find("$PCDIN") != std::string::npos) { return N2KFormat_SeaSmart; - } else if (payload.find("$MXPGN") != std::string::npos) { - // TODO: Due to the weird fragmentation observed with default settings of the wi-fi part, - // the payload does not always start with or even contain `$MXPGN`. We now lose the later. + } else if (payload.find("$MXPGN") != std::string::npos) { + // TODO: Due to the weird fragmentation observed with default settings of + // the wi-fi part, the payload does not always start with or even contain + // `$MXPGN`. We now lose the later. return N2KFormat_MiniPlex; } else if (std::find(packet.begin(), packet.end(), ':') != packet.end()) { return N2KFormat_Actisense_RAW_ASCII; } else { return N2KFormat_Actisense_N2K_ASCII; } - } - else { + } else { if (packet[2] == 0x95) return N2KFormat_Actisense_RAW; else if (packet[2] == 0xd0) @@ -621,8 +615,7 @@ N2K_Format CommDriverN2KNet::DetectFormat(std::vector packet) { } bool CommDriverN2KNet::ProcessActisense_N2K(std::vector packet) { - - //1002 d0 1500ff0401f80900684c1b00a074eb14f89052d288 1003 + // 1002 d0 1500ff0401f80900684c1b00a074eb14f89052d288 1003 std::vector data; bool bInMsg = false; @@ -634,21 +627,24 @@ bool CommDriverN2KNet::ProcessActisense_N2K(std::vector packet) { if (bInMsg) { if (bGotESC) { - if ( next_byte == ESCAPE ) { + if (next_byte == ESCAPE) { data.push_back(next_byte); bGotESC = false; - } else if ( next_byte == ENDOFTEXT ) { + } else if (next_byte == ENDOFTEXT) { // Process packet - // first 3 bytes are: 1 byte for message type, 2 bytes for rest of message length - unsigned int msg_length = (uint32_t)data[1] + ((uint32_t)data[2]<<8); + // first 3 bytes are: 1 byte for message type, 2 bytes for rest of + // message length + unsigned int msg_length = + (uint32_t)data[1] + ((uint32_t)data[2] << 8); // As a sanity check, verify message length - if (msg_length == data.size()-1) { + if (msg_length == data.size() - 1) { uint8_t destination = data[3]; uint8_t source = data[4]; uint8_t dprp = data[7]; - uint8_t priority = (dprp >> 2) & 7; // priority bits are 3,4,5th bit + uint8_t priority = + (dprp >> 2) & 7; // priority bits are 3,4,5th bit uint8_t rAndDP = dprp & 3; // data page + reserved is first 2 bits // PGN @@ -682,7 +678,8 @@ bool CommDriverN2KNet::ProcessActisense_N2K(std::vector packet) { // Message is ready CommDriverN2KNetEvent Nevent(wxEVT_COMMDRIVER_N2K_NET, 0); - auto n2k_payload = std::make_shared>(o_payload); + auto n2k_payload = + std::make_shared>(o_payload); Nevent.SetPayload(n2k_payload); AddPendingEvent(Nevent); } @@ -726,87 +723,86 @@ bool CommDriverN2KNet::ProcessActisense_N2K(std::vector packet) { } } // while - return true; + return true; } bool CommDriverN2KNet::ProcessActisense_RAW(std::vector packet) { - //1002 95 0e15870402f8094b fc e6 20 00 00 ff ff 6f 1003 + // 1002 95 0e15870402f8094b fc e6 20 00 00 ff ff 6f 1003 - can_frame frame; - - std::vector data; - bool bInMsg = false; - bool bGotESC = false; - bool bGotSOT = false; + can_frame frame; - while (!m_circle->empty()) { - uint8_t next_byte = m_circle->get(); + std::vector data; + bool bInMsg = false; + bool bGotESC = false; + bool bGotSOT = false; - if (bInMsg) { - if (bGotESC) { - if ( next_byte == ESCAPE ) { - data.push_back(next_byte); - bGotESC = false; - } else if ( next_byte == ENDOFTEXT ) { - // Process packet - // Create a can_frame, to assemble fast packets. + while (!m_circle->empty()) { + uint8_t next_byte = m_circle->get(); - // As a sanity check, verify message length - if (data.size() >= 8) { - size_t dLen = data[1]; + if (bInMsg) { + if (bGotESC) { + if (next_byte == ESCAPE) { + data.push_back(next_byte); + bGotESC = false; + } else if (next_byte == ENDOFTEXT) { + // Process packet + // Create a can_frame, to assemble fast packets. - if (dLen+3 == data.size()) { + // As a sanity check, verify message length + if (data.size() >= 8) { + size_t dLen = data[1]; - // can_id - memcpy(&frame.can_id, &data.data()[4], 4); + if (dLen + 3 == data.size()) { + // can_id + memcpy(&frame.can_id, &data.data()[4], 4); - // data - memcpy(&frame.data, &data.data()[8], 8); + // data + memcpy(&frame.data, &data.data()[8], 8); - HandleCanFrameInput(frame); + HandleCanFrameInput(frame); - // reset for next packet - bInMsg = false; - bGotESC = false; - data.clear(); - } + // reset for next packet + bInMsg = false; + bGotESC = false; + data.clear(); } - } else if (next_byte == STARTOFTEXT) { - bGotESC = false; - data.clear(); - } else { - data.clear(); - bInMsg = false; - bGotESC = false; } + } else if (next_byte == STARTOFTEXT) { + bGotESC = false; + data.clear(); } else { - bGotESC = (next_byte == ESCAPE); + data.clear(); + bInMsg = false; + bGotESC = false; + } + } else { + bGotESC = (next_byte == ESCAPE); - if (!bGotESC) { - data.push_back(next_byte); - } + if (!bGotESC) { + data.push_back(next_byte); } } + } - else { - if (STARTOFTEXT == next_byte) { + else { + if (STARTOFTEXT == next_byte) { + bGotSOT = false; + if (bGotESC) { + bGotSOT = true; + } + } else { + bGotESC = (next_byte == ESCAPE); + if (bGotSOT) { bGotSOT = false; - if (bGotESC) { - bGotSOT = true; - } - } else { - bGotESC = (next_byte == ESCAPE); - if (bGotSOT) { - bGotSOT = false; - bInMsg = true; + bInMsg = true; - data.push_back(next_byte); - } + data.push_back(next_byte); } } - } // while + } + } // while - return true; + return true; } bool CommDriverN2KNet::ProcessActisense_NGT(std::vector packet) { @@ -820,10 +816,10 @@ bool CommDriverN2KNet::ProcessActisense_NGT(std::vector packet) { if (bInMsg) { if (bGotESC) { - if ( next_byte == ESCAPE ) { + if (next_byte == ESCAPE) { data.push_back(next_byte); bGotESC = false; - } else if ( next_byte == ENDOFTEXT ) { + } else if (next_byte == ENDOFTEXT) { // Process packet CommDriverN2KNetEvent Nevent(wxEVT_COMMDRIVER_N2K_NET, 0); auto n2k_payload = std::make_shared>(data); @@ -872,7 +868,8 @@ bool CommDriverN2KNet::ProcessActisense_NGT(std::vector packet) { return true; } -bool CommDriverN2KNet::ProcessActisense_ASCII_RAW(std::vector packet) { +bool CommDriverN2KNet::ProcessActisense_ASCII_RAW( + std::vector packet) { can_frame frame; while (!m_circle->empty()) { @@ -883,7 +880,7 @@ bool CommDriverN2KNet::ProcessActisense_ASCII_RAW(std::vector pac if (b == 0x0a) { // end of sentence // Extract a can_frame from ASCII stream - //printf("%s\n", m_sentence.c_str()); + // printf("%s\n", m_sentence.c_str()); wxString ss(m_sentence.c_str()); m_sentence.clear(); @@ -892,7 +889,7 @@ bool CommDriverN2KNet::ProcessActisense_ASCII_RAW(std::vector pac // Discard first token wxString token = tkz.GetNextToken(); // time stamp - token = tkz.GetNextToken(); // R/T + token = tkz.GetNextToken(); // R/T // Record the R/T flag, for use in device detect logic m_TX_flag = token[0]; @@ -920,7 +917,8 @@ bool CommDriverN2KNet::ProcessActisense_ASCII_RAW(std::vector pac return true; } -bool CommDriverN2KNet::ProcessActisense_ASCII_N2K(std::vector packet) { +bool CommDriverN2KNet::ProcessActisense_ASCII_N2K( + std::vector packet) { // A001001.732 04FF6 1FA03 C8FBA80329026400 std::string sentence; @@ -932,7 +930,7 @@ bool CommDriverN2KNet::ProcessActisense_ASCII_N2K(std::vector pac if (b == 0x0a) { // end of sentence // Extract items - //printf("%s", sentence.c_str()); + // printf("%s", sentence.c_str()); wxString ss(sentence.c_str()); wxStringTokenizer tkz(ss, " "); @@ -948,12 +946,11 @@ bool CommDriverN2KNet::ProcessActisense_ASCII_N2K(std::vector pac uint8_t destination = (uint8_t)(prio_addr >> 4) & 0X0FF; uint8_t source = (uint8_t)(prio_addr >> 12) & 0X0FF; - // PGN wxString sPGN = tkz.GetNextToken(); unsigned long PGN; sPGN.ToULong(&PGN, 16); - //printf(" PGN: %ld\n", PGN); + // printf(" PGN: %ld\n", PGN); // data field wxString sdata = tkz.GetNextToken(); @@ -969,22 +966,21 @@ bool CommDriverN2KNet::ProcessActisense_ASCII_N2K(std::vector pac std::vector o_payload; o_payload.push_back(0x93); o_payload.push_back(0x13); - o_payload.push_back(priority); //priority; + o_payload.push_back(priority); // priority; o_payload.push_back(PGN & 0xFF); o_payload.push_back((PGN >> 8) & 0xFF); o_payload.push_back((PGN >> 16) & 0xFF); - o_payload.push_back(destination); //destination; - o_payload.push_back(source); // header.source); + o_payload.push_back(destination); // destination; + o_payload.push_back(source); // header.source); o_payload.push_back(0xFF); // FIXME (dave) generate the time fields o_payload.push_back(0xFF); o_payload.push_back(0xFF); o_payload.push_back(0xFF); o_payload.push_back(data.size()); for (size_t n = 0; n < data.size(); n++) o_payload.push_back(data[n]); - o_payload.push_back(0x55); // CRC dummy, not checked + o_payload.push_back(0x55); // CRC dummy, not checked - if (HandleMgntMsg(PGN, o_payload)) - return false; + if (HandleMgntMsg(PGN, o_payload)) return false; // Message is ready CommDriverN2KNetEvent Nevent(wxEVT_COMMDRIVER_N2K_NET, 0); @@ -1005,7 +1001,7 @@ bool CommDriverN2KNet::ProcessSeaSmart(std::vector packet) { if (b == 0x0a) { // end of sentence // Extract a can_frame from ASCII stream - //printf("%s\n", m_sentence.c_str()); + // printf("%s\n", m_sentence.c_str()); wxString ss(m_sentence.c_str()); m_sentence.clear(); @@ -1015,19 +1011,19 @@ bool CommDriverN2KNet::ProcessSeaSmart(std::vector packet) { wxString token = tkz.GetNextToken(); // $PCDIN m_TX_flag = 'R'; - token = tkz.GetNextToken(); // PGN + token = tkz.GetNextToken(); // PGN unsigned long PGN; token.ToULong(&PGN, 16); - token = tkz.GetNextToken(); // Timestamp + token = tkz.GetNextToken(); // Timestamp unsigned long timestamp; token.ToULong(×tamp, 16); - token = tkz.GetNextToken(); // Source ID + token = tkz.GetNextToken(); // Source ID unsigned long source; token.ToULong(&source, 16); - token = tkz.GetNextToken(); // Payload + "*CRC_byte" + token = tkz.GetNextToken(); // Payload + "*CRC_byte" wxStringTokenizer datatkz(token, "*"); wxString data = datatkz.GetNextToken(); @@ -1036,27 +1032,26 @@ bool CommDriverN2KNet::ProcessSeaSmart(std::vector packet) { std::vector o_payload; o_payload.push_back(0x93); o_payload.push_back(0x13); - o_payload.push_back(3); //priority hardcoded, missing in SeaSmart + o_payload.push_back(3); // priority hardcoded, missing in SeaSmart o_payload.push_back(PGN & 0xFF); o_payload.push_back((PGN >> 8) & 0xFF); o_payload.push_back((PGN >> 16) & 0xFF); - o_payload.push_back(0xFF); //destination hardcoded, missing in SeaSmart - o_payload.push_back((uint8_t)source); // header.source); + o_payload.push_back(0xFF); // destination hardcoded, missing in SeaSmart + o_payload.push_back((uint8_t)source); // header.source); o_payload.push_back(timestamp & 0xFF); o_payload.push_back((timestamp >> 8) & 0xFF); o_payload.push_back((timestamp >> 16) & 0xFF); o_payload.push_back((timestamp >> 24) & 0xFF); - o_payload.push_back((uint8_t)data.Length()/2); + o_payload.push_back((uint8_t)data.Length() / 2); for (size_t i = 0; i < data.Length(); i += 2) { unsigned long dv; wxString sbyte = data.Mid(i, 2); sbyte.ToULong(&dv, 16); o_payload.push_back((uint8_t)dv); } - o_payload.push_back(0x55); // CRC dummy, not checked + o_payload.push_back(0x55); // CRC dummy, not checked - if (HandleMgntMsg(PGN, o_payload)) - return false; + if (HandleMgntMsg(PGN, o_payload)) return false; // Message is ready CommDriverN2KNetEvent Nevent(wxEVT_COMMDRIVER_N2K_NET, 0); @@ -1071,16 +1066,18 @@ bool CommDriverN2KNet::ProcessSeaSmart(std::vector packet) { bool CommDriverN2KNet::ProcessMiniPlex(std::vector packet) { /* $MXPGN – NMEA 2000 PGN Data - This sentence transports NMEA 2000/CAN frames in NMEA 0183 format. The MiniPlex-3 will transmit this - sentence with Talker ID “MX”. When sent to the MiniPlex-3, the Talker ID is ignored unless a routing entry - exists for this sentence. + This sentence transports NMEA 2000/CAN frames in NMEA 0183 format. The + MiniPlex-3 will transmit this sentence with Talker ID “MX”. When sent to the + MiniPlex-3, the Talker ID is ignored unless a routing entry exists for this + sentence. Format: $--PGN,pppppp,aaaa,c--c*hh - pppppp: PGN of the NMEA 2000/CAN frame, 3-byte hexadecimal number. If the PGN is non-global, the - lowest byte contains the destination address. - aaaa: Attribute Word, a 16-bit hexadecimal number. This word contains the priority, the DLC code and - then source/destination address of the frame, formatted as shown below: + pppppp: PGN of the NMEA 2000/CAN frame, 3-byte hexadecimal number. If the PGN + is non-global, the lowest byte contains the destination address. aaaa: + Attribute Word, a 16-bit hexadecimal number. This word contains the priority, + the DLC code and then source/destination address of the frame, formatted as + shown below: 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 ---------------------------------------------------------------- @@ -1089,29 +1086,30 @@ bool CommDriverN2KNet::ProcessMiniPlex(std::vector packet) { S: Send bit. When an NMEA 2000/CAN frame is received, this bit is 0. To use the $MXPGN sentence to send an NMEA 2000/CAN frame, this bit must be 1. - Priority: Frame priority. A value between 0 and 7, a lower value means higher priority. - DLC: Data Length Code field, contains the size of the frame in bytes (1..8) or a Class 2 - Transmission ID (9..15). - Address: Depending on the Send bit, this field contains the Source Address (S=0) or the - Destination Address (S=1) of the frame. - c--c: Data field of the NMEA 2000/CAN frame, organised as one large number in hexadecimal - notation from MSB to LSB. This is in accordance with “NMEA 2000 Appendix D”, chapter D.1, - “Data Placement within the CAN Frame”. - The size of this field depends on the DLC value and can be 1 to 8 bytes (2 to 16 hexadecimal - characters). + Priority: Frame priority. A value between 0 and 7, a lower value means higher + priority. DLC: Data Length Code field, contains the size of the frame in bytes + (1..8) or a Class 2 Transmission ID (9..15). Address: Depending on the Send + bit, this field contains the Source Address (S=0) or the Destination Address + (S=1) of the frame. c--c: Data field of the NMEA 2000/CAN frame, organised as + one large number in hexadecimal notation from MSB to LSB. This is in + accordance with “NMEA 2000 Appendix D”, chapter D.1, “Data Placement within + the CAN Frame”. The size of this field depends on the DLC value and can be 1 + to 8 bytes (2 to 16 hexadecimal characters). NMEA 2000 Reception - When the MiniPlex-3 converts an NMEA 2000/CAN frame into an $MXPGN sentence, the S bit in the - Attribute field will be 0 and the Address field contains the source address of the frame. The destination - address of the frame is either global or contained in the lower byte of the PGN, in accordance with the - NMEA 2000/ISO specification. + When the MiniPlex-3 converts an NMEA 2000/CAN frame into an $MXPGN sentence, + the S bit in the Attribute field will be 0 and the Address field contains the + source address of the frame. The destination address of the frame is either + global or contained in the lower byte of the PGN, in accordance with the NMEA + 2000/ISO specification. Notes: - + Multiple messages can be delivered in a single packet - It is not guaranteed that the whole message will be delivered in a single packet, actually it is common - that the last message is split "anywhere" and continues in the next packet. + It is not guaranteed that the whole message will be delivered in a single + packet, actually it is common that the last message is split "anywhere" and + continues in the next packet. packet 1 payload @@ -1168,7 +1166,7 @@ bool CommDriverN2KNet::ProcessMiniPlex(std::vector packet) { if (b == 0x0a) { // end of sentence // Extract a can_frame from ASCII stream - //printf("%s\n", m_sentence.c_str()); + // printf("%s\n", m_sentence.c_str()); wxString ss(m_sentence.c_str()); m_sentence.clear(); @@ -1178,11 +1176,11 @@ bool CommDriverN2KNet::ProcessMiniPlex(std::vector packet) { wxString token = tkz.GetNextToken(); // $MXPGN m_TX_flag = 'R'; - token = tkz.GetNextToken(); // PGN + token = tkz.GetNextToken(); // PGN unsigned long PGN; token.ToULong(&PGN, 16); - token = tkz.GetNextToken(); // Attribute compound field + token = tkz.GetNextToken(); // Attribute compound field unsigned long attr; token.ToULong(&attr, 16); // Send Bit @@ -1193,15 +1191,16 @@ bool CommDriverN2KNet::ProcessMiniPlex(std::vector packet) { // dlc uint8_t dlc = (attr >> 8) & 0x0F; - //address + // address uint8_t address = attr & 0xFF; - token = tkz.GetNextToken(); // Payload + "*CRC_byte" + token = tkz.GetNextToken(); // Payload + "*CRC_byte" wxStringTokenizer datatkz(token, "*"); wxString data = datatkz.GetNextToken(); - if (data.Length() > 16) { // Payload can never exceed 8 bytes (=16 HEX characters) + if (data.Length() > + 16) { // Payload can never exceed 8 bytes (=16 HEX characters) return false; } @@ -1211,7 +1210,7 @@ bool CommDriverN2KNet::ProcessMiniPlex(std::vector packet) { unsigned long dv; wxString sbyte = data.Mid(data.Length() - i - 2, 2); sbyte.ToULong(&dv, 16); - frame.data[i/2] = ((uint8_t)dv); + frame.data[i / 2] = ((uint8_t)dv); } frame.can_id = (uint32_t)BuildCanID(priority, address, 0xFF, PGN); HandleCanFrameInput(frame); @@ -1221,9 +1220,8 @@ bool CommDriverN2KNet::ProcessMiniPlex(std::vector packet) { } void CommDriverN2KNet::OnSocketEvent(wxSocketEvent& event) { -#define RD_BUF_SIZE \ - 4096 - //can_frame frame; +#define RD_BUF_SIZE 4096 + // can_frame frame; switch (event.GetSocketEvent()) { case wxSOCKET_INPUT: { @@ -1261,7 +1259,7 @@ void CommDriverN2KNet::OnSocketEvent(wxSocketEvent& event) { if (newdata > 0) { for (int i = 0; i < newdata; i++) { m_circle->put(data[i]); - //printf("%c", data.at(i)); + // printf("%c", data.at(i)); } } @@ -1271,7 +1269,7 @@ void CommDriverN2KNet::OnSocketEvent(wxSocketEvent& event) { case N2KFormat_Actisense_RAW_ASCII: ProcessActisense_ASCII_RAW(data); break; - case N2KFormat_YD_RAW: // RX Byte compatible with Actisense ASCII RAW + case N2KFormat_YD_RAW: // RX Byte compatible with Actisense ASCII RAW ProcessActisense_ASCII_RAW(data); break; case N2KFormat_Actisense_N2K_ASCII: @@ -1296,8 +1294,8 @@ void CommDriverN2KNet::OnSocketEvent(wxSocketEvent& event) { default: break; } - // Check for any pending output message - } // case + // Check for any pending output message + } // case m_dog_value = N_DOG_TIMEOUT; // feed the dog break; @@ -1347,7 +1345,7 @@ void CommDriverN2KNet::OnSocketEvent(wxSocketEvent& event) { GetPort().c_str())); m_dog_value = N_DOG_TIMEOUT; // feed the dog if (GetPortType() != DS_TYPE_OUTPUT) { - ///start the DATA watchdog only if NODATA Reconnect is desired + /// start the DATA watchdog only if NODATA Reconnect is desired if (GetParams().NoDataReconnect) GetSocketThreadWatchdogTimer()->Start(1000); } @@ -1510,7 +1508,8 @@ std::vector MakeSimpleOutMsg( // term out_vec.push_back(0x0d); out_vec.push_back(0x0a); - //DBG: std::cout << std::string(out_vec.begin(), out_vec.end()) << std::endl << std::flush; + // DBG: std::cout << std::string(out_vec.begin(), out_vec.end()) << + // std::endl << std::flush; break; } default: @@ -1519,12 +1518,13 @@ std::vector MakeSimpleOutMsg( return out_vec; } -std::vector> CommDriverN2KNet::GetTxVector(const std::shared_ptr &msg, - std::shared_ptr dest_addr) { +std::vector> CommDriverN2KNet::GetTxVector( + const std::shared_ptr& msg, + std::shared_ptr dest_addr) { std::vector> tx_vector; // Branch based on detected network data format currently in use - switch(m_n2k_format) { + switch (m_n2k_format) { case N2KFormat_YD_RAW: break; case N2KFormat_Actisense_RAW_ASCII: { @@ -1568,7 +1568,7 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: (payload_size > 6 ? (payload_size - 6 - 1) / 7 + 1 + 1 : 1); bool result = true; for (int i = 0; i < nframes && result; i++) { - temp[0] = i | m_order; //frame counter + temp[0] = i | m_order; // frame counter if (i == 0) { temp[1] = msg->payload.size(); // total bytes in fast packet // send the first 6 bytes @@ -1601,21 +1601,21 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: ssdata += tb; } for (unsigned char s : ssdata) out_vec.push_back(s); - out_vec.pop_back(); // drop the last space character + out_vec.pop_back(); // drop the last space character out_vec.push_back(0x0d); // terminate the string out_vec.push_back(0x0a); - //for (char s :out_vec) - //printf( "%c", s); + // for (char s :out_vec) + // printf( "%c", s); tx_vector.push_back(out_vec); } // for loop } - } - break; + } break; case N2KFormat_Actisense_N2K_ASCII: { - // Source: Actisense own documentation `NMEA 2000 ASCII Output format.docx` + // Source: Actisense own documentation `NMEA 2000 ASCII Output + // format.docx` // // Ahhmmss.ddd

b0b1b2b3b4b5b6b7.....bn // A = message is N2K or J1939 message @@ -1624,7 +1624,8 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: //

- destination address //

- priority // - PGN number - // b0b1b2b3b4b5b6b7.....bn - data payload in hex. NB: ISO TP payload could be up to 1786 bytes + // b0b1b2b3b4b5b6b7.....bn - data payload in hex. NB: ISO TP payload could + // be up to 1786 bytes // // Example: `A173321.107 23FF7 1F513 012F3070002F30709F\n` // 1 2 3 4 @@ -1641,10 +1642,10 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: // src/dest/prio field wxString sdp; - sdp.Printf( "%02X%02X%1X ", - 1, // source - (unsigned char)dest_addr->address, - (unsigned char)msg->priority); + sdp.Printf("%02X%02X%1X ", + 1, // source + (unsigned char)dest_addr->address, + (unsigned char)msg->priority); std::string ssdp = sdp.ToStdString(); for (unsigned char s : ssdp) ovec.push_back(s); @@ -1657,7 +1658,7 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: // Data payload std::string sspl; char tv[3]; - for (unsigned char d : msg->payload){ + for (unsigned char d : msg->payload) { snprintf(tv, 3, "%02X", d); sspl += tv; } @@ -1667,7 +1668,7 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: ovec.push_back(0x0d); ovec.push_back(0x0a); - //form the result + // form the result tx_vector.push_back(ovec); break; @@ -1678,7 +1679,9 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: // Single packet } else { size_t cur = 0; - size_t nframes = (msg->payload.size() > 6 ? (msg->payload.size() - 6 - 1) / 7 + 1 + 1 : 1); + size_t nframes = + (msg->payload.size() > 6 ? (msg->payload.size() - 6 - 1) / 7 + 1 + 1 + : 1); for (size_t i = 0; i < nframes; i++) { ovec.push_back('$'); ovec.push_back('M'); @@ -1703,7 +1706,7 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: attr |= ((uint16_t)((uint8_t)msg->priority & 0x07)) << 12; attr |= ((uint16_t)len) << 8; attr |= (uint16_t)dest_addr->address; - attr |= 0x8000; // S bit set to 1 + attr |= 0x8000; // S bit set to 1 wxString sattr; sattr.Printf("%04X,", attr); @@ -1724,12 +1727,12 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: ovec.push_back(tv[0]); ovec.push_back(tv[1]); } - if (i == 0) { // First frame contains the total payload length + if (i == 0) { // First frame contains the total payload length snprintf(tv, 3, "%02X", (uint8_t)msg->payload.size()); ovec.push_back(tv[0]); ovec.push_back(tv[1]); } - //frame counter + // frame counter snprintf(tv, 3, "%02X", (uint8_t)i | m_order); ovec.push_back(tv[0]); ovec.push_back(tv[1]); @@ -1748,14 +1751,15 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: ovec.push_back(0x0d); ovec.push_back(0x0a); - //DBG: std::cout << std::string(ovec.begin(), ovec.end()) << std::endl << std::flush; + // DBG: std::cout << std::string(ovec.begin(), ovec.end()) << + // std::endl << std::flush; - //form the result + // form the result tx_vector.push_back(ovec); ovec.clear(); } m_order += 16; - break; + break; } } case N2KFormat_Actisense_N2K: @@ -1770,21 +1774,20 @@ std::vector> CommDriverN2KNet::GetTxVector(const std: break; } - m_order += 16; // update the fast message order bits + m_order += 16; // update the fast message order bits return tx_vector; } bool CommDriverN2KNet::PrepareForTX() { + // We need to determine several items before TX operations can commence. + // 1. Is the gateway configured at my ip present, and if so, which of + // the two supported gateways is it? (YDEN-type, or Actisense-type. + // 2. If Actisense type, we need to infer the N2K source address it has + // claimed, so that we can use that address for our TX operations. - // We need to determine several items before TX operations can commence. - // 1. Is the gateway configured at my ip present, and if so, which of - // the two supported gateways is it? (YDEN-type, or Actisense-type. - // 2. If Actisense type, we need to infer the N2K source address it has - // claimed, so that we can use that address for our TX operations. - - // BASIC ASSUMPTION: There is (or has been) enough network traffic to - // allow occurate determination of data format currently in use + // BASIC ASSUMPTION: There is (or has been) enough network traffic to + // allow occurate determination of data format currently in use bool b_found = false; @@ -1793,23 +1796,19 @@ bool CommDriverN2KNet::PrepareForTX() { // then we are clearly connected to an actisense device. // Nothing else need be done. - if (m_n2k_format == N2KFormat_Actisense_N2K_ASCII) - return true; + if (m_n2k_format == N2KFormat_Actisense_N2K_ASCII) return true; // Step 1.2 // If the detected data format is N2KFormat_MiniPlex, // then we are clearly connected to a MiniPlex. // Nothing else need be done. - if (m_n2k_format == N2KFormat_MiniPlex) - return true; - + if (m_n2k_format == N2KFormat_MiniPlex) return true; // Step 1.2 // If the detected data format is N2KFormat_SeaSmart, // then we can't transmit. - if (m_n2k_format == N2KFormat_SeaSmart) - return false; + if (m_n2k_format == N2KFormat_SeaSmart) return false; // Step 2 @@ -1826,7 +1825,8 @@ bool CommDriverN2KNet::PrepareForTX() { payload.push_back(0x01); std::vector> out_data; - std::vector msg_vec = MakeSimpleOutMsg( N2KFormat_YD_RAW, 59904, payload); + std::vector msg_vec = + MakeSimpleOutMsg(N2KFormat_YD_RAW, 59904, payload); out_data.push_back(msg_vec); SendSentenceNetwork(out_data); @@ -1835,30 +1835,25 @@ bool CommDriverN2KNet::PrepareForTX() { wxYield(); // Check the results of the PGN 126996 capture - for (const auto& [key, value] : prod_info_map){ + for (const auto& [key, value] : prod_info_map) { auto prod_info = value; if (prod_info.Model_ID.find("YDEN") != std::string::npos) { // Found a YDEN device // If this configured port is actually connector to YDEN, // then the device will have marked the received TCP packet // with "T" indicator. Check it. - if (prod_info.RT_flag == 'T') - b_found = true; + if (prod_info.RT_flag == 'T') b_found = true; break; } } - if( b_found) - return true; + if (b_found) return true; // No acceptable TX device found return false; } - - - -bool CommDriverN2KNet::SendN2KNetwork(std::shared_ptr &msg, +bool CommDriverN2KNet::SendN2KNetwork(std::shared_ptr& msg, std::shared_ptr addr) { PrepareForTX(); @@ -1867,8 +1862,8 @@ bool CommDriverN2KNet::SendN2KNetwork(std::shared_ptr &msg, return true; }; - -bool CommDriverN2KNet::SendSentenceNetwork(std::vector> payload) { +bool CommDriverN2KNet::SendSentenceNetwork( + std::vector> payload) { if (m_txenter) return false; // do not allow recursion, could happen with non-blocking // sockets @@ -1878,9 +1873,9 @@ bool CommDriverN2KNet::SendSentenceNetwork(std::vector &v : payload ) { + for (std::vector& v : payload) { if (GetSock() && GetSock()->IsOk()) { - //printf("---%s", v.data()); + // printf("---%s", v.data()); GetSock()->Write(v.data(), v.size()); if (GetSock()->Error()) { if (GetSockServer()) { diff --git a/model/src/comm_drv_n2k_serial.cpp b/model/src/comm_drv_n2k_serial.cpp index d594712b0b..9993d13e21 100644 --- a/model/src/comm_drv_n2k_serial.cpp +++ b/model/src/comm_drv_n2k_serial.cpp @@ -42,7 +42,7 @@ #include "model/logger.h" #include -std::vector BufferToActisenseFormat( tN2kMsg &msg); +std::vector BufferToActisenseFormat(tN2kMsg& msg); template class n2k_atomic_queue { @@ -129,7 +129,6 @@ class circular_buffer { bool full_ = 0; }; - class CommDriverN2KSerialEvent; // fwd class CommDriverN2KSerialThread : public wxThread { @@ -140,7 +139,7 @@ class CommDriverN2KSerialThread : public wxThread { ~CommDriverN2KSerialThread(void); void* Entry(); - bool SetOutMsg(const std::vector &load); + bool SetOutMsg(const std::vector& load); void OnExit(void); private: @@ -151,7 +150,7 @@ class CommDriverN2KSerialThread : public wxThread { bool OpenComPortPhysical(const wxString& com_name, int baud_rate); void CloseComPortPhysical(); size_t WriteComPortPhysical(std::vector msg); - size_t WriteComPortPhysical(unsigned char *msg, size_t length); + size_t WriteComPortPhysical(unsigned char* msg, size_t length); void SetGatewayOperationMode(void); CommDriverN2KSerial* m_pParentDriver; @@ -180,8 +179,8 @@ wxDECLARE_EVENT(wxEVT_COMMDRIVER_N2K_SERIAL, CommDriverN2KSerialEvent); class CommDriverN2KSerialEvent : public wxEvent { public: CommDriverN2KSerialEvent(wxEventType commandType = wxEVT_NULL, int id = 0) - : wxEvent(id, commandType){}; - ~CommDriverN2KSerialEvent(){}; + : wxEvent(id, commandType) {}; + ~CommDriverN2KSerialEvent() {}; // accessors void SetPayload(std::shared_ptr> data) { @@ -219,6 +218,8 @@ CommDriverN2KSerial::CommDriverN2KSerial(const ConnectionParams* params, m_manufacturers_code = 0; m_got_mfg_code = false; this->attributes["canAddress"] = std::string("-1"); + this->attributes["userComment"] = params->UserComment.ToStdString(); + this->attributes["ioDirection"] = std::string("IN/OUT"); // Prepare the wxEventHandler to accept events from the actual hardware thread Bind(wxEVT_COMMDRIVER_N2K_SERIAL, &CommDriverN2KSerial::handle_N2K_SERIAL_RAW, @@ -272,13 +273,9 @@ CommDriverN2KSerial::CommDriverN2KSerial(const ConnectionParams* params, int yyp = 4; #endif - - } -CommDriverN2KSerial::~CommDriverN2KSerial() { - Close(); -} +CommDriverN2KSerial::~CommDriverN2KSerial() { Close(); } bool CommDriverN2KSerial::Open() { wxString comx; @@ -330,7 +327,7 @@ void CommDriverN2KSerial::Activate() { } bool CommDriverN2KSerial::SendMessage(std::shared_ptr msg, - std::shared_ptr addr) { + std::shared_ptr addr) { #ifndef ANDROID auto msg_n2k = std::dynamic_pointer_cast(msg); @@ -339,52 +336,48 @@ bool CommDriverN2KSerial::SendMessage(std::shared_ptr msg, uint64_t _pgn = msg_n2k->PGN.pgn; auto destination_address = std::static_pointer_cast(addr); - tN2kMsg N2kMsg; // automatically sets destination 255 + tN2kMsg N2kMsg; // automatically sets destination 255 N2kMsg.SetPGN(_pgn); N2kMsg.Priority = msg_n2k->priority; - if (destination_address) - N2kMsg.Destination = destination_address->address; + if (destination_address) N2kMsg.Destination = destination_address->address; - for (size_t i=0 ; i < load.size(); i++) - N2kMsg.AddByte(load.at(i)); //data + for (size_t i = 0; i < load.size(); i++) N2kMsg.AddByte(load.at(i)); // data const std::vector mv = BufferToActisenseFormat(N2kMsg); -// printf("mv\n"); -// for(size_t i=0; i< mv.size(); i++){ -// printf("%02X ", mv.at(i)); -// } -// printf("\n\n"); - - if( GetSecondaryThread() ) { - if( IsSecThreadActive() ) - { - int retry = 10; - while( retry ) { - if( GetSecondaryThread()->SetOutMsg(mv)) - return true; - else - retry--; - } - return false; // could not send after several tries.... - } + // printf("mv\n"); + // for(size_t i=0; i< mv.size(); i++){ + // printf("%02X ", mv.at(i)); + // } + // printf("\n\n"); + + if (GetSecondaryThread()) { + if (IsSecThreadActive()) { + int retry = 10; + while (retry) { + if (GetSecondaryThread()->SetOutMsg(mv)) + return true; else - return false; - } + retry--; + } + return false; // could not send after several tries.... + } else + return false; + } #endif - return true; + return true; } -void CommDriverN2KSerial::ProcessManagementPacket(std::vector *payload) { - - if (payload->at(2) != 0xF2) { // hearbeat - //printf(" pl "); - //for (unsigned int i = 0; i < payload->size(); i++) - // printf("%02X ", payload->at(i)); - //printf("\n"); - } +void CommDriverN2KSerial::ProcessManagementPacket( + std::vector* payload) { + if (payload->at(2) != 0xF2) { // hearbeat + // printf(" pl "); + // for (unsigned int i = 0; i < payload->size(); i++) + // printf("%02X ", payload->at(i)); + // printf("\n"); + } - switch (payload->at(2)){ + switch (payload->at(2)) { case 0x47: m_bmg47_resp = true; break; @@ -396,7 +389,7 @@ void CommDriverN2KSerial::ProcessManagementPacket(std::vector *pa break; case 0x041: { m_bmg41_resp = true; - if (payload->at(3) == 0x02) { // ASCII device_common_name + if (payload->at(3) == 0x02) { // ASCII device_common_name std::string device_common_name; for (unsigned int i = 0; i < 32; i++) { device_common_name += payload->at(i + 14); @@ -409,12 +402,11 @@ void CommDriverN2KSerial::ProcessManagementPacket(std::vector *pa case 0x042: { m_bmg42_resp = true; unsigned char name[8]; - for (unsigned int i = 0; i < 8; i++) - name[i] = payload->at(i + 15); + for (unsigned int i = 0; i < 8; i++) name[i] = payload->at(i + 15); - memcpy( (void *)&NAME, name, 8); + memcpy((void*)&NAME, name, 8); // Extract the manufacturers code - int *f1 = (int *)&NAME; + int* f1 = (int*)&NAME; int f1d = *f1; m_manufacturers_code = f1d >> 21; break; @@ -422,18 +414,15 @@ void CommDriverN2KSerial::ProcessManagementPacket(std::vector *pa default: break; - } } - static uint64_t PayloadToName(const std::vector payload) { uint64_t name; memcpy(&name, reinterpret_cast(payload.data()), sizeof(name)); return name; } - void CommDriverN2KSerial::handle_N2K_SERIAL_RAW( CommDriverN2KSerialEvent& event) { auto p = event.GetPayload(); @@ -452,11 +441,13 @@ void CommDriverN2KSerial::handle_N2K_SERIAL_RAW( *c++ = payload->at(4); *c++ = payload->at(5); // memcpy(&v, &data[3], 1); - //printf(" %ld\n", pgn); + // printf(" %ld\n", pgn); auto name = PayloadToName(*payload); - auto msg = std::make_shared(pgn, *payload, GetAddress(name)); - auto msg_all = std::make_shared(1, *payload, GetAddress(name)); + auto msg = + std::make_shared(pgn, *payload, GetAddress(name)); + auto msg_all = + std::make_shared(1, *payload, GetAddress(name)); m_listener.Notify(std::move(msg)); m_listener.Notify(std::move(msg_all)); @@ -480,34 +471,33 @@ void CommDriverN2KSerial::handle_N2K_SERIAL_RAW( #endif } -int CommDriverN2KSerial::GetMfgCode(){ - unsigned char request_name[] = { 0x42}; - int ni = SendMgmtMsg( request_name, sizeof(request_name), 0x41, 2000, &m_bmg42_resp); - if (ni) - return ni; // Not responding, return error so upper retries. +int CommDriverN2KSerial::GetMfgCode() { + unsigned char request_name[] = {0x42}; + int ni = SendMgmtMsg(request_name, sizeof(request_name), 0x41, 2000, + &m_bmg42_resp); + if (ni) return ni; // Not responding, return error so upper retries. m_got_mfg_code = true; return 0; } -int CommDriverN2KSerial::SendMgmtMsg( unsigned char *string, size_t string_size, - unsigned char cmd_code, - int timeout_msec, bool *response_flag) { +int CommDriverN2KSerial::SendMgmtMsg(unsigned char* string, size_t string_size, + unsigned char cmd_code, int timeout_msec, + bool* response_flag) { #ifndef ANDROID - // Make a message + // Make a message int byteSum = 0; uint8_t CheckSum; - std::vector msg; + std::vector msg; msg.push_back(ESCAPE); msg.push_back(STARTOFTEXT); msg.push_back(0xA1); byteSum += 0xA1; - msg.push_back(string_size); // payload length + msg.push_back(string_size); // payload length byteSum += string_size; - for (unsigned int i=0; i < string_size; i++){ - if (string[i] == ESCAPE) - msg.push_back(string[i]); + for (unsigned int i = 0; i < string_size; i++) { + if (string[i] == ESCAPE) msg.push_back(string[i]); msg.push_back(string[i]); byteSum += string[i]; } @@ -522,35 +512,30 @@ int CommDriverN2KSerial::SendMgmtMsg( unsigned char *string, size_t string_size, // send it out - if (response_flag) - *response_flag = false; // prime the response detector + if (response_flag) *response_flag = false; // prime the response detector // Send the msg bool bsent = false; bool not_done = true; int ntry_outer = 10; - while ( not_done ){ - if( GetSecondaryThread() && IsSecThreadActive() ) { + while (not_done) { + if (GetSecondaryThread() && IsSecThreadActive()) { int retry = 10; - while( retry ) { - if( GetSecondaryThread()->SetOutMsg( msg )){ + while (retry) { + if (GetSecondaryThread()->SetOutMsg(msg)) { bsent = true; not_done = false; break; - } - else + } else retry--; } - } - else { + } else { wxMilliSleep(100); - if (ntry_outer-- <= 0) - not_done = false; + if (ntry_outer-- <= 0) not_done = false; } } - if (!bsent) - return 1; + if (!bsent) return 1; bool bOK = false; if (timeout_msec) { @@ -558,24 +543,23 @@ int CommDriverN2KSerial::SendMgmtMsg( unsigned char *string, size_t string_size, while (timeout > 0) { wxYieldIfNeeded(); wxMilliSleep(100); - if (response_flag){ - if (*response_flag){ + if (response_flag) { + if (*response_flag) { bOK = true; break; } } timeout -= 100; } - } - else + } else bOK = true; - if(!bOK){ - //printf( "***Err-1\n"); + if (!bOK) { + // printf( "***Err-1\n"); return 1; } - //else - //printf("***OK-1 %d\n", timeout); + // else + // printf("***OK-1 %d\n", timeout); #endif return 0; } @@ -594,15 +578,13 @@ static unsigned char NGT_STARTUP_SEQ[] = { }; int CommDriverN2KSerial::SetTXPGN(int pgn) { - // Try to detect Actisense NGT-xx, has Mfg_code == 273 -// if (m_got_mfg_code) { -// if (m_manufacturers_code != 273) -// return 0; // Not Actisense, no error -// } - - SendMgmtMsg( NGT_STARTUP_SEQ, sizeof(NGT_STARTUP_SEQ), 0x11, 0, NULL); + // if (m_got_mfg_code) { + // if (m_manufacturers_code != 273) + // return 0; // Not Actisense, no error + // } + SendMgmtMsg(NGT_STARTUP_SEQ, sizeof(NGT_STARTUP_SEQ), 0x11, 0, NULL); #if 0 // Enable PGN message @@ -635,7 +617,6 @@ int CommDriverN2KSerial::SetTXPGN(int pgn) { // return -3; #endif - return 0; } @@ -719,19 +700,17 @@ void CommDriverN2KSerialThread::CloseComPortPhysical() { } void CommDriverN2KSerialThread::SetGatewayOperationMode(void) { - // For YDNU-02 device // From Device User Manual // Set the mode to "N2K" - unsigned char config_string[] = { 0x10, 0x02, 0xA1, 0x03, 0x11, - 0x02, 0x00, 0x49, 0x10, 0x03}; - //std::vectorwriteBuffer {DLE,STX,NGT_TX_CMD,0x03,0x11,0x02,0x00,0x49, DLE,ETX}; + unsigned char config_string[] = {0x10, 0x02, 0xA1, 0x03, 0x11, + 0x02, 0x00, 0x49, 0x10, 0x03}; + // std::vectorwriteBuffer {DLE,STX,NGT_TX_CMD,0x03,0x11,0x02,0x00,0x49, + // DLE,ETX}; WriteComPortPhysical(config_string, 10); - } - void CommDriverN2KSerialThread::ThreadMessage(const wxString& msg) { // Signal the main program thread // OCPN_ThreadMessageEvent event(wxEVT_OCPN_THREADMSG, 0); @@ -739,7 +718,8 @@ void CommDriverN2KSerialThread::ThreadMessage(const wxString& msg) { // if (gFrame) gFrame->GetEventHandler()->AddPendingEvent(event); } -size_t CommDriverN2KSerialThread::WriteComPortPhysical(std::vector msg) { +size_t CommDriverN2KSerialThread::WriteComPortPhysical( + std::vector msg) { if (m_serial.isOpen()) { ssize_t status = 0; #if 0 @@ -751,7 +731,7 @@ size_t CommDriverN2KSerialThread::WriteComPortPhysical(std::vector &msg) -{ - if(out_que.size() < OUT_QUEUE_LENGTH){ +bool CommDriverN2KSerialThread::SetOutMsg( + const std::vector& msg) { + if (out_que.size() < OUT_QUEUE_LENGTH) { out_que.push(msg); return true; } @@ -804,13 +785,11 @@ void* CommDriverN2KSerialThread::Entry() { // needed/what we want as the reconnection logic is able to pick it up // whenever it actually appears (Of course given it appears with the // expected device name). - } - else { + } else { wxMilliSleep(100); SetGatewayOperationMode(); } - m_pParentDriver->SetSecThreadActive(); // I am alive // The main loop @@ -844,11 +823,10 @@ void* CommDriverN2KSerialThread::Entry() { // std::cerr << "Serial port seems closed." << std::endl; wxMilliSleep(250 * retries); CloseComPortPhysical(); - if (OpenComPortPhysical(m_PortName, m_baud)){ + if (OpenComPortPhysical(m_PortName, m_baud)) { SetGatewayOperationMode(); retries = 0; - } - else if (retries < 10) + } else if (retries < 10) retries++; } @@ -859,8 +837,7 @@ void* CommDriverN2KSerialThread::Entry() { } while (!circle.empty()) { - if (ib >= DS_RX_BUFFER_SIZE) - ib = 0; + if (ib >= DS_RX_BUFFER_SIZE) ib = 0; uint8_t next_byte = circle.get(); if (bInMsg) { @@ -875,18 +852,19 @@ void* CommDriverN2KSerialThread::Entry() { // Process packet // Copy the message into a std::vector - auto buffer = std::make_shared>(rx_buffer, rx_buffer + ib); + auto buffer = std::make_shared>( + rx_buffer, rx_buffer + ib); std::vector* vec = buffer.get(); ib = 0; - //tak_ptr = tptr; + // tak_ptr = tptr; bInMsg = false; bGotESC = false; -// printf("raw "); -// for (unsigned int i = 0; i < vec->size(); i++) -// printf("%02X ", vec->at(i)); -// printf("\n"); + // printf("raw "); + // for (unsigned int i = 0; i < vec->size(); i++) + // printf("%02X ", vec->at(i)); + // printf("\n"); // Message is finished // Send the captured raw data vector pointer to the thread's "parent" @@ -895,7 +873,6 @@ void* CommDriverN2KSerialThread::Entry() { Nevent.SetPayload(buffer); m_pParentDriver->AddPendingEvent(Nevent); - } else { bGotESC = (next_byte == ESCAPE); @@ -971,8 +948,7 @@ void* CommDriverN2KSerialThread::Entry() { // needed/what we want as the reconnection logic is able to pick it up // whenever it actually appears (Of course given it appears with the // expected device name). - } - else { + } else { SetGatewayOperationMode(); } @@ -1011,11 +987,10 @@ void* CommDriverN2KSerialThread::Entry() { // std::cerr << "Serial port seems closed." << std::endl; wxMilliSleep(250 * retries); CloseComPortPhysical(); - if (OpenComPortPhysical(m_PortName, m_baud)){ + if (OpenComPortPhysical(m_PortName, m_baud)) { SetGatewayOperationMode(); retries = 0; - } - else if (retries < 10) + } else if (retries < 10) retries++; } @@ -1036,7 +1011,7 @@ void* CommDriverN2KSerialThread::Entry() { if ((put_ptr - rx_buffer) > DS_RX_BUFFER_SIZE) put_ptr = rx_buffer; bGotESC = false; - } else if ( ENDOFTEXT == next_byte ) { + } else if (ENDOFTEXT == next_byte) { // Process packet // Copy the message into a std::vector @@ -1101,7 +1076,7 @@ void* CommDriverN2KSerialThread::Entry() { } } } // if newdata > 0 - } // while + } // while // Check for any pending output message bool b_qdata = !out_que.empty(); @@ -1135,33 +1110,36 @@ void* CommDriverN2KSerialThread::Entry() { #endif // Android - //***************************************************************************** // Actisense Format: -// <10><02><93>

ChartCatalogs + + EURIS - All European waterways Inland ENC Charts + ENC + https://raw.githubusercontent.com/chartcatalogs/catalogs/master/EURIS_IENC_Catalog.xml + {USERDATA}/ENC/EURIS + Argentina RNC Nautical Charts RNC diff --git a/plugins/chartdldr_pi/po/de_DE.po b/plugins/chartdldr_pi/po/de_DE.po index 8e962eca0c..9e76b3db9c 100644 --- a/plugins/chartdldr_pi/po/de_DE.po +++ b/plugins/chartdldr_pi/po/de_DE.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de_DE\n" diff --git a/plugins/chartdldr_pi/po/en_GB.po b/plugins/chartdldr_pi/po/en_GB.po index e729a8d7e1..f71872a85e 100644 --- a/plugins/chartdldr_pi/po/en_GB.po +++ b/plugins/chartdldr_pi/po/en_GB.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: English, United Kingdom\n" "Language: en_GB\n" diff --git a/plugins/chartdldr_pi/po/es_ES.po b/plugins/chartdldr_pi/po/es_ES.po index f06d010c64..8643d002a4 100644 --- a/plugins/chartdldr_pi/po/es_ES.po +++ b/plugins/chartdldr_pi/po/es_ES.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/plugins/chartdldr_pi/po/fi_FI.po b/plugins/chartdldr_pi/po/fi_FI.po index 39956938dc..061aafeda8 100644 --- a/plugins/chartdldr_pi/po/fi_FI.po +++ b/plugins/chartdldr_pi/po/fi_FI.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Finnish\n" "Language: fi_FI\n" diff --git a/plugins/chartdldr_pi/po/fr_FR.po b/plugins/chartdldr_pi/po/fr_FR.po index 5f3b7b4686..b14dfccb25 100644 --- a/plugins/chartdldr_pi/po/fr_FR.po +++ b/plugins/chartdldr_pi/po/fr_FR.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -323,7 +323,7 @@ msgstr "Dossier d'installation des cartes proposé" #: src/chartdldrgui.cpp:324 msgid "Select a different directory" -msgstr "Sélectionnez un dossier différent" +msgstr "Sélectionnez un répertoire différent" #: src/chartdldrgui.cpp:331 msgid "OK" diff --git a/plugins/chartdldr_pi/po/he_IL.po b/plugins/chartdldr_pi/po/he_IL.po index 1d81c19fb0..45a1c007cd 100644 --- a/plugins/chartdldr_pi/po/he_IL.po +++ b/plugins/chartdldr_pi/po/he_IL.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-09 01:19\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hebrew\n" "Language: he_IL\n" diff --git a/plugins/chartdldr_pi/po/nb_NO.po b/plugins/chartdldr_pi/po/nb_NO.po index 176e1c5da7..17d780462c 100644 --- a/plugins/chartdldr_pi/po/nb_NO.po +++ b/plugins/chartdldr_pi/po/nb_NO.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-09 01:20\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" diff --git a/plugins/chartdldr_pi/po/pt_BR.po b/plugins/chartdldr_pi/po/pt_BR.po index 7efd02e4b8..1e9933e83e 100644 --- a/plugins/chartdldr_pi/po/pt_BR.po +++ b/plugins/chartdldr_pi/po/pt_BR.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/plugins/chartdldr_pi/po/ru_RU.po b/plugins/chartdldr_pi/po/ru_RU.po index 54f6b3d713..e0c91c31f6 100644 --- a/plugins/chartdldr_pi/po/ru_RU.po +++ b/plugins/chartdldr_pi/po/ru_RU.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 20:51\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/plugins/chartdldr_pi/po/sv_SE.po b/plugins/chartdldr_pi/po/sv_SE.po index 6ec215754f..9a78625836 100644 --- a/plugins/chartdldr_pi/po/sv_SE.po +++ b/plugins/chartdldr_pi/po/sv_SE.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:03-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv_SE\n" diff --git a/plugins/dashboard_pi/po/ar_SA.po b/plugins/dashboard_pi/po/ar_SA.po index dd18084b5d..51e55aef11 100644 --- a/plugins/dashboard_pi/po/ar_SA.po +++ b/plugins/dashboard_pi/po/ar_SA.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Arabic\n" "Language: ar_SA\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "شمال" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "الموقع" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "زاوية الرياح التقريبية" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "السرعة و الاتجاه الحقيقي للرياح" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "مؤشر" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "شروق الشمس/غروب الشمس" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "اوجه القمر" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "تاريخ الرياح" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "تاريخ الضغط" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "سجل الرحلة" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "لوحة التحكم" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "أعلى" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "أسفل" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "اعدادات لوحة المعلومات" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "عرض ضمن لوحة المعلومات" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "التدوير:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "عمودي" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "أفقي" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "أدوات" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "إضافة" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "حذف" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "المظهر" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "الخطوط" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "العنوان:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "البيانات:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "عنوان:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "عقدة" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "كم/ساعة" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "متر/ثانية" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "متر" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "قدم" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "بوصة" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "سنتيمتر" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "وحدة المسافة:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "ميل بحري" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "كيلومتر" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "وحدة سرعة الرياح:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "الخصائص" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/bg_BG.po b/plugins/dashboard_pi/po/bg_BG.po index af1550eb3a..52a8e03aba 100644 --- a/plugins/dashboard_pi/po/bg_BG.po +++ b/plugins/dashboard_pi/po/bg_BG.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/ca_ES.po b/plugins/dashboard_pi/po/ca_ES.po index 17d3908e36..abf78e3c3c 100644 --- a/plugins/dashboard_pi/po/ca_ES.po +++ b/plugins/dashboard_pi/po/ca_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Catalan\n" "Language: ca_ES\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posició" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "COG Magnètic" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Compàs V" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Rumb Verd." -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Rumb Mag." -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Angle/Vel. Vent aparent" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Angle Real i Aparent del vent" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Vel. Vent Aparent" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Angle/Velocitat Vent real" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Calat" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Pressió baromètrica" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temperatura de l'aigua" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temperatura de l'aire" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Angle Vent aparent" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Angle Vent real" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Dir. Vent real" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Velocitat Vent real" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Direcció/Vel. Vent real" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Angle timó" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Sortida/Posta" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Fase lunar" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Històric de vent" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Històric de pressió" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Log de viatge" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Log Total" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Des de pròpia embarcació" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Pitch" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Taló" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Tauler d'instruments" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Connector Tauler d'instruments per a OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "El Connector Tauler d'instruments per a OpenCPN\n" "Mostra un panel d'instruments de navegació des d'una font NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Amunt" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Avall" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Preferències Tauler" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "mostra aquest tauler" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Nom:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientació:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertical" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horizontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instruments" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Afegir" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Esborrar" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Aspecte" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Fonts" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Títol:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Dades:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etiqueta:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Petit:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Unitats, Rangs i Formats" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Valor màx. velocímetre:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Unitats velocitat vaixell:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Seleccionada a OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Unitats de calat:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metres" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Peus" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Braces" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Polzades" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centímetres" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Unitats de distància:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Milles nàutiques" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Milles internacionals" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilòmetres" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Unitats vel. vent:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Afegir instrument" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Seleccionar instrument a afegir:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Preferències..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " real" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " mag" diff --git a/plugins/dashboard_pi/po/cs_CZ.po b/plugins/dashboard_pi/po/cs_CZ.po index ec76b17c8b..334fbf1dc2 100644 --- a/plugins/dashboard_pi/po/cs_CZ.po +++ b/plugins/dashboard_pi/po/cs_CZ.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Czech\n" "Language: cs_CZ\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "S" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Pozice" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Kompas" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Skutečný HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Mag HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Zdánlivý úhel a rychlost větru" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Úhel skutečného a zdánlivého větru" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Rychlost větru" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Skutečný úhel a rychlost větru" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Hloubka" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Barometrický tlak" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Teplota vody" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Teplota" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Úhel větru" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Úhel větru" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Skutečný směr větru" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Rychlost větru" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Skutečný směr a rychlost větru" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Výchylka kormidla" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Kurzor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Východ/západ slunce" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Fáze měsíce" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Historie větru" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Historie tlaku" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Trip Log" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Celkový log" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Od lodi" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Houpání" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Náklon" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Místní CPU hodiny" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Místní východ/západ slunce" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Palubní deska" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Doplněk Palubní deska pro OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Doplněk Palubní deska pro OpenCPN\n" "Poskytuje zobrazení navigačních přístrojů Provides navigation instrumz NMEA zdroje." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Nahoru" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Dolů" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Možnosti palubní desky" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "zobrazit tuto palubní desku" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Popis:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientace:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertikální" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horizontální" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Přístroje" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Přidat" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Smazat" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Vzhled" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Písma" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Nadpis:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Data:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Nadpis:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Malý:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Jednotky, rozsahy, formáty" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Rychloměr" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Faktor průměrování rychlosti proti dnu:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Faktor průměrování kurzu proti dnu:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Posun místního času od času UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Jednotka rychlosti lodi:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Podle nastavení OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Jednotky hloubky:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metry" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Stopy" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Fathomy (Sáhy)" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Palce" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centimetry" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Jednotky vzdálenosti:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Námořní míle" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Statutární míle" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilometery" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Rychlost větru" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Přidat přístroj" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Výber přístroj pro přidání:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Předvolby..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "Z" msgid "NW" msgstr "SZ" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " skutečný" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " mag" diff --git a/plugins/dashboard_pi/po/da_DK.po b/plugins/dashboard_pi/po/da_DK.po index c9a79a84fb..6e11b6fc17 100644 --- a/plugins/dashboard_pi/po/da_DK.po +++ b/plugins/dashboard_pi/po/da_DK.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Danish\n" "Language: da_DK\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Position" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "Beholden fart" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "Beholden kurs" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Beholden kurs misvisende" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS Kompas" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Retvisende kompas" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "Sejlet fart" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Styret kurs retvisende" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Styret kurs misvisende" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Relativ vindvinkel og -hastighed" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Relativ og sand vindvinkel" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Relativ vindhastighed" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Sand vindvinkel og -hastighed" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Højde" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Højde Sporing" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Dybde" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Barometerstand" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Vandtemperatur" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Lufttemperatur" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Relativ vindretning" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Sand vindvinkel" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Sand vindretning" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Sand vindhastighed" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Sand vindretning & -fart" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Rorvinkel" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS i brug" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS Status" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Markør" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS Ur" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Solopgang/nedgang" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Månefase" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Vind-historik" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Barometer-historik" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Trip log" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Sum log" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Fra eget skib" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Duvning" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Krængning" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Lokal GNSS-ur" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Loakalt CPU Ur" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Lokal Sol Op/Ned" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Instrumentpanel" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Instrumentpanel-plugin for OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Instrumentpanel-plugin for OpenCPN\n" "Instrumentvisninger fra NMEA-kilde." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Op" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Ned" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Stbd" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Bagb" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Instrumentpanel-indstillinger" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Vis dette instrumentpanel" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Titel:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientering:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Lodret" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horisontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumenter" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Tilføj" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Slet" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Udseende" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Fonte" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Titel:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Data:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etiket:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Lille:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Enheder, områder, formater" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Speedometer maks. værdi:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Beholden fart Dæmpningsfaktor:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Beholden kurs Dæmpningsfaktor:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Lokal Tidsforskydning Fra UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Enheder for bådhastighed:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Respektér OpenCPN indstillinger" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Knob" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Dybdeenheder:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Meter" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Fod" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Favne" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Inches" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centimeter" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Dybdeforskydning (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Distance enheder:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Sømil" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Statute miles" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilometer" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Enheder for vindhastighed:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Temperaturenheder:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Brug N2K & SignalK sande vinddata over jorden.\n" "(i stedet for gennem vand)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Tilføj instrument" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Vælg instrument:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Indstillinger..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Ændr Størrelse..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Frigør" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Vælg skrifttype" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "V" msgid "NW" msgstr "NV" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " sand" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " misvisende" diff --git a/plugins/dashboard_pi/po/dashboard_pi.pot b/plugins/dashboard_pi/po/dashboard_pi.pot index cffd55f4d3..505d97739f 100644 --- a/plugins/dashboard_pi/po/dashboard_pi.pot +++ b/plugins/dashboard_pi/po/dashboard_pi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dashboard_pi 5.9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "" "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "" "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/de_DE.po b/plugins/dashboard_pi/po/de_DE.po index 36a9e21444..c1bebbe1a6 100644 --- a/plugins/dashboard_pi/po/de_DE.po +++ b/plugins/dashboard_pi/po/de_DE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 20:50\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de_DE\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Position" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "Geschwindigkeit SOG" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "Geschwindigkeit STW" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS Kompaß" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Wahrer Kompaß" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "rechtw. Kurs" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "magn. Kurs" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "scheinb. Windwinkel & -Geschw." -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Scheinb. & Wahrer Windwinkel" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "scheinb. Windgeschw." -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "wahrer Windwinkel & -Geschw." -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Höhe" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Höhenspur" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Tiefe" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Barometr. Druck" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Wassertemp." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Lufttemp." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "scheinb. Windwinkel" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "wahrer Windwinkel" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "wahre Windrichtung " -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "wahre Windgeschw." -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "wahre Windricht. & -Geschw." -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "VMG Wind" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Ruderlage" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "Verwendete GNSS" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS Status" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS-Zeit" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Sonnenauf-/untergang" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Mondphase" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Windhistorie" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Barometerhistorie" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Log Trip" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Summenlog" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "von eigener Position" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Nickwinkel" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Krängung" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Lokale GNSS-Zeit" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Lokale System-Zeit" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Lokaler Sonnenauf- /Sonnenuntergang" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "Luftfeuchte" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Dashboard" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Dashboard Plugin für OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Dashboard Plugin für OpenCPN\n" "ermöglicht Instrumentenanzeigen aus NMEA Quellen." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "hoch" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "runter" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Stb." -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Bbord" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Dashboard Einstellungen" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "zeige dieses Dashboard" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Fenstertitel:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Ausrichtung:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "vertikal" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "horizontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumente" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Zufügen" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "Bearbeiten" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Löschen" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Erscheinungsbild" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Schrift" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Titel:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Daten:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Beschreibung:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Klein:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "Zurücksetzen:" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "Standard-Schriftarten für Dashboard festlegen" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Einheiten, Bereiche, Formate" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Log max. Wert:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "FüG Dämpfungsfaktor:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "KüG Dämpfungsfaktor:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Zeitversatz Lokal zu UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Bootgeschw. Einheiten:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Berücksichtige OpenCPN Einstellungen" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "kn" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Tiefen-Einheiten:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Meter" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Fuß" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Faden" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Zoll" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Zentimeter" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Lotung Offset (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Entfernungs-Einheiten:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Naut. Meilen" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Landmeilen" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilometer" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Windgeschw. Einheiten:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Temperatureinheiten:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Nutze N2K & SignalK Wahrer Wind über Boden von Signal K.\n" " (Statt Durch Wasser)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Instrument hinzufügen" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Instrument auswählen zum Hinzufügen:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Einstellungen..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Ändern der Größe..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Lösen" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Schriftart wählen" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "Hintergrundfarbe Titel:" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "Hintergrundfarbe Daten:" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "Pfeil 1 Farbe:" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "Pfeil 2 Farbe:" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "Als Standard festlegen" @@ -495,11 +499,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "rechtw." -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "magn." diff --git a/plugins/dashboard_pi/po/el_GR.po b/plugins/dashboard_pi/po/el_GR.po index 77a5933512..a01795f37d 100644 --- a/plugins/dashboard_pi/po/el_GR.po +++ b/plugins/dashboard_pi/po/el_GR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "Β" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Θέση" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG (αληθής ταχύτητα)" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG (αληθής πορεία)" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Μαγν. COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "Πυξίδα GNSS" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Αληθής πυξίδα" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "Φαινόμενη ταχύτητα (δρομομέτρου)" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Αληθής κατεύθυνση" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Μαγνητική κατ. πορείας" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Γωνία/ταχύτητα φαιν. ανέμου" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Φαιν. & πραγμ. γωνία ανέμου" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Ταχύτητα φαιν. ανέμου" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Γωνία/ταχύτητα πραγμ. ανέμου" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Υψόμετρο" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Υψομετρική" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Βάθος" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Βαρομετρική πίεση" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Θερμ/σία νερού" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Θερμ/σία αέρος" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Γωνία φαιν. ανέμου" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Γωνία πραγμ. ανέμου" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Κατεύθυνση πραγμ. ανέμου" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Ταχύτητα πραγμ. ανέμου" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Κατεύθυνση/ταχύτητα πραγμ. ανέμου" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG (ταχύτητα στη σωστή κατεύθυνση)" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Γωνία πηδαλίου" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS σε χρήση" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "Κατάσταση GNSS" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Κέρσορας" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Ρολόι GNSS" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Ανατολή/δύση ηλίου" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Φάση σελήνης" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Ιστορικό Ανέμου" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Ιστορικό πιέσεων" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Ημερολ. ταξιδιού" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Αθροιστικό Log" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Από ίδιον πλοίο" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Κούνημα" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Γέρσιμο" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Τοπικό Ρολόι GNSS" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Τοπική ώρα CPU" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Τοπική ώρα ανατολής/δύσης ήλιου" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Πίνακας Οργάνων" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Πίνακας οργάνων για το OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Πρόσθετο «Πίνακας Οργάνων»\n" "Παρουσιάζει τα ναυτικά όργανα στην οθόνη από πηγή NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Πάνω" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Κάτω" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Δεξιά" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Αριστερά" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Επιλογές για πίνακα οργάνων" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Εμφάνιση αυτού του πίνακα οργάνων" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Λεζάντα:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Προσανατολισμός:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Κατακόρυφα" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Οριζόντια" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Όργανα" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Προσθήκη" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Διαγραφή" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Εμφάνιση" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Γραμματοσειρές" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Τίτλος:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Δεδομένα: " -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Ετικέτα:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Μικρό:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Μονάδες, Όρια, Μορφή" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Μέγ. τιμή δρομομέτρου:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Συντ. απόσβεσης SOG:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Συντελεστής απόσβεσης COG:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Διαφορά τοπικής ώρας από UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Μονάδες ταχύτητας πλοίου:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Προεπιλεγμένες ρυθμίσεις" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "κόμβοι" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "μ.α.ώ." -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr " Βαθυμετρικές μονάδες: " -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "μέτρα" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Πόδια" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Οργιές" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "ίντσες" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Εκατοστά" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Αντιστάθμιση βάθους (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Μονάδες απόστασης:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Ναυτικά μίλια" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Αγγλικά μίλια" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Χιλιόμετρα" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Μονάδες ταχύτητας ανέμου:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Μονάδες θερμοκρασίας:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Κελσίου" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Φαρενάιτ" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Κέλβιν (K)" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Χρήση N2K και SignalK δεδομένα αληθούς ανέμου (αντ´ι σε σχέση με το νερό)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Προσθήκη οργάνου" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Διάλεξε όργανο για προσθήκη:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Προτιμήσεις..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Αλλαγή μεγέθους..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Αποσύνδεση" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Επιλογή γραμματοσειράς" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "Δ" msgid "NW" msgstr "ΒΔ" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " αληθής" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " μαγν." diff --git a/plugins/dashboard_pi/po/en_GB.po b/plugins/dashboard_pi/po/en_GB.po index 7e9a35a1e9..837431f8fc 100644 --- a/plugins/dashboard_pi/po/en_GB.po +++ b/plugins/dashboard_pi/po/en_GB.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: English, United Kingdom\n" "Language: en_GB\n" @@ -22,446 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Position" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" +msgstr "Speed SOG" + +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS Compass" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "True Compass" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "True HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Mag HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "App. Wind Angle & Speed" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "App & True Wind Angle" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "App. Wind Speed" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "True Wind Angle & Speed" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" -msgstr "" +msgstr "Altitude" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" -msgstr "" +msgstr "Altitude Trace" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" -msgstr "" +msgstr "Depth" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" -msgstr "" +msgstr "Barometric pressure" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." -msgstr "" +msgstr "Water Temp." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." -msgstr "" +msgstr "Air Temp." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" -msgstr "" +msgstr "App. Wind Angle" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" -msgstr "" +msgstr "True Wind Angle" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" -msgstr "" +msgstr "True Wind Direction" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" -msgstr "" +msgstr "True Wind Speed" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" -msgstr "" +msgstr "True Wind Dir. & Speed" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" -msgstr "" +msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" -msgstr "" +msgstr "VMG Wind" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" -msgstr "" +msgstr "Rudder Angle" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" -msgstr "" +msgstr "GNSS in use" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" -msgstr "" +msgstr "GNSS Status" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" -msgstr "" +msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" -msgstr "" +msgstr "GNSS Clock" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" -msgstr "" +msgstr "Sunrise/Sunset" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" -msgstr "" +msgstr "Moon phase" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" -msgstr "" +msgstr "Wind history" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" -msgstr "" +msgstr "Barometric history" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" -msgstr "" +msgstr "Trip Log" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" -msgstr "" +msgstr "Sum Log" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" -msgstr "" +msgstr "From Ownship" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" -msgstr "" +msgstr "Pitch" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" -msgstr "" +msgstr "Heel" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" -msgstr "" +msgstr "Local GNSS Clock" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" -msgstr "" +msgstr "Local CPU Clock" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" -msgstr "" +msgstr "Local Sunrise/Sunset" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" -msgstr "" +msgstr "Humidity" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" -msgstr "" +msgstr "Dashboard" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" -msgstr "" +msgstr "Dashboard PlugIn for OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." -msgstr "" +msgstr "Dashboard PlugIn for OpenCPN\n" +"Provides navigation instrument display from NMEA source." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" -msgstr "" +msgstr "Up" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" -msgstr "" +msgstr "Down" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" -msgstr "" +msgstr "Stbd" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" -msgstr "" +msgstr "Port" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" -msgstr "" +msgstr "Dashboard preferences" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" -msgstr "" +msgstr "show this dashboard" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" -msgstr "" +msgstr "Caption:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" -msgstr "" +msgstr "Orientation:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" -msgstr "" +msgstr "Vertical" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" -msgstr "" +msgstr "Horizontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" -msgstr "" +msgstr "Instruments" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" -msgstr "" +msgstr "Add" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" -msgstr "" +msgstr "Edit" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" -msgstr "" +msgstr "Delete" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" -msgstr "" +msgstr "Appearance" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" -msgstr "" +msgstr "Fonts" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" -msgstr "" +msgstr "Title:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" -msgstr "" +msgstr "Data:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" -msgstr "" +msgstr "Label:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" -msgstr "" +msgstr "Small:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" -msgstr "" +msgstr "Reset:" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" -msgstr "" +msgstr "Set dashboard default fonts" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" -msgstr "" +msgstr "Units, Ranges, Formats" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" -msgstr "" +msgstr "Speedometer max value:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" -msgstr "" +msgstr "Speed Over Ground Damping Factor:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" -msgstr "" +msgstr "COG Damping Factor:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" -msgstr "" +msgstr "Local Time Offset From UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" -msgstr "" +msgstr "Boat speed units:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" -msgstr "" +msgstr "Honour OpenCPN settings" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" -msgstr "" +msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" -msgstr "" +msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" -msgstr "" +msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" -msgstr "" +msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" -msgstr "" +msgstr "Depth units:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" -msgstr "" +msgstr "Metres" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" -msgstr "" +msgstr "Feet" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" -msgstr "" +msgstr "Fathoms" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" -msgstr "" +msgstr "Inches" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" -msgstr "" +msgstr "Centimetres" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" -msgstr "" +msgstr "Depth Offset (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" -msgstr "" +msgstr "Distance units:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" -msgstr "" +msgstr "Nautical miles" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" -msgstr "" +msgstr "Statute miles" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" -msgstr "" +msgstr "Kilometers" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" -msgstr "" +msgstr "Wind speed units:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" -msgstr "" +msgstr "Temperature units:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" -msgstr "" +msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" -msgstr "" +msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" -msgstr "" +msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" -msgstr "" +msgstr "Use N2K & SignalK true wind data over ground.\n" +"(Instead of through water)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" -msgstr "" +msgstr "Add instrument" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" -msgstr "" +msgstr "Select instrument to add:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." -msgstr "" +msgstr "Preferences..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Resize..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Undock" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Choose font" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" -msgstr "" +msgstr "Title background colour:" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" -msgstr "" +msgstr "Data background colour:" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "Arrow 1 Colour :" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "Arrow 2 Colour :" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "Set default" @@ -487,23 +493,23 @@ msgstr "SW" #: src/dial.cpp:526 src/gps.cpp:275 src/wind.cpp:70 src/wind_history.cpp:574 msgid "W" -msgstr "" +msgstr "W" #: src/dial.cpp:526 src/wind.cpp:70 src/wind_history.cpp:578 msgid "NW" -msgstr "" +msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" -msgstr "" +msgstr " true" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" -msgstr "" +msgstr " mag" #: src/wind_history.cpp:54 src/wind_history.cpp:130 msgid "-" -msgstr "" +msgstr "-" #: src/wind_history.cpp:410 #, c-format @@ -512,35 +518,35 @@ msgstr "" #: src/wind_history.cpp:552 msgid "NNE" -msgstr "" +msgstr "NNE" #: src/wind_history.cpp:556 msgid "ENE" -msgstr "" +msgstr "ENE" #: src/wind_history.cpp:560 msgid "ESE" -msgstr "" +msgstr "ESE" #: src/wind_history.cpp:564 msgid "SSE" -msgstr "" +msgstr "SSE" #: src/wind_history.cpp:568 msgid "SSW" -msgstr "" +msgstr "SSW" #: src/wind_history.cpp:572 msgid "WSW" -msgstr "" +msgstr "WSW" #: src/wind_history.cpp:576 msgid "WNW" -msgstr "" +msgstr "WNW" #: src/wind_history.cpp:580 msgid "NNW" -msgstr "" +msgstr "NNW" #: src/wind_history.cpp:792 #, c-format diff --git a/plugins/dashboard_pi/po/es_EM.po b/plugins/dashboard_pi/po/es_EM.po deleted file mode 100755 index f3763930f4..0000000000 --- a/plugins/dashboard_pi/po/es_EM.po +++ /dev/null @@ -1,549 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: opencpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" -"Last-Translator: \n" -"Language-Team: Spanish (Modern)\n" -"Language: es_EM\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-Crowdin-Project: opencpn\n" -"X-Crowdin-Project-ID: 49843\n" -"X-Crowdin-Language: es-EM\n" -"X-Crowdin-File: /plugins/dashboard_pi/po/dashboard_pi.pot\n" -"X-Crowdin-File-ID: 111\n" - -#: src/clock.cpp:161 src/dial.cpp:525 src/dial.cpp:526 src/gps.cpp:263 -#: src/wind.cpp:69 src/wind_history.cpp:550 -msgid "N" -msgstr "crwdns3932:0crwdne3932:0" - -#: src/dashboard_pi.cpp:260 -msgid "Position" -msgstr "crwdns3933:0crwdne3933:0" - -#: src/dashboard_pi.cpp:262 -msgid "SOG" -msgstr "crwdns3934:0crwdne3934:0" - -#: src/dashboard_pi.cpp:264 -msgid "Speed SOG" -msgstr "crwdns29252:0crwdne29252:0" - -#: src/dashboard_pi.cpp:266 -msgid "COG" -msgstr "crwdns3936:0crwdne3936:0" - -#: src/dashboard_pi.cpp:268 -msgid "Mag COG" -msgstr "crwdns6763:0crwdne6763:0" - -#: src/dashboard_pi.cpp:270 -msgid "GNSS Compass" -msgstr "crwdns21171:0crwdne21171:0" - -#: src/dashboard_pi.cpp:272 -msgid "True Compass" -msgstr "crwdns3938:0crwdne3938:0" - -#: src/dashboard_pi.cpp:274 -msgid "STW" -msgstr "crwdns3939:0crwdne3939:0" - -#: src/dashboard_pi.cpp:276 -msgid "True HDG" -msgstr "crwdns3940:0crwdne3940:0" - -#: src/dashboard_pi.cpp:278 -msgid "Mag HDG" -msgstr "crwdns3941:0crwdne3941:0" - -#: src/dashboard_pi.cpp:281 -msgid "App. Wind Angle & Speed" -msgstr "crwdns3942:0crwdne3942:0" - -#: src/dashboard_pi.cpp:283 -msgid "App & True Wind Angle" -msgstr "crwdns8076:0crwdne8076:0" - -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 -msgid "App. Wind Speed" -msgstr "crwdns3943:0crwdne3943:0" - -#: src/dashboard_pi.cpp:289 -msgid "True Wind Angle & Speed" -msgstr "crwdns3944:0crwdne3944:0" - -#: src/dashboard_pi.cpp:291 -msgid "Altitude" -msgstr "crwdns26719:0crwdne26719:0" - -#: src/dashboard_pi.cpp:293 -msgid "Altitude Trace" -msgstr "crwdns26721:0crwdne26721:0" - -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 -msgid "Depth" -msgstr "crwdns3945:0crwdne3945:0" - -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 -msgid "Barometric pressure" -msgstr "crwdns3946:0crwdne3946:0" - -#: src/dashboard_pi.cpp:303 -msgid "Water Temp." -msgstr "crwdns3947:0crwdne3947:0" - -#: src/dashboard_pi.cpp:305 -msgid "Air Temp." -msgstr "crwdns3948:0crwdne3948:0" - -#: src/dashboard_pi.cpp:307 -msgid "App. Wind Angle" -msgstr "crwdns3949:0crwdne3949:0" - -#: src/dashboard_pi.cpp:309 -msgid "True Wind Angle" -msgstr "crwdns3950:0crwdne3950:0" - -#: src/dashboard_pi.cpp:311 -msgid "True Wind Direction" -msgstr "crwdns3951:0crwdne3951:0" - -#: src/dashboard_pi.cpp:313 -msgid "True Wind Speed" -msgstr "crwdns3952:0crwdne3952:0" - -#: src/dashboard_pi.cpp:315 -msgid "True Wind Dir. & Speed" -msgstr "crwdns3953:0crwdne3953:0" - -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 -msgid "VMG" -msgstr "crwdns3954:0crwdne3954:0" - -#: src/dashboard_pi.cpp:321 -msgid "VMG Wind" -msgstr "crwdns28980:0crwdne28980:0" - -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 -msgid "Rudder Angle" -msgstr "crwdns3955:0crwdne3955:0" - -#: src/dashboard_pi.cpp:327 -msgid "GNSS in use" -msgstr "crwdns21173:0crwdne21173:0" - -#: src/dashboard_pi.cpp:329 -msgid "GNSS Status" -msgstr "crwdns21175:0crwdne21175:0" - -#: src/dashboard_pi.cpp:331 -msgid "Cursor" -msgstr "crwdns3958:0crwdne3958:0" - -#: src/dashboard_pi.cpp:333 -msgid "GNSS Clock" -msgstr "crwdns21177:0crwdne21177:0" - -#: src/dashboard_pi.cpp:335 -msgid "Sunrise/Sunset" -msgstr "crwdns3960:0crwdne3960:0" - -#: src/dashboard_pi.cpp:337 -msgid "Moon phase" -msgstr "crwdns3961:0crwdne3961:0" - -#: src/dashboard_pi.cpp:339 -msgid "Wind history" -msgstr "crwdns3962:0crwdne3962:0" - -#: src/dashboard_pi.cpp:341 -msgid "Barometric history" -msgstr "crwdns3963:0crwdne3963:0" - -#: src/dashboard_pi.cpp:343 -msgid "Trip Log" -msgstr "crwdns3964:0crwdne3964:0" - -#: src/dashboard_pi.cpp:345 -msgid "Sum Log" -msgstr "crwdns3965:0crwdne3965:0" - -#: src/dashboard_pi.cpp:347 -msgid "From Ownship" -msgstr "crwdns3966:0crwdne3966:0" - -#: src/dashboard_pi.cpp:349 -msgid "Pitch" -msgstr "crwdns8077:0crwdne8077:0" - -#: src/dashboard_pi.cpp:351 -msgid "Heel" -msgstr "crwdns8078:0crwdne8078:0" - -#: src/dashboard_pi.cpp:353 -msgid "Local GNSS Clock" -msgstr "crwdns21179:0crwdne21179:0" - -#: src/dashboard_pi.cpp:355 -msgid "Local CPU Clock" -msgstr "crwdns10333:0crwdne10333:0" - -#: src/dashboard_pi.cpp:357 -msgid "Local Sunrise/Sunset" -msgstr "crwdns10334:0crwdne10334:0" - -#: src/dashboard_pi.cpp:359 -msgid "Humidity" -msgstr "crwdns28982:0crwdne28982:0" - -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 -msgid "Dashboard" -msgstr "crwdns3967:0crwdne3967:0" - -#: src/dashboard_pi.cpp:951 -msgid "Dashboard PlugIn for OpenCPN" -msgstr "crwdns3968:0crwdne3968:0" - -#: src/dashboard_pi.cpp:956 -msgid "Dashboard PlugIn for OpenCPN\n" -"Provides navigation instrument display from NMEA source." -msgstr "crwdns3969:0crwdne3969:0" - -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 -msgid "Up" -msgstr "crwdns3979:0crwdne3979:0" - -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 -msgid "Down" -msgstr "crwdns3980:0crwdne3980:0" - -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 -msgid "Stbd" -msgstr "crwdns20392:0crwdne20392:0" - -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 -msgid "Port" -msgstr "crwdns20394:0crwdne20394:0" - -#: src/dashboard_pi.cpp:3957 -msgid "Dashboard preferences" -msgstr "crwdns3970:0crwdne3970:0" - -#: src/dashboard_pi.cpp:4119 -msgid "show this dashboard" -msgstr "crwdns3971:0crwdne3971:0" - -#: src/dashboard_pi.cpp:4130 -msgid "Caption:" -msgstr "crwdns3972:0crwdne3972:0" - -#: src/dashboard_pi.cpp:4140 -msgid "Orientation:" -msgstr "crwdns3973:0crwdne3973:0" - -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 -msgid "Vertical" -msgstr "crwdns3974:0crwdne3974:0" - -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 -msgid "Horizontal" -msgstr "crwdns3975:0crwdne3975:0" - -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 -msgid "Instruments" -msgstr "crwdns3976:0crwdne3976:0" - -#: src/dashboard_pi.cpp:4210 -msgid "Add" -msgstr "crwdns3977:0crwdne3977:0" - -#: src/dashboard_pi.cpp:4219 -msgid "Edit" -msgstr "crwdns28984:0crwdne28984:0" - -#: src/dashboard_pi.cpp:4234 -msgid "Delete" -msgstr "crwdns3978:0crwdne3978:0" - -#: src/dashboard_pi.cpp:4262 -msgid "Appearance" -msgstr "crwdns3981:0crwdne3981:0" - -#: src/dashboard_pi.cpp:4265 -msgid "Fonts" -msgstr "crwdns3982:0crwdne3982:0" - -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 -msgid "Title:" -msgstr "crwdns3983:0crwdne3983:0" - -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 -msgid "Data:" -msgstr "crwdns3984:0crwdne3984:0" - -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 -msgid "Label:" -msgstr "crwdns3985:0crwdne3985:0" - -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 -msgid "Small:" -msgstr "crwdns3986:0crwdne3986:0" - -#: src/dashboard_pi.cpp:4311 -msgid "Reset:" -msgstr "crwdns28986:0crwdne28986:0" - -#: src/dashboard_pi.cpp:4315 -msgid "Set dashboard default fonts" -msgstr "crwdns28988:0crwdne28988:0" - -#: src/dashboard_pi.cpp:4324 -msgid "Units, Ranges, Formats" -msgstr "crwdns3987:0crwdne3987:0" - -#: src/dashboard_pi.cpp:4332 -msgid "Speedometer max value:" -msgstr "crwdns3988:0crwdne3988:0" - -#: src/dashboard_pi.cpp:4341 -msgid "Speed Over Ground Damping Factor:" -msgstr "crwdns9256:0crwdne9256:0" - -#: src/dashboard_pi.cpp:4350 -msgid "COG Damping Factor:" -msgstr "crwdns9257:0crwdne9257:0" - -#: src/dashboard_pi.cpp:4359 -msgid "Local Time Offset From UTC:" -msgstr "crwdns10335:0crwdne10335:0" - -#: src/dashboard_pi.cpp:4384 -msgid "Boat speed units:" -msgstr "crwdns3989:0crwdne3989:0" - -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 -msgid "Honor OpenCPN settings" -msgstr "crwdns3990:0crwdne3990:0" - -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 -msgid "Kts" -msgstr "crwdns3991:0crwdne3991:0" - -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 -msgid "mph" -msgstr "crwdns3992:0crwdne3992:0" - -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 -msgid "km/h" -msgstr "crwdns3993:0crwdne3993:0" - -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 -msgid "m/s" -msgstr "crwdns3994:0crwdne3994:0" - -#: src/dashboard_pi.cpp:4402 -msgid "Depth units:" -msgstr "crwdns3995:0crwdne3995:0" - -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 -msgid "Meters" -msgstr "crwdns3996:0crwdne3996:0" - -#: src/dashboard_pi.cpp:4406 -msgid "Feet" -msgstr "crwdns3997:0crwdne3997:0" - -#: src/dashboard_pi.cpp:4406 -msgid "Fathoms" -msgstr "crwdns3998:0crwdne3998:0" - -#: src/dashboard_pi.cpp:4407 -msgid "Inches" -msgstr "crwdns4000:0crwdne4000:0" - -#: src/dashboard_pi.cpp:4407 -msgid "Centimeters" -msgstr "crwdns3999:0crwdne3999:0" - -#: src/dashboard_pi.cpp:4419 -#, c-format -msgid "Depth Offset (%s):" -msgstr "crwdns12242:0%scrwdne12242:0" - -#: src/dashboard_pi.cpp:4448 -msgid "Distance units:" -msgstr "crwdns4001:0crwdne4001:0" - -#: src/dashboard_pi.cpp:4452 -msgid "Nautical miles" -msgstr "crwdns4002:0crwdne4002:0" - -#: src/dashboard_pi.cpp:4452 -msgid "Statute miles" -msgstr "crwdns4003:0crwdne4003:0" - -#: src/dashboard_pi.cpp:4453 -msgid "Kilometers" -msgstr "crwdns4004:0crwdne4004:0" - -#: src/dashboard_pi.cpp:4467 -msgid "Wind speed units:" -msgstr "crwdns4005:0crwdne4005:0" - -#: src/dashboard_pi.cpp:4484 -msgid "Temperature units:" -msgstr "crwdns21181:0crwdne21181:0" - -#: src/dashboard_pi.cpp:4487 -msgid "Celsius" -msgstr "crwdns21183:0crwdne21183:0" - -#: src/dashboard_pi.cpp:4487 -msgid "Fahrenheit" -msgstr "crwdns21185:0crwdne21185:0" - -#: src/dashboard_pi.cpp:4487 -msgid "Kelvin" -msgstr "crwdns21187:0crwdne21187:0" - -#: src/dashboard_pi.cpp:4502 -msgid "Use N2K & SignalK true wind data over ground.\n" -"(Instead of through water)" -msgstr "crwdns26723:0crwdne26723:0" - -#: src/dashboard_pi.cpp:4983 -msgid "Add instrument" -msgstr "crwdns4006:0crwdne4006:0" - -#: src/dashboard_pi.cpp:4988 -msgid "Select instrument to add:" -msgstr "crwdns4007:0crwdne4007:0" - -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 -msgid "Preferences..." -msgstr "crwdns4008:0crwdne4008:0" - -#: src/dashboard_pi.cpp:5402 -msgid "Resize..." -msgstr "crwdns20398:0crwdne20398:0" - -#: src/dashboard_pi.cpp:5410 -msgid "Undock" -msgstr "crwdns12244:0crwdne12244:0" - -#: src/dashboard_pi.cpp:5973 -msgid "Choose font" -msgstr "crwdns20400:0crwdne20400:0" - -#: src/dashboard_pi.cpp:6080 -msgid "Title background color:" -msgstr "crwdns29254:0crwdne29254:0" - -#: src/dashboard_pi.cpp:6094 -msgid "Data background color:" -msgstr "crwdns29256:0crwdne29256:0" - -#: src/dashboard_pi.cpp:6115 -msgid "Arrow 1 Colour :" -msgstr "crwdns28994:0crwdne28994:0" - -#: src/dashboard_pi.cpp:6122 -msgid "Arrow 2 Colour :" -msgstr "crwdns28996:0crwdne28996:0" - -#: src/dashboard_pi.cpp:6143 -msgid "Set default" -msgstr "crwdns28998:0crwdne28998:0" - -#: src/dial.cpp:525 src/wind.cpp:69 src/wind_history.cpp:554 -msgid "NE" -msgstr "crwdns4009:0crwdne4009:0" - -#: src/dial.cpp:525 src/gps.cpp:267 src/wind.cpp:69 src/wind_history.cpp:558 -msgid "E" -msgstr "crwdns4010:0crwdne4010:0" - -#: src/dial.cpp:525 src/wind.cpp:69 src/wind_history.cpp:562 -msgid "SE" -msgstr "crwdns4011:0crwdne4011:0" - -#: src/dial.cpp:525 src/gps.cpp:271 src/wind.cpp:70 src/wind_history.cpp:566 -msgid "S" -msgstr "crwdns4012:0crwdne4012:0" - -#: src/dial.cpp:526 src/wind.cpp:70 src/wind_history.cpp:570 -msgid "SW" -msgstr "crwdns4013:0crwdne4013:0" - -#: src/dial.cpp:526 src/gps.cpp:275 src/wind.cpp:70 src/wind_history.cpp:574 -msgid "W" -msgstr "crwdns4014:0crwdne4014:0" - -#: src/dial.cpp:526 src/wind.cpp:70 src/wind_history.cpp:578 -msgid "NW" -msgstr "crwdns4015:0crwdne4015:0" - -#: src/instrument.cpp:400 -msgid " true" -msgstr "crwdns4016:0crwdne4016:0" - -#: src/instrument.cpp:402 -msgid " mag" -msgstr "crwdns4017:0crwdne4017:0" - -#: src/wind_history.cpp:54 src/wind_history.cpp:130 -msgid "-" -msgstr "crwdns26725:0crwdne26725:0" - -#: src/wind_history.cpp:410 -#, c-format -msgid "--- %s" -msgstr "crwdns8080:0%scrwdne8080:0" - -#: src/wind_history.cpp:552 -msgid "NNE" -msgstr "crwdns4018:0crwdne4018:0" - -#: src/wind_history.cpp:556 -msgid "ENE" -msgstr "crwdns4019:0crwdne4019:0" - -#: src/wind_history.cpp:560 -msgid "ESE" -msgstr "crwdns4020:0crwdne4020:0" - -#: src/wind_history.cpp:564 -msgid "SSE" -msgstr "crwdns4021:0crwdne4021:0" - -#: src/wind_history.cpp:568 -msgid "SSW" -msgstr "crwdns4022:0crwdne4022:0" - -#: src/wind_history.cpp:572 -msgid "WSW" -msgstr "crwdns4023:0crwdne4023:0" - -#: src/wind_history.cpp:576 -msgid "WNW" -msgstr "crwdns4024:0crwdne4024:0" - -#: src/wind_history.cpp:580 -msgid "NNW" -msgstr "crwdns4025:0crwdne4025:0" - -#: src/wind_history.cpp:792 -#, c-format -msgid " Max %.1f %s since %02d:%02d Overall %.1f" -msgstr "crwdns29000:0%.1fcrwdnd29000:0%scrwdnd29000:0%02dcrwdnd29000:0%02dcrwdnd29000:0%.1fcrwdne29000:0" - diff --git a/plugins/dashboard_pi/po/es_ES.po b/plugins/dashboard_pi/po/es_ES.po index b086a0adbb..50782d9701 100644 --- a/plugins/dashboard_pi/po/es_ES.po +++ b/plugins/dashboard_pi/po/es_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 20:51\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posición" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "Velocidad SOG" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "COG Mag" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "Compás GNSS" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Compás V" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Rumbo Verd." -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Rumbo Mag." -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Ang./vel. Viento Apar." -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Ángulo del viento ap. o real" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Vel. Viento Apar." -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Ang./vel. Viento Real" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Altitud" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Derrota Altitud" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Profundidad" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Presión barométrica" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temp. Agua" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temp. aire" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Ang. Viento Apar." -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Ang. Viento Real" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Dir. Viento Real" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Velocidad Viento Real" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Dir/Vel. Viento Real" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "Viento VMG" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Angulo Timón" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS en uso" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "Estado GNSS" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Reloj GNSS" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Salida/Ocaso" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Fase lunar" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Histórico de viento" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" -msgstr "Historial de presión" +msgstr "Histórico de presión" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Dist. viaje" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Dist. total" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Desde el propio barco" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Cabeceo" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Escora" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Reloj local GNSS" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Hora Local Sistema" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Salida/Ocaso Local" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "Humedad" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Tablero instrumentos" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "PlugIn \"Tablero de Instrumentos\" para OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "PlugIn \"Tablero de Instrumentos\" para OpenCPN\n" "Muestra un panel de instrumentos de navegación desde una fuente NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Arriba" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Abajo" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Estribor" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "babor" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Preferencias Tablero Instrumentos" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "muestra este tablero" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Nombre:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientación:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertical" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horizontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumentos" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Añadir" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "Editar" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Borrar" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Aspecto" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Fuentes" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Título:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Datos:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etiqueta:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Pequeño:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "Reiniciar:" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "Establecer fuentes por defecto de dashboard" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Unidades, Rangos y Formatos" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Max. valor velocímetro:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Factor de Atenuación Velocidad sobre Fondo:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Factor de Atenuación COG:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Diferencia Hora Local con UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Unidades velocidad barco:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "La seleccionada en OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Unidades profundidad:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metros" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Pie" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Brazas" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Pulgadas" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centímetros" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Corrección de sonda (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Unidades distancia:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Millas náuticas" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Milla terrestre" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilómetros" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Unidades vel. viento:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Unidades de temperatura:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Centígrado" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Usar datos de viento verdadero referente fondo de N2K & SignalK.\n" "(En lugar de vel. superficie)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Añadir instrumento" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Seleccionar instrumento a añadir:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Preferencias..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Redimensionar..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Desanclar" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Elegir Fuente" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "Color de fondo del título:" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "Color de fondo de datos:" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "Flecha 1 Color:" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "Flecha 2 Color:" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "Fijar por defecto" @@ -495,11 +499,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "real" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "mag" diff --git a/plugins/dashboard_pi/po/et_EE.po b/plugins/dashboard_pi/po/et_EE.po index b75bbec811..288451ede7 100644 --- a/plugins/dashboard_pi/po/et_EE.po +++ b/plugins/dashboard_pi/po/et_EE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Estonian\n" "Language: et_EE\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Asukoht" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Magn. COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS-kompass" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Tõeline kompass" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Tõeline HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Magn. HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Näiv tuule nurk ja kiirus" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Näiva % tegeliku tuule nurk" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Näiv tuule kiirus" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Tõeline tuule nurk ja kiirus" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Kõrgus" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Kõrguse jälg" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Sügavus" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Õhurõhk" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Vee temp." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Õhu temp." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Näiv tuule nurk" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Tõeline tuule nurk" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Tõeline tuule suund" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Tõeline tuule kiirus" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Tõeline tuule suund ja kiirus" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Roolinurk" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS pole kasutusel" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS olek" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Kursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS-kell" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Päikesetõus/-loojang" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Kuufaas" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Tuule logi" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Õhurõhu logi" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Reisi logi" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Kogu logi" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Omalt laevalt" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Pikiõõtsumine" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Kreen" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Kohalik GNSS-kell" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Kohalik CPU-kell" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Kohalik päikesetõus/-loojang" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Näidikupaneel" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Näidikupaneeli plugin OpenCPN'le" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Näidikupaneeli plugin OpenCPN'le\n" "Võimaldab navigatsiooniseadme kuvamise NMEA-allikast" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Üles" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Alla" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "p/p" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "v/p" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Näidikupaneeli eelistused" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "kuva seda näidikupaneeli" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Pealdis:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientatsioon:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "püstine" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "rõhtne" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Seadmed" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Lisa" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Kustuta" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Välimus" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Kirjamärgid" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "tiitel:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "andmed:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "silt:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Väike:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Ühikud, ulatused, formaadid" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "spidomeetri max väärtus:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Kiiruse põhja suhtes summutamise tegur:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG summutamise tegur:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Kohalik UTC-ajavahe:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "kaatri kiiruse ühikud:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "austa OpenCPN väärtusi" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "sõlmed" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mp/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "sügavuse ühikud:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "meetrid" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Jalad" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "süllad" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Tollid" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "sentimeetrid" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Sügavuse nihe (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "vahemaa ühikud:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "meremiilid" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "maamiilid" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "kilomeetrid" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "tuulekiiruse ühikud:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Temperatuuri ühikud:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Kasuta N2K & SignalK tegeliku tuule andmeid põhja suhtes.\n" "(Vee suhtes asemel)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Lisa seade" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Vali seade lisamiseks:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Eelistused..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Muuda suurust..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Vabasta" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Vali täht" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "tõel." -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "magn." diff --git a/plugins/dashboard_pi/po/fi_FI.po b/plugins/dashboard_pi/po/fi_FI.po index c212db788b..baea591102 100644 --- a/plugins/dashboard_pi/po/fi_FI.po +++ b/plugins/dashboard_pi/po/fi_FI.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 20:50\n" "Last-Translator: \n" "Language-Team: Finnish\n" "Language: fi_FI\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Sijainti" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "Nopeus SOG" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Magn COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS kompassi" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Kompassi" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Tosi HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Magn. HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Suht. tuulikulma ja tuulen nopeus" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Suht. ja tosituulikulma" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Suht. tuulen nopeus" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Tosituulikulma ja -tuulen nopeus" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Korkeus" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Korkeuden Jäljitys" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Syvyys" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Ilmanpaine" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Veden lämpötila" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Ilman lämpötila" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Suht. tuulikulma" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Tosituulikulma" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Tosituulen suunta" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Tosituulen nopeus" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Tosituulen suunta ja nopeus" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "VMG tuuli" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Peräsinkulma" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS satelliittejä" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS tila" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Kursori" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS-kello" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Auringon nousu- ja laskuaika, UTC" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Kuun vaihe" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Tuulihistoria" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Ilmanpaineen historia" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Osamatka" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Kokonaismatka" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Omasta aluksesta" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Nyökintä" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Kallistus" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Paikallinen GNSS-kello" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Paikallinen CPU kello" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Auringon nousu- ja laskuaika" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "Kosteus" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Mittaritaulu" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Mittaripaneeli OpenCPN:lle" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Mittaritaulu OpenCPN:lle\n" "Näyttää mittarit NMEA-tuloille." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Ylös" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Alas" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Oikea" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Vasen" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Mittaripaneelin asetukset" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Näytä tämä mittaritaulu" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Kuvateksti:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Näytön asento:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Pystysuora" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Vaakasuora" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Mittarit" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Lisää" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "Muokkaa" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "&Poista" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Ulkonäkö" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Kirjasimet" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Otsikko:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Tiedot:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Otsikko:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Pieni:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "Palauta:" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "Aseta mittaritaulun oletuskirjasimet" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Yksiköt, alueet, formaatit" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Nopeusmittarin maksimiarvo:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Nopeus pohjan suhteen vaimennuskerroin:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG vaimennuskerroin:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Paikallisen ajan ja UTC-ajan ero:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Veneen nopeuden yksiköt:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "OpenCPN pääasetukset" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "kn" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Syvyyden yksiköt:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metrit" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Jalat" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Sylet" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Tuumaa" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Senttimetriä" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Syvyyden poikkeama (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Välimatkan yksiköt:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "&meripeninkulmaa" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Maamailia" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "&kilometriä" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Tuulen nopeuden yksiköt:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Lämpötilayksikköt:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Käytä N2K & SignalK tosituulen tietoja pohjan suhteen.\n" "(veden suhteen sijaan)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Lisää mittari" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Valitse lisättävä mittari:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Asetukset..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Muuta kokoa..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Irrota" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Valitse fontti" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "Otsikon taustaväri:" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "Arvon taustaväri:" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "1. nuolen väri:" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "2. nuolen väri:" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "Aseta oletukseksi" @@ -495,11 +499,11 @@ msgstr "Länsi" msgid "NW" msgstr "Luode" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " tosi" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " magn." diff --git a/plugins/dashboard_pi/po/fil_PH.po b/plugins/dashboard_pi/po/fil_PH.po index f0446bc730..fcde02a44d 100644 --- a/plugins/dashboard_pi/po/fil_PH.po +++ b/plugins/dashboard_pi/po/fil_PH.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Filipino\n" "Language: fil_PH\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/fr_FR.po b/plugins/dashboard_pi/po/fr_FR.po index c21f1bce84..68b28c682f 100644 --- a/plugins/dashboard_pi/po/fr_FR.po +++ b/plugins/dashboard_pi/po/fr_FR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Position" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "Vitesse fond" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "Vitesse de surface" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Cap fond compas" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "Compas GNSS" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Compas vrai" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Cap vrai" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Cap compas" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "V. app. : Angle & vit." -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Angle du vent, apparent et vrai" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "V. app. : Vitesse" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "V. vrai : Angle & vit." -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "altitude" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "suivi altitude" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Profondeur" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Pression" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temp. de l'eau" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temp. air" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "V. app. : Angle" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "V. vrai : Angle" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "V. vrai : Direction" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "V. vrai : Vitesse" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "V. vrai : Direction & vit." -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "Vent VMG" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Angle de barre" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS en cours d'usage" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "Statut GNSS" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Curseur" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Horloge GNSS" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Soleil : Lever/Coucher (UTC)" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Phase de lune" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Historique du vent" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Pression : historique" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Log du voyage" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Distance cumulée" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Depuis votre bateau" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Tangage" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Angle de gite" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Horloge locale GNSS" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Horloge (Heure du PC)" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Soleil : Lever/Coucher (Horaire local)" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "Humidité" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "TABLEAU DE BORD" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "\"Tableau de bord\"" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Le complément \"Tableau de bord\" pour OpenCPN\n" "fournit des instruments de navigation qui exploitent les données NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Monter" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Descendre" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Trib." -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Bab." -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Préférences du tableau de bord" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Tableau de bord : Voir" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Titre :" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientation :" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertical" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horizontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instruments" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Ajouter" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "Éditer" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Supprimer" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Apparence" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Polices" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Titre :" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Données :" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Contenu :" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Petit :" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "RàZ:" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "Polices par défaut du tableau de bord : Définir" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Unités, Formats" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Valeur maximale du compteur de vitesse :" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "SOG : Facteur d'amortissement" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG : Facteur d'amortissement" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Heure locale Offset d’UTC :" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Unité de vitesse du bateau :" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Utiliser les choix faits dans OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Unités de profondeur : " -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Mètres" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Pieds" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Brasses" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Pouces" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centimètres" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Décalage de profondeur (%s) :" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Unités de distance :" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Mille nautiques" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Mille terrestre" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilomètres" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Unités de vitesse du vent :" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Unités de température" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Utiliser les données N2K & SignalK du vent reel sur le sol \n" "(plutot que sur l'eau)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Ajouter un instrument" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Sélectionnez l'instrument à ajouter :" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Préférences ..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Redimensionner..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Décrocher" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Choisir la police" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "Titre : Couleur du fond" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "Données, Couleur du fond :" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "Couleur Flèche 1 :" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "Couleur Flèche 2 :" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "Définir par défaut" @@ -495,11 +499,11 @@ msgstr "O" msgid "NW" msgstr "NO" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " vrai" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " magnét." diff --git a/plugins/dashboard_pi/po/gl_ES.po b/plugins/dashboard_pi/po/gl_ES.po index 97c5f34971..9cabf2fb92 100644 --- a/plugins/dashboard_pi/po/gl_ES.po +++ b/plugins/dashboard_pi/po/gl_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Galician\n" "Language: gl_ES\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posición" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "COG Mag" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Compás Verd." -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Rumbo Verd." -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Rumbo Mag." -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Ang./vel. Vento Apar." -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Ángulo do vento ap. ou real" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Vel. Vento Apar." -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Ang./vel. Vento Real" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Profundidade" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Presión barométrica" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temp. Auga" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temp. aire" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Ang. Vento Apar." -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Ang. Vento Real" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Dir. Vento Real" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Velocidade Vento Real" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Dir/Vel. Vento Real" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Angulo Temón" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Saída/Posta" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Fase luar" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Histórico do vento" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Historial barométrico" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Diario viaxe" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Dist. total" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Dende embarcación propia" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Ton" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Escora" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Hora Local Sistema" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Saída/Posta Sol Local" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Cadro de instrumentos" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "PlugIn \"Cadro de Instrumentos\" para OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "PlugIn \"Cadro de Instrumentos\" para OpenCPN\n" "Amosa un panel de instrumentos de navegación dende una fonte NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Preferencias Cadro de Instrumentos" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "mostra este cadro" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Lenda:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientación:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertical" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/he_IL.po b/plugins/dashboard_pi/po/he_IL.po index a9065dd61b..61d69dc174 100644 --- a/plugins/dashboard_pi/po/he_IL.po +++ b/plugins/dashboard_pi/po/he_IL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hebrew\n" "Language: he_IL\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/hi_IN.po b/plugins/dashboard_pi/po/hi_IN.po index 9f0eef2858..2cac84f597 100644 --- a/plugins/dashboard_pi/po/hi_IN.po +++ b/plugins/dashboard_pi/po/hi_IN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hindi\n" "Language: hi_IN\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/hu_HU.po b/plugins/dashboard_pi/po/hu_HU.po index 11aaa0e272..8a6b495b86 100644 --- a/plugins/dashboard_pi/po/hu_HU.po +++ b/plugins/dashboard_pi/po/hu_HU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hungarian\n" "Language: hu_HU\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "É" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Pozíció" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS Kompassz" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Valós Kompassz" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "True HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Mag HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Látszólagos szél irány és sebesség" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Valós szél irány" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Látszólagos szél sebesség" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Valós szél irány és sebesség" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Mélység" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Légköri nyomás" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Víz hőmérséklet" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Levegő hőmérséklet" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Látszólagos szél irány" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Valós szél irány" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Valós szél irány" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Valós szél sebesség" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Valós szél irány és sebesség" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Kormánylapát szög" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS használatban" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS státusz" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Kurzor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS idő" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "napkelte / napnyugta" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "holdfázis" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Szél előzmények" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Korábbi légnymás" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Út távolság" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Öszesített távolság" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Saját hajótól" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Bólintás" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Dőlés" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Helyi GNSS idő" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Helyi CPU idő" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Helyi napkelte / napnyugta" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Műszerfal" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "OpenCPN műszerfal plugin" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "OpenCPN Műszerfal plugin\n" "NMEA forrásból navigációs adatokat jelenít meg." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "fel" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "le" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Steuerbord" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Backbord" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Műszerfal beállítások" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "mutassa ezt a műszerfalat" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Felirat:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientáció:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Függőleges" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Vízszintes" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Műszerek" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Hozzáad" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Törlés" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Megjelenítés" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Betűtípusok" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Cím:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Adat:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Címke:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Kicsi:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Mértékegységek, értéktartományok, formátumok" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Sebességmérő max értéke:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Földfelszíni sebesség (SOG) csillapítási érték:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG csillapítási tényező:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Helyi idő eltérése UTC-től:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Hajó sebsség mértékegysége:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "OpenCPN beállítások betartás" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "csomó" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Mélység mértékegységek:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Méter" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "láb" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Öl" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "hüvelyk" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centiméter" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Mélység eltolás (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Távolság mértékegysége:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Tengeri mérföld" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Mérföld" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "kilóméter" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Szélsebesség mértékegysége:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Hőmérséklet mértékegység:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Farenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Műszer hozzáadása" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Válaszd ki a hozzáadni kívánt műszert:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Beállítások..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Átméretezés..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Rögzítés feloldása" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Betűtípus kiválasztása" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "Ny" msgid "NW" msgstr "ÉNY" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " valós" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " mágneses" diff --git a/plugins/dashboard_pi/po/id_ID.po b/plugins/dashboard_pi/po/id_ID.po index 38df4e7e26..39a6c982f3 100644 --- a/plugins/dashboard_pi/po/id_ID.po +++ b/plugins/dashboard_pi/po/id_ID.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Indonesian\n" "Language: id_ID\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posisi" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Kompas benar" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "HDG benar" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Mag HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Aplikasi. Sudut Angin & Kecepatan" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Aplikasi & Sudut Angin Benar" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Aplikasi. Kecepatan angin" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Sudut Angin Benar & Kecepatan" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Kedalaman" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Tekanan barometrik" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Suhu air." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Suhu udara." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Aplikasi. sudut angin" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Sudut Angin Benar" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Arah Angin Benar" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Kecepatan Angin Benar" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Benar Angin Dir. & Kecepatan" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Sudut Kemudi" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Kursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Matahari terbit/Matahari terbenam" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Tahap bulan" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Sejarah angin" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Sejarah barometrik" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Catat Perjalanan" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Catat Jumlah" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Dari Kepemilikan" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Nada" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Hak" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Lokasi Jam CPU" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Lokasi Matahari terbit/Matahari terbenam" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Dasbor" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Plugin Dasbor untuk OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Plugin Dasbor untuk OpenCPN\n" "Menyediakan tampilan alat navigasi dari sumber NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Atas" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Turun" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Preferensi dasbor" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "tunjukkan dasbor ini" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Keterangan:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientasi:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertikal" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horisontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumen" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Tambah" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Hapus" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Penampilan" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Font" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Judul:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Data:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Label:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Kecil:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Unit, Rentang, Format" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Nilai maks speedometer:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Kecepatan di atas tanah faktor redaman:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG Faktor Redaman:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Waktu Lokal Offset Dari UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Unit kecepatan perahu:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Kehormatan pengaturan OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/dtk" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Unit Kedalaman:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Meter" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Kaki" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Fathoms" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Inci" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Sentimeter" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Unit jarak jauh:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Mil laut" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Undang-undang mil" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilometer" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Unit kecepatan angin:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Tambahkan instrumen" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Pilih instrumen untuk ditambahkan:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Preferensi..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " benar" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " mag" diff --git a/plugins/dashboard_pi/po/is_IS.po b/plugins/dashboard_pi/po/is_IS.po index 08b17b3bd5..b2d7f5efd0 100644 --- a/plugins/dashboard_pi/po/is_IS.po +++ b/plugins/dashboard_pi/po/is_IS.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Icelandic\n" "Language: is_IS\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Staðsetning" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Dýpi" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Vatnshiti." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Lofthiti." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Kross" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Sólsetur/sólarupprás" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Halli" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Stjórnborð" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Stjórnborðsviðbót viðbót fyrir OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Upp" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Niður" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Stjórnborðs stilliningar" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "sýna þetta stjórnborð" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Lóðrétt" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Lárétt" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Verkfæri" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Bæta við" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Eyða" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Letur" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Hraðaeiningar báts:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Hn" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "míl/klst" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/t" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Dýptar einingar:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metrar" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Fet" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Tommur" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Sentimetrar" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Dýptar hliðrun (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kílómetrar" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Mælieiningar vinds:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "V" msgid "NW" msgstr "NV" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " satt" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/it_IT.po b/plugins/dashboard_pi/po/it_IT.po index 6871f6b905..0eb3697cd0 100644 --- a/plugins/dashboard_pi/po/it_IT.po +++ b/plugins/dashboard_pi/po/it_IT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posizione" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "Bussola GNSS" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Bussola" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "Velocità" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Prua vera" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Prua magnetica" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Angolo & Veocità Vento apparente" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Angolo vento apparente/vero" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Velocità Vento apparente" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Angolo & Veocità Vento vero" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "altitudine" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Traccia Altitudine" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Profondità" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Pressione barometrica" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temp. Aqua" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temp. aria" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Angolo Vento apparente" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Angolo Vento vero" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "direz. Vento vero" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Velocità Vento vero" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Dir. & Velocità Vento vero" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Angolo di barra" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS in uso" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "Stato GNSS" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursore" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Orologio GNSS" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "alba/tramonto" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Fase lunare" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Storico del vento" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Storico barometrico" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Registro di viaggio" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Totale Viaggio" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Dalla propria barca" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Beccheggio" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Inclinazione laterale" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Ora locale GNSS" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Ora locale CPU" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Alba/Tramonto locale" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Pannello" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Dashboard PlugIn per OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Dashboard PlugIn per OpenCPN\n" "Mostra strumenti di navigazione dai dati NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Su" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Giù" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Dritta" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Babordo" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Preferenze Dashboard" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Visualizza questo pannello" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Didascalia:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientazione:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "verticale" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Orizzontale" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Strumenti" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Aggiungi" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Cancella" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Aspetto" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Caratteri" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Titolo:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Dati:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etichetta:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Piccolo:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Unità, Scale, formati" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Velocità massima Tachimetro" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Filtro SOG:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Filtro COG:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Differenza UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Unità di velocità barca:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Accettare le impostazioni di OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mi/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Unità di profondità:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metri" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Piedi (1 feet=0.305m)" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Fathoms (1 F=1.83m)" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Pollici" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centimetri" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Differenza di profondità (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Unità di misura di distanza:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Miglia Nautiche" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Miglia terrestri" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Chilometri" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Unità di misura velocità Vento" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Unità di misura temperatura:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Usa N2K & SignalK dati del vento vero fondo del mare.\n" "(Invece di attraverso l'acqua)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Aggiungi Strumento" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Seleziona uno strumento da aggiungere:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Preferenze..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Ridimensiona..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Sgancia" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Scegli font" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "O" msgid "NW" msgstr "NO" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " Vera" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " Magnetica" diff --git a/plugins/dashboard_pi/po/ja_JP.po b/plugins/dashboard_pi/po/ja_JP.po index 6dae9dcdb2..4b1384b857 100644 --- a/plugins/dashboard_pi/po/ja_JP.po +++ b/plugins/dashboard_pi/po/ja_JP.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Japanese\n" "Language: ja_JP\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "位置" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "True Compass" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "真 HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "磁気 HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "見かけの風の角度と速度" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "見かけと真の風の角度" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "見かけの風速" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "真の風の角度と速度" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "深渡" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "気圧" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "水温" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "気温" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "見かけの風の角度" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "真の風の角度" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "真の風向" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "真の風速" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "真の風向と風速" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "舵角" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "カーソル" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "日の出/日の入り" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "月齢" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "風の記録" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "気圧の記録" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "トリップ ログ" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "合計ログ" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "自船 から" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "ピッチ" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "ヒール" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "ローカルなCPUの時計" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "地元の日の出/日の入り" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "ダッシュボード" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "OpenCPN 用ダッシュ ボードプラグイン" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "OpenCPN 用ダッシュ ボードプラグイン\n" "装置の表示はNMEAソースから表示します。" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "上へ" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "下へ" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "ダッシュ ボード設定" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "このダッシュ ボードを表示" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "タイトル:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "配置方向" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "縦" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "横" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "計器" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "追加" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "削除" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "表示関連" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "フォント" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "タイトル:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "データ:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "ラベル:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Small:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "ユニット、範囲、フォーマット" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "スピード メーターの最大値:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Speed Over Ground Damping Factor:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG Damping Factor:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "UTCとの時差" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "船の速度の単位:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Honor OpenCPN settings" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "深さの単位:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "メートル" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "フィート" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "尋" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "インチ" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "センチメートル" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "水深のオフセット(%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "距離の単位:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "海里" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "法定マイル" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "キロメートル" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "風速単位:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "機器を追加します。" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "追加する計器を選択します。" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "設定" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " 真" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " 磁気" diff --git a/plugins/dashboard_pi/po/ko_KR.po b/plugins/dashboard_pi/po/ko_KR.po index 8a63932a16..56f35e5d79 100644 --- a/plugins/dashboard_pi/po/ko_KR.po +++ b/plugins/dashboard_pi/po/ko_KR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Korean\n" "Language: ko_KR\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "북" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "위치" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "대지속력" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "실침로" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "자기 실침로" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "위성항법시스템(GNSS) 나침반" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "실제 나침반" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "대수속력" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "실제 선수방향" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "자기 선수방향" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "바람 각 및 속도 앱" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "앱과 참바람 각" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "풍속 앱" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "참바람 각과 속도" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "수심" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "기압" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "수온" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "기온" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "바람 각 앱" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "참바람 각" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "참바람 방향" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "참바람 속도" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "참바람 방향과 속도" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "최적 속력" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "방향타 각" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "위성항법시스템(GNSS) 사용 중" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "위성항법시스템(GNSS) 상태" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "커서" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "위성항법시스템(GNSS) 시계" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "일출/일몰" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "달의 위상" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "바람 기록" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "기압 기록" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "여정 일지" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "일지 합계" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "자선에서" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "배가 위아래로 흔들리기" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "배가 좌우로 기울기" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "로컬 자동항법시스템(GNSS) 시계" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "로컬 CPU 시계" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "로컬 일출/일몰" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "계기반" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "OpenCPN용 계비반 플러그인 " -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "OpenCPN용 계기반 플러그인\n" "NMEA 소스에서 탐색 장비 디스플레이를 제공합니다." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "위로" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "아래로" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "우현" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "좌현" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "계기반 기본 설정" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "이 계기반 보이기" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "표제:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "방향" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "수직" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "수평" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "계기" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "추가" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "삭제" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "겉보기" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "글꼴" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "제목:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "데이터:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "라벨:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "작은:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "단위, 범위, 형식" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "속도계 최대 값" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "대지속력 감쇠 인수:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "실침로 감쇠 인수:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "세계협정시(UTC)로부터 지역 시간 옵셋" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "보트 속력 단위:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "OpenCPN 설정 존중" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "노트" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "마일/시간" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "킬로미터/시간" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "미터/초" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "수심 단위:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "미터" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "피트" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "패덤" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "인치" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "센티미터" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "수심 옵셋 (%s)" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "거리 단위:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "해리" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "법정 마일" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "킬로미터" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "풍속 단위:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "온도 단위:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "섭씨" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "화씨" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "절대온도" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "계기 추가" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "추가할 계기 선택" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "기본 설정..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "크기 조정..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "분리" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "글꼴 선택" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "서" msgid "NW" msgstr "북서" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "참" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "자기" diff --git a/plugins/dashboard_pi/po/mr_IN.po b/plugins/dashboard_pi/po/mr_IN.po index 50f7652c67..18393cded9 100644 --- a/plugins/dashboard_pi/po/mr_IN.po +++ b/plugins/dashboard_pi/po/mr_IN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Marathi\n" "Language: mr_IN\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/nb_NO.po b/plugins/dashboard_pi/po/nb_NO.po index 6b31f6ef8b..257c3913b3 100644 --- a/plugins/dashboard_pi/po/nb_NO.po +++ b/plugins/dashboard_pi/po/nb_NO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posisjon" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS kompass" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Sann kompass" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Sann HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Mag. HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Tils. vind vinkel & fart" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Tils. & sann vindvinkel" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Tils. Vindhastighet" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Sann Vindvinkel & fart" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Høyde" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Høydespor" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Dybde" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Lufttrykk" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Vanntemp." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Luft temp." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Tils. Vindvinkel" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Sann Vindvinkel" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Sann Vindretning" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Sann Vindhastighet" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Sann Vindretning & fart" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Rorvinkel" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS i bruk" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS Status" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Kursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS Klokke" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Sol opp/ned" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Månefase" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Vind histogram" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Barometer histogram" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Turlogg" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Sumlogg" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Fra eget skip" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Stamp" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Helling" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Lokal GNSS klokke" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Lokal CPU klokke" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Lokal sol opp/ned" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Instrumentpanel" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Instrumentutvidelse for OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Instrument utvidelse for OpenCPN\n" "Tilfører navigasjons instrument visning fra NMEA kilder." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Opp" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Ned" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Stbd" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "B.Bord" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Dashbord alternativer" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "vis dette instrumentpanel" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Overskrift:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Retning:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertikal" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horisontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumenter" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Legg til" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Slett" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Utseende" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Skrift" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Tittel:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Data:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etikett:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Liten:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Enheter, Avstander, Formater" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Speedometer maks verdi:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Fart over grunn dempefaktor:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG dempefaktor:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Lokal tidsforskyvning fra UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Båtens fartenheter:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "OpenCPN ære innstillinger" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Knop" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/t" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Dybde enheter:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Meter" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Fot" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Favner" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Tommer" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centimeter" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Dybde forskyvning (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Distanseenheter:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Nautiske mil" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Statute mil" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilometer" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Fartsenheter for vind:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Temperaturenheter" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celcius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Bruk N2K & SignalK sanne vinddata over grunn.\n" "(I stedet for gjennom vann)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Legg til instrument" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Velg instrument:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Alternativer..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Endre størrelse..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Løsne" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Velg skrifttype" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "V" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " sann" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " mag" diff --git a/plugins/dashboard_pi/po/nl_NL.po b/plugins/dashboard_pi/po/nl_NL.po index 4c26ee442f..4d59c57d67 100644 --- a/plugins/dashboard_pi/po/nl_NL.po +++ b/plugins/dashboard_pi/po/nl_NL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Positie" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "Grondvaart (Vgr)" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "Grondkoers (GrK, W)" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Grondkoers (M!)" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS Kompas" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Kompaskoers" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "Vaart door water (V)" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Koers (W)" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Voorliggende koers (M)" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Schijnbare wind" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Sch. & Ware Windhoek" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Schijnb. windsnelheid" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Ware wind" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Hoogte" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Hoogte tracering" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Diepte" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Luchtdruk" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Watertemperatuur" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Luchttemperatuur" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Schijnb. windhoek" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Ware windhoek" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Ware windrichting" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Ware windsnelheid" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Ware wind" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "Grondvaart" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Roerstand" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS in gebruik" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS Status" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS klok" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Zon op/onder" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Maanfase" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Windhistorie" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Luchtdrukhistorie" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Verheid trip" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Verheid totaal" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Vanaf eigen vaartuig" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Stamphoek" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Helling" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Lokale GNSS Klok" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Lokale CPU-klok" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Lokale zonsopgang en -ondergang" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Instrumentenpaneel" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Dashboard PlugIn voor OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Dashboard PlugIn voor OpenCPN\n" "Geeft navigatie-instrumenten weer op basis van NMEA gegevens." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Omhoog" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Omlaag" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Stuurboord" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Bakboord" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Voorkeuren Dashboard" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Toon dit paneel" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Naam:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Oriëntatie:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "verticaal" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "horizontaal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumenten" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Toevoegen" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Wissen" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Uiterlijk" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Lettertypes" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Naam:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Gegevens:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Label:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Klein:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Eenheden" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Snelheidsmeter max waarde:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Dempingsfactor voor Vgr:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Dempingsfactor voor GrK:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Lokaal verschil met UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Eenheid voor bootsnelheid:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "volg OpenCPN-instellingen" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "knopen" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/u" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Diepte-eenheid:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "meter" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "voet" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "vadem" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "inch" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "cm" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Diepte Offset (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Eenheid voor afstand:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "zeemijl" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "landmijl" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "kIlometer" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Eenheid voor windsnelheid:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Eenheid temperatuur" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Gebruik N2K & SignalK ware wind over de grond.\n" "(In plaats van door water)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Voeg instrument toe" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Kies toe te voegen instrument:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Voorkeuren..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Formaat wijzigen" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Afvaren" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Kies lettertype" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "waar" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " magnetisch" diff --git a/plugins/dashboard_pi/po/pl_PL.po b/plugins/dashboard_pi/po/pl_PL.po index d70508f75c..12b3241e11 100644 --- a/plugins/dashboard_pi/po/pl_PL.po +++ b/plugins/dashboard_pi/po/pl_PL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Pozycja" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "KDD" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "KDD -dekl." -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "\"kompas\" GNSS" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "\"kompas\" KR" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "Prędkość po wodzie (STW)" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "KR (kurs rzecz.)" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "KM (kurs magn.)" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Wiatr poz. - kąt i prędkość " -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Kąt wiatru pozor. i rzecz. " -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Prędkość wiatru pozornego" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Wiatr rzecz. - kąt i prędkość " -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Wysokość" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Wysokość - historia" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Głębokość" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Ciśnienie barometr." -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temp. wody" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temp. powietrza" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Kąt wiatru pozornego" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Kąt wiatru rzeczywistego" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Kierunek wiatru rzeczywistego" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Prędkość wiatru rzeczywistego" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Kier. i prędkośc wiatru rzeczywistego" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Kąt wychylenia steru" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "używane satelity GNSS" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "status satelitów GNSS" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "pozycja kursora" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Czas GNSS" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Wschód / zachód słońca UT" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Faza księżyca" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Wiatr - historia" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Ciśnienie - historia" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Stan logu podróży" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Sumaryczny stan logu" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Od naszego statku" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Kąt trymu kadłuba" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Przechył boczny" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Czas lokalny z GNSS" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Czas lokalny z komputera" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Wschód / zachód słońca LT" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Tablica wskaźników" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Wtyczka obsługi tablic wskaźników do OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Wtyczka obsługi tablic wskaźników do OpenCPN\n" " wyświetla dane ze wskaźników NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "W górę" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "W dół" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "PB" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "LB" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Ustawienia tablic wskaźników" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "pokaż tę tablicę wskaźników" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Nazwa tablicy wskaźników:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientacja:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "pionowa" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "pozioma" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumenty" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Dodaj" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Usuń" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Wygląd" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Czcionka" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Tytuł:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Dane:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etykieta:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Małe:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Jednostki, zakresy, formaty" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Wartość maksymalna prędkościomierza:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Prędkość nad dnem, współczynnik opóźnienia:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "KDD, współczynnik opóźnienia:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Przesunięcie czasu lokalnego do UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Jednostka prędkości łodzi:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "zgodnie z ustawieniami OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "węzły" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mile/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Jednostki głębokości:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "metry" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "stopy" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "sążnie" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "cale" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "centymetry" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Offset dla głębokości (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Jednostka odległości:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "mile morskie" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "mile angielskie" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "kilometry" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Jednostki prędkości wiatru:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Jednostki temperatury:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "° Celsjusza" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "° Fahrenheita" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "kelwiny" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Użyj wiatru rzeczywistego nad ziemią z N2K & SignalK \n" "(zamiast nad wodą)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Dodaj instrument" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Wybierz instrument do dodania:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Ustawienia..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Zmiana rozmiaru..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Odepnij" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Wybierz czcionkę" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " rzeczywisty" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " magnetyczny" diff --git a/plugins/dashboard_pi/po/pt_BR.po b/plugins/dashboard_pi/po/pt_BR.po index 16a8a7aa42..63020b79cd 100644 --- a/plugins/dashboard_pi/po/pt_BR.po +++ b/plugins/dashboard_pi/po/pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posição" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "Bússola GNSS" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Verdadeira bússola" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Verdadeiro HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Magnético HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Velocidade e ângulo do vento aparente" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Angulo do vento Aparente e Verdadeiro" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Velocidade do vento aparente" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Velocidade e ângulo do vento verdadeiro" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Profundidade" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Pressão barométrica" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temperatura da água." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temperatura do ar." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Ângulo do vento aparente" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Angulo do vento verdadeiro" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Direção do vento verdadeiro" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Velocidade do vento verdadeira" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Dir. do vento verdadeiro & velocidade" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Ângulo do leme" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS em uso" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS Status" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Relógio GNSS" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Nascer/pôr do sol" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Fase da lua" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Histórico do vento" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Histórico barométrica" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Log de viagem" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Soma Log" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Do Próprio Barco" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Pitch" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Salto" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Relógio Local GNSS" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Relógio local CPU" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Nascer/Pôr do sol Local" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Painel de controle" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Dashboard PlugIn for OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "PlugIn Dashboard OpenCPN\n" "Fornece a exibição de instrumentos de navegação da fonte NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Para cima" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Para baixo" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Boreste" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Bombordo" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Dashboard preferences" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "mostrar este painel" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Legenda:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "orientação:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertical" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horizontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumentos" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Adicionar" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Apagar" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Aparência" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Fontes" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Título:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Dados:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etiqueta:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Pequeno:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Unidades, Intervalos, Formatos" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Valor máximo do velocímetro:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Velocidade sobre solo, fator de amortecimento:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG Fator de amortecimento:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Deslocamento da hora local da UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Unidades de velocidade do barco:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Configurações do OpenCPN de honra" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "KTs" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Unidades de Profundidade:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metros" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Pés" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Braças" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Polegadas" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centímetros" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Diferença de Profundidade (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Unidades de distância:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Milhas Náuticas" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Milhas Regulamento" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Quilômetros" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Unidades de velocidade do vento:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Unidade de temperatura" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Adicionar instrumento" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Selecione instrumento para adicionar:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Preferências..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Redimensionar..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Desancorar" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Escolha a fonte" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "W" msgid "NW" msgstr "NW" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " Verdadeiro" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " Magnético" diff --git a/plugins/dashboard_pi/po/pt_PT.po b/plugins/dashboard_pi/po/pt_PT.po index 2a77853066..66308aaa94 100644 --- a/plugins/dashboard_pi/po/pt_PT.po +++ b/plugins/dashboard_pi/po/pt_PT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Portuguese\n" "Language: pt_PT\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Posição" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "Velocidade Verdadeira (SOG)" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Mag COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "Agulha GNSS" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Verdadeira bússola" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Verdadeiro HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Magnético HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Velocidade e ângulo do vento aparente" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Angulo do vento Aparente e Verdadeiro" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Velocidade do vento aparente" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Velocidade e ângulo do vento verdadeiro" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Altitude" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Seguir Altitude" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Profundidade" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Pressão barométrica" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Temperatura da água." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Temperatura do ar." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Ângulo do vento aparente" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Angulo do vento verdadeiro" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Direção do vento verdadeiro" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Velocidade do vento verdadeira" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Dir. do vento verdadeiro & velocidade" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Ângulo do leme" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS em uso" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "Estado GNSS" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Cursor" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Relógio GNSS" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Nascer/pôr do sol" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Fase da lua" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Histórico do vento" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Histórico barométrica" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Log de viagem" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Soma Log" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Do Próprio Barco" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Passo" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Inclinação" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Relógio GNSS local" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Hora Local Sistema" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Nascer/Pôr do Sol Local" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Painel de controle" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Plugin Dashboard para OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "PlugIn Dashboard OpenCPN\n" "Fornece a exibição de instrumentos de navegação da fonte NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Para cima" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Para baixo" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Estibordo" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Bombordo" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Dashboard preferencias" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "mostrar este painel" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Legenda:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "orientação:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertical" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horizontal" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrumentos" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Adicionar" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Apagar" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Aparência" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Fontes" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Título:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Dados:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etiqueta:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Pequeno:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Unidades, Intervalos, Formatos" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Valor máximo do velocímetro:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Velocidade sobre solo, fator de amortecimento:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG Fator de amortecimento:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Diferença da hora local para UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Unidades de velocidade do barco:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Configurações do OpenCPN de honra" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "KTs" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/h" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Unidades de Profundidade:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metros" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Pés" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Braças" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Polegadas" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centímetros" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Diferença de Profundidade (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Unidades de distância:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Milhas Náuticas" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Milhas Regulamento" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Quilômetros" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Unidades de velocidade do vento:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Unidades de temperatura:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Use dados de vento verdadeiro N2K & SinalK sobre o solo.\n" "(Em vez de sobre a água)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Adicionar instrumento" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Selecione instrumento para adicionar:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Preferências..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Redimensionar..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Desancorar" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Escolher Tipo Letra" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "O" msgid "NW" msgstr "NO" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " Verdadeiro" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " Magnético" diff --git a/plugins/dashboard_pi/po/ro_RO.po b/plugins/dashboard_pi/po/ro_RO.po index 03e76a77c2..a749918307 100644 --- a/plugins/dashboard_pi/po/ro_RO.po +++ b/plugins/dashboard_pi/po/ro_RO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Romanian\n" "Language: ro_RO\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/ru_RU.po b/plugins/dashboard_pi/po/ru_RU.po index 8fc7d33a71..d5f453f8e3 100644 --- a/plugins/dashboard_pi/po/ru_RU.po +++ b/plugins/dashboard_pi/po/ru_RU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -22,448 +22,452 @@ msgstr "" msgid "N" msgstr "С" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Местоположение" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "Скорость (SOG)" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "Ист. Путь (COG)" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Маг. Путь (COG)" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "Компасс ГНСС" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Ист. Компас" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "Скорость (STW)" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Ист. Направление (HDT)" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Маг. Направление (HDM)" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Вымп. угол и скор. ветра" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Вымп. и Ист. угол ветра" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Вымп. скорость ветра" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Ист. угол и скор. ветра" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Высота" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Диапазон высот" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Глубина" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Атмосферное давление" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Температура воды" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Температура воздуха" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Вымп. угол ветра" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Ист. угол ветра" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Ист. направл. ветра" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Ист. скорость ветра" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Ист. направл. и скор. ветра" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "Эффект. скорость (VMG)" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Угол перекладки руля" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "Видимых спутников" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "Состояние ГНСС" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Координаты курсора" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "Часы ГНСС" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Восход - Закат (UTC)" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Фаза луны" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "История ветра" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "История давления" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Журнал плавания" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Итоговый журнал" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Пеленг и Дистанция" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Дифферент" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Крен" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Часы (Местное)" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Часы (Местное)" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Восход - Закат (Местное)" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Приборная панель" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Модуль «Приборная панель» для OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Модуль «Приборная панель» для OpenCPN\n" "Отображает показания навигационных инструментов NMEA." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Вверх" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Вниз" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Прав. Борт" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Лев. Борт" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Настройки приборной панели" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Показать эту панель" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Название:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Ориентация:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Вертикально" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Горизонтально" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Инструменты" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Добавить" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Удалить" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Внешний вид" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Шрифты" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Заголовок:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Данные:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Подпись:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Мелкий текст:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Единицы измерения, форматы" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Предел спидометра:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Коэффициент затухания SOG:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Коэффициент затухания COG:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Смещение Локального Времени от UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Единицы скорости судна:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "из OpenCPN" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "уз." -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "миль/ч" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "км/ч" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "м/с" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Единицы глубины:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "м" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "фут" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "саж." -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "дюйм" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "см" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Поправка Глубины (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Единицы расстояния:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "м. м." -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "с. м." -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "км" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Единицы скорости ветра:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Единицы температуры:" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Цельсий" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Фаренгейт" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Кельвин" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Использовать данные истинного ветра N2K и SignalK относительно земли.\n" "(Вместо воды)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Добавить инструмент" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Выберите инструмент для добавления:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Настройки..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Изменение размера..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Отстыковать" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Выбор шрифта" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -495,11 +499,11 @@ msgstr "З" msgid "NW" msgstr "СЗ" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " ист." -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr " " diff --git a/plugins/dashboard_pi/po/sv_SE.po b/plugins/dashboard_pi/po/sv_SE.po index f8538111a7..aceebb311e 100644 --- a/plugins/dashboard_pi/po/sv_SE.po +++ b/plugins/dashboard_pi/po/sv_SE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 20:51\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Position" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "Fart -g SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "Fart SOG" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "Fart STW" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "Kurs COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Magnetisk COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "GNSS-Kurs" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Kompass sann" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "Fart -v STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Kurs sann" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Kurs magn" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Vind-vinkel-styrka Skenbar " -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Vind Skenb. Sann " -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Vindstyrka Skenbar" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Vind-vinkel-styrka Sann" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "Höjd" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "Höjdhistorik" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Djup" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Lufttryck" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Vattentemperatur" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Lufttemp." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Vindvinkel Skenbar" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Vindvinkel Sann" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Vindriktning Sann" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Vindstyrka Sann" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Vind-riktn.-styrka Sann" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "VMG Vind" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Rodervinkel" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "GNSS använda" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "GNSS Status" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Markör" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "GNSS Klocka" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Soluppgång/Solnedgång" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Månfas" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Vindhistorik" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Lufttryckshistorik" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Triplogg" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Sumlogg" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Från egen båt" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Stigning" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "Krängning" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "Lokal GNSS-klocka" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Lokal datorklocka" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Lokal Soluppgång/Solnedgång" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "Luftfuktighet" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Instrumentpanel" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "Instrumentpanel för OpenCPN" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "Instrumentpanel för OpenCPN\n" "Visar navigationsinstrument baserade på tillgänglig NMEA-information." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Upp" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Ner" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "Sb" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "Bb" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Inställningar" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Visa den här panelen" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Titel:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Orientering:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Vertikal" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Horisontell" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Instrument" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Lägg till" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "Redigera" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Ta bort" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Utseende" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Typsnitt" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Titel:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Data:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Beskrivning:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Liten:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "Återställ:" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "Ange standardtypsnitt för instrumentpanelen" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Enheter, avstånd, format" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Hastighetsmätare max värde:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Dämpningsfaktor för fart över grund, SOG:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "Dämpningsfaktor för kurs över grund COG:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "Lokal tidsförskjutning från UTC:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Enhet för båthastighet:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "Föredra OpenCPN inställningar" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Knop" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/t" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr " Djupenhet: " -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Meter" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Fot" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Famnar" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Tum" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Centimeter" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "Djupjustering (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Enhet för avstånd:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Nautiska mil" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Eng. Mile" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilometer" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Enhet för vindstyrka:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "Temperaturenhet" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "Celsius" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "Kelvin" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "Använd SignalK sann vinddata över grund. (Istället för genom vattnet)" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Lägg till instrument" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Välj instrument att lägga till:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Inställningar..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "Ändra storlek..." -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "Ta bort låsning" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "Välj teckensnitt" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "Titel bakgrundsfärg:" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "Data bakgrundsfärg:" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "Visare 1 Färg :" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "Visare 2 Färg :" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "Ange standard" @@ -494,11 +498,11 @@ msgstr "V" msgid "NW" msgstr "NV" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " sann" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "mag" diff --git a/plugins/dashboard_pi/po/th_TH.po b/plugins/dashboard_pi/po/th_TH.po index d419e4a453..96edea0552 100644 --- a/plugins/dashboard_pi/po/th_TH.po +++ b/plugins/dashboard_pi/po/th_TH.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Thai\n" "Language: th_TH\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/tr_TR.po b/plugins/dashboard_pi/po/tr_TR.po index 01efc1ef7a..adba4aec1a 100644 --- a/plugins/dashboard_pi/po/tr_TR.po +++ b/plugins/dashboard_pi/po/tr_TR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "K" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Mevki" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "SOG" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "COG" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "Manyetik COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "Gerçek Pusula" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "STW" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "Gerçek HDG" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "Manyetik HDG" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "Nispi Rüzgar Açısı & Hızı" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "Nispi & Hakiki Rüzgar Açısı" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "Nispi Rüzgar Hızı" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "Hakiki Rüzgar Açısı & Hızı" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Derinlik" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "Barometrik Basınç" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Su Sıcaklığı" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Hava Sıcaklığı" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "Nispi Rüzgar Açısı" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Hakiki Rüzgar Açısı" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Hakiki Rüzgar Yönü" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Hakiki Rüzgar Hızı" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Hakiki Rüzgar Yönü&Hızı" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "VMG" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "Düzmen Açısı" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Fare" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Gündoğumu/Günbatımı" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Ay Dönümü" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Rüzgar Geçmişi" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "Barometre Geçmişi" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Yolculuk Kütüğü" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "Toplam Kütük" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "Teknemden" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Eğim" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "Yerel CPU Saati" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "Yerel Gün Doğumu/Batımı" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Gösterge Paneli" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "OpenCPN için Gösterge Paneli Eklentisi" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "OpenCPN için Gösterge Paneli Eklentisi\n" "NMEA kaynağından aldığı seyir verilerini gösterir." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "Yukarı" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "Aşağı" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Gösterge PAneli YApılandırması" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "Bu gösterge panelini göster." -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Başlık:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Yönelim:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Dikey" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Yatay" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Aletler" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Ekle" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "Sil" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "Görünüm" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "Harf biçimi" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "Ünvan:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "Veri:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "Etiket:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "Küçük:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "Birimler, Aralıklar, Biçimler" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "Hızölçerin en yüksek değeri:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "Yere Göre Süratin Sönümleme Faktörü:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "UTC'den Yerel Saat Düzeltmesi:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "Tekne hız birimleri" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "OpenCPN yapılandırmasına uy." -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "Kts" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "mph" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "km/s" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "m/s" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "Derinlik birimleri:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "Metre" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "Fit" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "Kulaç" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "İnç" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "Santimetre" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Mesafe birimleri" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Deniz mili" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "Kara mili" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilometre" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Rüzgar hızı birimleri:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Alet ekle" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Eklenecek aleti seç:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Yapılandırma" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "W" msgid "NW" msgstr "KB" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " hakiki" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "manyetik" diff --git a/plugins/dashboard_pi/po/vi_VN.po b/plugins/dashboard_pi/po/vi_VN.po index 7eaff57120..08d351818a 100644 --- a/plugins/dashboard_pi/po/vi_VN.po +++ b/plugins/dashboard_pi/po/vi_VN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Vietnamese\n" "Language: vi_VN\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "N" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "Vị trí" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "Độ sâu" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "Nhiệt độ nước." -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "Nhiệt độ không khí." -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "Góc gió thực" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "Hướng gió thực" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "Vận tốc gió thực" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "Hướng gió và vận tốc gió thực" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "Con trỏ" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "Bình minh/Hoàng hôn" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "Kỳ trăng" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "Lịch sử gió" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "Nhật ký chuyến đi" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "Độ cao" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "Bảng Điều khiển" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "Tùy chỉnh Bảng điều khiển" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "hiển thị Bảng điều khiển" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "Chú thích:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "Chiều:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "Chiều dọc" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "Chiều ngang" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "Dụng cụ" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "Thêm" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "Inch" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "Đơn vị đo khoảng cách:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "Hải lý" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "Kilômét" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "Đơn vị đo vận tốc gió:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "Thêm công cụ" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "Chọn công cụ để thêm:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "Tùy chỉnh..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "Tây" msgid "NW" msgstr "Tây Bắc" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr " đúng" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/po/zh_CN.po b/plugins/dashboard_pi/po/zh_CN.po index a8a09ff1c6..c8c610da6f 100644 --- a/plugins/dashboard_pi/po/zh_CN.po +++ b/plugins/dashboard_pi/po/zh_CN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -22,447 +22,451 @@ msgstr "" msgid "N" msgstr "" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "位置" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "对地航速" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "对地航向" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "磁COG" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "真罗经" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "真方位" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "磁方位" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "适用风角&速度" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "应用&真风角" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "适用风速" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "真风角&风速" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "深度" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "气压" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "水温" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "气温" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "适用风角" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "真风角" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "真风向" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "真风速" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "真风向&风速" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "有效航速" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "舵角" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "光标" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "日出/日落" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "月相" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "风史" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "气压史" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "航次日志" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "日志合计" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "自本船" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "螺距" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "侧倾" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "计算机当地时钟" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "当地日出/日落" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "仪器面板" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "OpenCPN仪器面板插件" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "OpenCPN仪器面板插件\n" "提供NMEA源航行仪器显示面板." -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "向上" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "向下" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "仪器面板首选项" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "显示此仪器面板" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "标题:" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "方向:" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "垂直" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "水平" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "仪器" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "添加" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "删除" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "外观" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "字体" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "题目:" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "数据:" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "标签:" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "小:" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "单位,量程,格式" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "速度表最大数值:" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "对地速度阻尼因子:" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "COG阻尼因子:" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "UTC和当地时间补偿值:" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "船只速度单位:" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "荣誉OpenCPN设置" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "节" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "迈" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "公里/小时" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "米/秒" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "深度单位:" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "米" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "英尺" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "英寻" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "英寸" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "厘米" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "深度偏差 (%s):" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "距离单位:" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "海里" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "法定英里" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "公里" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "风速单位:" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "添加仪器" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "选择仪器添加:" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "首选项..." -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "解锁" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -494,11 +498,11 @@ msgstr "西" msgid "NW" msgstr "西北" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "真" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "磁" diff --git a/plugins/dashboard_pi/po/zh_TW.po b/plugins/dashboard_pi/po/zh_TW.po index e3355efcb5..26d2ce1028 100644 --- a/plugins/dashboard_pi/po/zh_TW.po +++ b/plugins/dashboard_pi/po/zh_TW.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-26 20:42-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" @@ -22,446 +22,450 @@ msgstr "" msgid "N" msgstr "北" -#: src/dashboard_pi.cpp:260 +#: src/dashboard_pi.cpp:261 msgid "Position" msgstr "位置" -#: src/dashboard_pi.cpp:262 +#: src/dashboard_pi.cpp:263 msgid "SOG" msgstr "對地速度" -#: src/dashboard_pi.cpp:264 +#: src/dashboard_pi.cpp:265 msgid "Speed SOG" msgstr "" -#: src/dashboard_pi.cpp:266 +#: src/dashboard_pi.cpp:267 +msgid "Speed STW" +msgstr "" + +#: src/dashboard_pi.cpp:269 msgid "COG" msgstr "越地航向" -#: src/dashboard_pi.cpp:268 +#: src/dashboard_pi.cpp:271 msgid "Mag COG" msgstr "" -#: src/dashboard_pi.cpp:270 +#: src/dashboard_pi.cpp:273 msgid "GNSS Compass" msgstr "" -#: src/dashboard_pi.cpp:272 +#: src/dashboard_pi.cpp:275 msgid "True Compass" msgstr "" -#: src/dashboard_pi.cpp:274 +#: src/dashboard_pi.cpp:277 msgid "STW" msgstr "" -#: src/dashboard_pi.cpp:276 +#: src/dashboard_pi.cpp:279 msgid "True HDG" msgstr "" -#: src/dashboard_pi.cpp:278 +#: src/dashboard_pi.cpp:281 msgid "Mag HDG" msgstr "" -#: src/dashboard_pi.cpp:281 +#: src/dashboard_pi.cpp:284 msgid "App. Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:283 +#: src/dashboard_pi.cpp:286 msgid "App & True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:285 src/dashboard_pi.cpp:287 +#: src/dashboard_pi.cpp:288 src/dashboard_pi.cpp:290 msgid "App. Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:289 +#: src/dashboard_pi.cpp:292 msgid "True Wind Angle & Speed" msgstr "" -#: src/dashboard_pi.cpp:291 +#: src/dashboard_pi.cpp:294 msgid "Altitude" msgstr "" -#: src/dashboard_pi.cpp:293 +#: src/dashboard_pi.cpp:296 msgid "Altitude Trace" msgstr "" -#: src/dashboard_pi.cpp:295 src/dashboard_pi.cpp:297 +#: src/dashboard_pi.cpp:298 src/dashboard_pi.cpp:300 msgid "Depth" msgstr "水深" -#: src/dashboard_pi.cpp:299 src/dashboard_pi.cpp:301 +#: src/dashboard_pi.cpp:302 src/dashboard_pi.cpp:304 msgid "Barometric pressure" msgstr "" -#: src/dashboard_pi.cpp:303 +#: src/dashboard_pi.cpp:306 msgid "Water Temp." msgstr "" -#: src/dashboard_pi.cpp:305 +#: src/dashboard_pi.cpp:308 msgid "Air Temp." msgstr "氣溫" -#: src/dashboard_pi.cpp:307 +#: src/dashboard_pi.cpp:310 msgid "App. Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:309 +#: src/dashboard_pi.cpp:312 msgid "True Wind Angle" msgstr "" -#: src/dashboard_pi.cpp:311 +#: src/dashboard_pi.cpp:314 msgid "True Wind Direction" msgstr "" -#: src/dashboard_pi.cpp:313 +#: src/dashboard_pi.cpp:316 msgid "True Wind Speed" msgstr "" -#: src/dashboard_pi.cpp:315 +#: src/dashboard_pi.cpp:318 msgid "True Wind Dir. & Speed" msgstr "" -#: src/dashboard_pi.cpp:317 src/dashboard_pi.cpp:319 +#: src/dashboard_pi.cpp:320 src/dashboard_pi.cpp:322 msgid "VMG" msgstr "有效航速" -#: src/dashboard_pi.cpp:321 +#: src/dashboard_pi.cpp:324 msgid "VMG Wind" msgstr "" -#: src/dashboard_pi.cpp:323 src/dashboard_pi.cpp:325 +#: src/dashboard_pi.cpp:326 src/dashboard_pi.cpp:328 msgid "Rudder Angle" msgstr "" -#: src/dashboard_pi.cpp:327 +#: src/dashboard_pi.cpp:330 msgid "GNSS in use" msgstr "" -#: src/dashboard_pi.cpp:329 +#: src/dashboard_pi.cpp:332 msgid "GNSS Status" msgstr "" -#: src/dashboard_pi.cpp:331 +#: src/dashboard_pi.cpp:334 msgid "Cursor" msgstr "游標" -#: src/dashboard_pi.cpp:333 +#: src/dashboard_pi.cpp:336 msgid "GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:335 +#: src/dashboard_pi.cpp:338 msgid "Sunrise/Sunset" msgstr "日出/日落" -#: src/dashboard_pi.cpp:337 +#: src/dashboard_pi.cpp:340 msgid "Moon phase" msgstr "" -#: src/dashboard_pi.cpp:339 +#: src/dashboard_pi.cpp:342 msgid "Wind history" msgstr "" -#: src/dashboard_pi.cpp:341 +#: src/dashboard_pi.cpp:344 msgid "Barometric history" msgstr "" -#: src/dashboard_pi.cpp:343 +#: src/dashboard_pi.cpp:346 msgid "Trip Log" msgstr "旅程紀錄" -#: src/dashboard_pi.cpp:345 +#: src/dashboard_pi.cpp:348 msgid "Sum Log" msgstr "" -#: src/dashboard_pi.cpp:347 +#: src/dashboard_pi.cpp:350 msgid "From Ownship" msgstr "" -#: src/dashboard_pi.cpp:349 +#: src/dashboard_pi.cpp:352 msgid "Pitch" msgstr "" -#: src/dashboard_pi.cpp:351 +#: src/dashboard_pi.cpp:354 msgid "Heel" msgstr "" -#: src/dashboard_pi.cpp:353 +#: src/dashboard_pi.cpp:356 msgid "Local GNSS Clock" msgstr "" -#: src/dashboard_pi.cpp:355 +#: src/dashboard_pi.cpp:358 msgid "Local CPU Clock" msgstr "" -#: src/dashboard_pi.cpp:357 +#: src/dashboard_pi.cpp:360 msgid "Local Sunrise/Sunset" msgstr "" -#: src/dashboard_pi.cpp:359 +#: src/dashboard_pi.cpp:362 msgid "Humidity" msgstr "" -#: src/dashboard_pi.cpp:600 src/dashboard_pi.cpp:948 src/dashboard_pi.cpp:3563 -#: src/dashboard_pi.cpp:3578 src/dashboard_pi.cpp:4016 src/dashboard_pi.cpp:4110 -#: src/dashboard_pi.cpp:4708 +#: src/dashboard_pi.cpp:604 src/dashboard_pi.cpp:952 src/dashboard_pi.cpp:3578 +#: src/dashboard_pi.cpp:3593 src/dashboard_pi.cpp:4031 src/dashboard_pi.cpp:4125 +#: src/dashboard_pi.cpp:4723 msgid "Dashboard" msgstr "儀表板" -#: src/dashboard_pi.cpp:951 +#: src/dashboard_pi.cpp:955 msgid "Dashboard PlugIn for OpenCPN" msgstr "" -#: src/dashboard_pi.cpp:956 +#: src/dashboard_pi.cpp:960 msgid "Dashboard PlugIn for OpenCPN\n" "Provides navigation instrument display from NMEA source." msgstr "" -#: src/dashboard_pi.cpp:1817 src/dashboard_pi.cpp:2077 src/dashboard_pi.cpp:3058 -#: src/dashboard_pi.cpp:4242 +#: src/dashboard_pi.cpp:1821 src/dashboard_pi.cpp:2081 src/dashboard_pi.cpp:3073 +#: src/dashboard_pi.cpp:4257 msgid "Up" msgstr "" -#: src/dashboard_pi.cpp:1820 src/dashboard_pi.cpp:2079 src/dashboard_pi.cpp:3060 -#: src/dashboard_pi.cpp:4249 +#: src/dashboard_pi.cpp:1824 src/dashboard_pi.cpp:2083 src/dashboard_pi.cpp:3075 +#: src/dashboard_pi.cpp:4264 msgid "Down" msgstr "" -#: src/dashboard_pi.cpp:1837 src/dashboard_pi.cpp:2088 src/dashboard_pi.cpp:3047 +#: src/dashboard_pi.cpp:1841 src/dashboard_pi.cpp:2092 src/dashboard_pi.cpp:3062 msgid "Stbd" msgstr "" -#: src/dashboard_pi.cpp:1840 src/dashboard_pi.cpp:2090 src/dashboard_pi.cpp:3049 +#: src/dashboard_pi.cpp:1844 src/dashboard_pi.cpp:2094 src/dashboard_pi.cpp:3064 msgid "Port" msgstr "" -#: src/dashboard_pi.cpp:3957 +#: src/dashboard_pi.cpp:3972 msgid "Dashboard preferences" msgstr "" -#: src/dashboard_pi.cpp:4119 +#: src/dashboard_pi.cpp:4134 msgid "show this dashboard" msgstr "" -#: src/dashboard_pi.cpp:4130 +#: src/dashboard_pi.cpp:4145 msgid "Caption:" msgstr "" -#: src/dashboard_pi.cpp:4140 +#: src/dashboard_pi.cpp:4155 msgid "Orientation:" msgstr "" -#: src/dashboard_pi.cpp:4146 src/dashboard_pi.cpp:5413 +#: src/dashboard_pi.cpp:4161 src/dashboard_pi.cpp:5428 msgid "Vertical" msgstr "" -#: src/dashboard_pi.cpp:4147 src/dashboard_pi.cpp:5416 +#: src/dashboard_pi.cpp:4162 src/dashboard_pi.cpp:5431 msgid "Horizontal" msgstr "" -#: src/dashboard_pi.cpp:4178 src/dashboard_pi.cpp:4197 src/dashboard_pi.cpp:5021 +#: src/dashboard_pi.cpp:4193 src/dashboard_pi.cpp:4212 src/dashboard_pi.cpp:5036 msgid "Instruments" msgstr "" -#: src/dashboard_pi.cpp:4210 +#: src/dashboard_pi.cpp:4225 msgid "Add" msgstr "" -#: src/dashboard_pi.cpp:4219 +#: src/dashboard_pi.cpp:4234 msgid "Edit" msgstr "" -#: src/dashboard_pi.cpp:4234 +#: src/dashboard_pi.cpp:4249 msgid "Delete" msgstr "" -#: src/dashboard_pi.cpp:4262 +#: src/dashboard_pi.cpp:4277 msgid "Appearance" msgstr "" -#: src/dashboard_pi.cpp:4265 +#: src/dashboard_pi.cpp:4280 msgid "Fonts" msgstr "" -#: src/dashboard_pi.cpp:4274 src/dashboard_pi.cpp:6073 +#: src/dashboard_pi.cpp:4289 src/dashboard_pi.cpp:6140 msgid "Title:" msgstr "" -#: src/dashboard_pi.cpp:4283 src/dashboard_pi.cpp:6087 +#: src/dashboard_pi.cpp:4298 src/dashboard_pi.cpp:6154 msgid "Data:" msgstr "" -#: src/dashboard_pi.cpp:4292 src/dashboard_pi.cpp:6101 +#: src/dashboard_pi.cpp:4307 src/dashboard_pi.cpp:6168 msgid "Label:" msgstr "" -#: src/dashboard_pi.cpp:4301 src/dashboard_pi.cpp:6108 +#: src/dashboard_pi.cpp:4316 src/dashboard_pi.cpp:6175 msgid "Small:" msgstr "" -#: src/dashboard_pi.cpp:4311 +#: src/dashboard_pi.cpp:4326 msgid "Reset:" msgstr "" -#: src/dashboard_pi.cpp:4315 +#: src/dashboard_pi.cpp:4330 msgid "Set dashboard default fonts" msgstr "" -#: src/dashboard_pi.cpp:4324 +#: src/dashboard_pi.cpp:4339 msgid "Units, Ranges, Formats" msgstr "" -#: src/dashboard_pi.cpp:4332 +#: src/dashboard_pi.cpp:4347 msgid "Speedometer max value:" msgstr "" -#: src/dashboard_pi.cpp:4341 +#: src/dashboard_pi.cpp:4356 msgid "Speed Over Ground Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4350 +#: src/dashboard_pi.cpp:4365 msgid "COG Damping Factor:" msgstr "" -#: src/dashboard_pi.cpp:4359 +#: src/dashboard_pi.cpp:4374 msgid "Local Time Offset From UTC:" msgstr "" -#: src/dashboard_pi.cpp:4384 +#: src/dashboard_pi.cpp:4399 msgid "Boat speed units:" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4451 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4466 msgid "Honor OpenCPN settings" msgstr "" -#: src/dashboard_pi.cpp:4387 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4402 src/dashboard_pi.cpp:4485 msgid "Kts" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "mph" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "km/h" msgstr "" -#: src/dashboard_pi.cpp:4388 src/dashboard_pi.cpp:4470 +#: src/dashboard_pi.cpp:4403 src/dashboard_pi.cpp:4485 msgid "m/s" msgstr "" -#: src/dashboard_pi.cpp:4402 +#: src/dashboard_pi.cpp:4417 msgid "Depth units:" msgstr "" -#: src/dashboard_pi.cpp:4406 src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4421 src/dashboard_pi.cpp:4468 msgid "Meters" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Feet" msgstr "" -#: src/dashboard_pi.cpp:4406 +#: src/dashboard_pi.cpp:4421 msgid "Fathoms" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Inches" msgstr "" -#: src/dashboard_pi.cpp:4407 +#: src/dashboard_pi.cpp:4422 msgid "Centimeters" msgstr "" -#: src/dashboard_pi.cpp:4419 +#: src/dashboard_pi.cpp:4434 #, c-format msgid "Depth Offset (%s):" msgstr "" -#: src/dashboard_pi.cpp:4448 +#: src/dashboard_pi.cpp:4463 msgid "Distance units:" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Nautical miles" msgstr "" -#: src/dashboard_pi.cpp:4452 +#: src/dashboard_pi.cpp:4467 msgid "Statute miles" msgstr "" -#: src/dashboard_pi.cpp:4453 +#: src/dashboard_pi.cpp:4468 msgid "Kilometers" msgstr "" -#: src/dashboard_pi.cpp:4467 +#: src/dashboard_pi.cpp:4482 msgid "Wind speed units:" msgstr "" -#: src/dashboard_pi.cpp:4484 +#: src/dashboard_pi.cpp:4499 msgid "Temperature units:" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Celsius" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Fahrenheit" msgstr "" -#: src/dashboard_pi.cpp:4487 +#: src/dashboard_pi.cpp:4502 msgid "Kelvin" msgstr "" -#: src/dashboard_pi.cpp:4502 +#: src/dashboard_pi.cpp:4517 msgid "Use N2K & SignalK true wind data over ground.\n" "(Instead of through water)" msgstr "" -#: src/dashboard_pi.cpp:4983 +#: src/dashboard_pi.cpp:4998 msgid "Add instrument" msgstr "" -#: src/dashboard_pi.cpp:4988 +#: src/dashboard_pi.cpp:5003 msgid "Select instrument to add:" msgstr "" -#: src/dashboard_pi.cpp:5397 src/dashboard_pi.cpp:5423 +#: src/dashboard_pi.cpp:5412 src/dashboard_pi.cpp:5438 msgid "Preferences..." msgstr "" -#: src/dashboard_pi.cpp:5402 +#: src/dashboard_pi.cpp:5417 msgid "Resize..." msgstr "" -#: src/dashboard_pi.cpp:5410 +#: src/dashboard_pi.cpp:5425 msgid "Undock" msgstr "" -#: src/dashboard_pi.cpp:5973 +#: src/dashboard_pi.cpp:6002 msgid "Choose font" msgstr "" -#: src/dashboard_pi.cpp:6080 +#: src/dashboard_pi.cpp:6147 msgid "Title background color:" msgstr "" -#: src/dashboard_pi.cpp:6094 +#: src/dashboard_pi.cpp:6161 msgid "Data background color:" msgstr "" -#: src/dashboard_pi.cpp:6115 +#: src/dashboard_pi.cpp:6182 msgid "Arrow 1 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6122 +#: src/dashboard_pi.cpp:6189 msgid "Arrow 2 Colour :" msgstr "" -#: src/dashboard_pi.cpp:6143 +#: src/dashboard_pi.cpp:6210 msgid "Set default" msgstr "" @@ -493,11 +497,11 @@ msgstr "" msgid "NW" msgstr "" -#: src/instrument.cpp:400 +#: src/instrument.cpp:438 msgid " true" msgstr "" -#: src/instrument.cpp:402 +#: src/instrument.cpp:440 msgid " mag" msgstr "" diff --git a/plugins/dashboard_pi/src/dashboard_pi.cpp b/plugins/dashboard_pi/src/dashboard_pi.cpp index b3520ae1e8..0853c180e3 100644 --- a/plugins/dashboard_pi/src/dashboard_pi.cpp +++ b/plugins/dashboard_pi/src/dashboard_pi.cpp @@ -44,7 +44,7 @@ #include "wx/jsonreader.h" #include "wx/jsonwriter.h" #include "N2KParser.h" - +#include "../../../gui/include/gui/ocpn_fontdlg.h" wxFontData *g_pFontTitle; wxFontData *g_pFontData; @@ -6021,11 +6021,41 @@ bool OCPNFontButton::Create(wxWindow *parent, wxWindowID id, void OCPNFontButton::OnButtonClick(wxCommandEvent &WXUNUSED(ev)) { // update the wxFontData to be shown in the dialog m_data.SetInitialFont(m_selectedFont); + wxFont *pF = OCPNGetFont(_T("Dialog"), 0); + +#ifdef __WXGTK__ + // Use a smaller font picker dialog (ocpnGenericFontDialog) for small displays + int display_height = wxGetDisplaySize().y; + if (display_height < 800) { + // create the font dialog and display it + ocpnGenericFontDialog dlg(this, m_data); + dlg.SetFont(*pF); + if (dlg.ShowModal() == wxID_OK) { + m_data = dlg.GetFontData(); + m_selectedFont = m_data.GetChosenFont(); + // fire an event + wxFontPickerEvent event(this, GetId(), m_selectedFont); + GetEventHandler()->ProcessEvent(event); + UpdateFont(); + } + } + else { + // create the font dialog and display it + wxFontDialog dlg(this, m_data); + dlg.SetFont(*pF); + if (dlg.ShowModal() == wxID_OK) { + m_data = dlg.GetFontData(); + m_selectedFont = m_data.GetChosenFont(); + // fire an event + wxFontPickerEvent event(this, GetId(), m_selectedFont); + GetEventHandler()->ProcessEvent(event); + UpdateFont(); + } + } +#else // Not __GTK__ // create the font dialog and display it wxFontDialog dlg(this, m_data); - - wxFont *pF = OCPNGetFont(_T("Dialog"), 0); dlg.SetFont(*pF); #ifdef __WXQT__ @@ -6056,6 +6086,7 @@ void OCPNFontButton::OnButtonClick(wxCommandEvent &WXUNUSED(ev)) { UpdateFont(); } +#endif } void OCPNFontButton::UpdateFont() { diff --git a/plugins/dashboard_pi/src/wind.cpp b/plugins/dashboard_pi/src/wind.cpp index b336afb088..123abf35a5 100644 --- a/plugins/dashboard_pi/src/wind.cpp +++ b/plugins/dashboard_pi/src/wind.cpp @@ -25,7 +25,6 @@ *************************************************************************** */ - #include #ifndef WX_PRECOMP @@ -44,12 +43,11 @@ // Display the arrow for MainValue (wind angle) // We also want the extra value (wind speed) displayed inside the dial -DashboardInstrument_Wind::DashboardInstrument_Wind(wxWindow* parent, - wxWindowID id, - wxString title, - InstrumentProperties* Properties, - DASH_CAP cap_flag) - : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, 0, 360) { +DashboardInstrument_Wind::DashboardInstrument_Wind( + wxWindow* parent, wxWindowID id, wxString title, + InstrumentProperties* Properties, DASH_CAP cap_flag) + : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, + 0, 360) { SetOptionMarker(10, DIAL_MARKER_REDGREENBAR, 3); // Labels are set static because we've no logic to display them this way wxString labels[] = {_T(""), _T("30"), _T("60"), _T("90"), @@ -63,8 +61,10 @@ void DashboardInstrument_Wind::DrawBackground(wxGCDC* dc) { } DashboardInstrument_WindCompass::DashboardInstrument_WindCompass( - wxWindow* parent, wxWindowID id, wxString title, InstrumentProperties* Properties, DASH_CAP cap_flag) - : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, 0, 360) { + wxWindow* parent, wxWindowID id, wxString title, + InstrumentProperties* Properties, DASH_CAP cap_flag) + : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, + 0, 360) { SetOptionMarker(5, DIAL_MARKER_SIMPLE, 2); wxString labels[] = {_("N"), _("NE"), _("E"), _("SE"), _("S"), _("SW"), _("W"), _("NW")}; @@ -72,15 +72,18 @@ DashboardInstrument_WindCompass::DashboardInstrument_WindCompass( } void DashboardInstrument_WindCompass::DrawBackground(wxGCDC* dc) { - DrawCompassRose(dc, m_cx, m_cy, m_radius * 0.85, m_AngleStart, false, m_Properties); + DrawCompassRose(dc, m_cx, m_cy, m_radius * 0.85, m_AngleStart, false, + m_Properties); } // Display the arrow for MainValue (wind angle) // We also want the extra value (wind speed) displayed inside the dial DashboardInstrument_TrueWindAngle::DashboardInstrument_TrueWindAngle( - wxWindow* parent, wxWindowID id, wxString title, InstrumentProperties* Properties, DASH_CAP cap_flag) - : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, 0, 360) { + wxWindow* parent, wxWindowID id, wxString title, + InstrumentProperties* Properties, DASH_CAP cap_flag) + : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, + 0, 360) { SetOptionMarker(10, DIAL_MARKER_REDGREENBAR, 3); // Labels are set static because we've no logic to display them this way wxString labels[] = {_T(""), _T("30"), _T("60"), _T("90"), @@ -98,8 +101,10 @@ void DashboardInstrument_TrueWindAngle::DrawBackground(wxGCDC* dc) { Author: Thomas Rauch ******************************************************************************/ DashboardInstrument_AppTrueWindAngle::DashboardInstrument_AppTrueWindAngle( - wxWindow* parent, wxWindowID id, wxString title, InstrumentProperties* Properties, DASH_CAP cap_flag) - : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, 0, 360) { + wxWindow* parent, wxWindowID id, wxString title, + InstrumentProperties* Properties, DASH_CAP cap_flag) + : DashboardInstrument_Dial(parent, id, title, Properties, cap_flag, 0, 360, + 0, 360) { SetOptionMarker(10, DIAL_MARKER_REDGREENBAR, 3); // Labels are set static because we've no logic to display them this way wxString labels[] = {_T(""), _T("30"), _T("60"), _T("90"), @@ -134,19 +139,16 @@ void DashboardInstrument_AppTrueWindAngle::SetData(DASH_CAP st, double data, Refresh(); } void DashboardInstrument_AppTrueWindAngle::Draw(wxGCDC* bdc) { - - - if (m_Properties) - { - wxBrush b1(GetColourSchemeBackgroundColour(m_Properties->m_DataBackgroundColour)); - bdc->SetBackground(GetColourSchemeBackgroundColour(m_Properties->m_DataBackgroundColour)); - } - else - { - wxColour c1; - GetGlobalColor(_T("DASHB"), &c1); - wxBrush b1(c1); - bdc->SetBackground(b1); + if (m_Properties) { + wxBrush b1( + GetColourSchemeBackgroundColour(m_Properties->m_DataBackgroundColour)); + bdc->SetBackground( + GetColourSchemeBackgroundColour(m_Properties->m_DataBackgroundColour)); + } else { + wxColour c1; + GetGlobalColor(_T("DASHB"), &c1); + wxBrush b1(c1); + bdc->SetBackground(b1); } bdc->Clear(); @@ -161,7 +163,7 @@ void DashboardInstrument_AppTrueWindAngle::Draw(wxGCDC* bdc) { m_cx = size.x / 2; int availableHeight = GetDataBottom(size.y) - m_DataTop; InitTitleAndDataPosition(availableHeight); - availableHeight-=height; + availableHeight -= height; m_cy = m_DataTop + height / 2; m_cy += availableHeight / 2; m_radius = availableHeight / 2.0 * 0.95; @@ -203,9 +205,9 @@ void DashboardInstrument_AppTrueWindAngle::DrawForeground(wxGCDC* dc) { /*True Wind*/ dc->SetPen(*wxTRANSPARENT_PEN); if (m_Properties) - cl = GetColourSchemeFont(m_Properties->m_Arrow_Second_Colour); + cl = GetColourSchemeFont(m_Properties->m_Arrow_Second_Colour); else - GetGlobalColor(_T("BLUE3"), &cl); + GetGlobalColor(_T("BLUE3"), &cl); wxBrush brush2; brush2.SetStyle(wxBRUSHSTYLE_SOLID); brush2.SetColour(cl); @@ -243,9 +245,9 @@ void DashboardInstrument_AppTrueWindAngle::DrawForeground(wxGCDC* dc) { /* Apparent Wind*/ dc->SetPen(*wxTRANSPARENT_PEN); if (m_Properties) - cl = GetColourSchemeFont(m_Properties->m_Arrow_First_Colour); + cl = GetColourSchemeFont(m_Properties->m_Arrow_First_Colour); else - GetGlobalColor(_T("DASHN"), &cl); + GetGlobalColor(_T("DASHN"), &cl); wxBrush brush; brush.SetStyle(wxBRUSHSTYLE_SOLID); brush.SetColour(cl); @@ -286,17 +288,14 @@ void DashboardInstrument_AppTrueWindAngle::DrawData( if (position == DIAL_POSITION_NONE) return; wxColour cl; - if (m_Properties) - { - dc->SetFont(m_Properties->m_LabelFont.GetChosenFont()); - cl = GetColourSchemeFont(m_Properties->m_LabelFont.GetColour()); + if (m_Properties) { + dc->SetFont(m_Properties->m_LabelFont.GetChosenFont()); + cl = GetColourSchemeFont(m_Properties->m_LabelFont.GetColour()); + } else { + dc->SetFont(g_pFontLabel->GetChosenFont()); + cl = GetColourSchemeFont(g_pFontLabel->GetColour()); } - else - { - dc->SetFont(g_pFontLabel->GetChosenFont()); - cl = GetColourSchemeFont(g_pFontLabel->GetColour()); - } - //GetGlobalColor(_T("DASHF"), &cl); + // GetGlobalColor(_T("DASHF"), &cl); dc->SetTextForeground(cl); wxSize size = GetClientSize(); @@ -343,7 +342,8 @@ void DashboardInstrument_AppTrueWindAngle::DrawData( case DIAL_POSITION_INSIDE: { TextPoint.x = m_cx - (width / 2) - 1; TextPoint.y = ((size.y - m_InstrumentSpacing) * .75) - height; - if ( (g_TitleAlignment & wxALIGN_BOTTOM) != 0 ) TextPoint.y -= m_TitleHeight; + if ((g_TitleAlignment & wxALIGN_BOTTOM) != 0) + TextPoint.y -= m_TitleHeight; GetGlobalColor(_T("DASHL"), &cl); int penwidth = size.x / 100; wxPen* pen = @@ -379,6 +379,8 @@ void DashboardInstrument_AppTrueWindAngle::DrawData( TextPoint.x = size.x - width - 1; TextPoint.y = GetDataBottom(size.y) - height; break; + default: + break; } wxColour c2; GetGlobalColor(_T("DASHB"), &c2); @@ -388,11 +390,11 @@ void DashboardInstrument_AppTrueWindAngle::DrawData( token = tkz.GetNextToken(); while (token.Length()) { if (m_Properties) { - f = m_Properties->m_LabelFont.GetChosenFont(); - dc->GetTextExtent(token, &width, &height, NULL, NULL, &f); + f = m_Properties->m_LabelFont.GetChosenFont(); + dc->GetTextExtent(token, &width, &height, NULL, NULL, &f); } else { - f = g_pFontLabel->GetChosenFont(); - dc->GetTextExtent(token, &width, &height, NULL, NULL, &f); + f = g_pFontLabel->GetChosenFont(); + dc->GetTextExtent(token, &width, &height, NULL, NULL, &f); } dc->DrawText(token, TextPoint.x, TextPoint.y); TextPoint.y += height; diff --git a/plugins/dashboard_pi/src/wind_history.cpp b/plugins/dashboard_pi/src/wind_history.cpp index 9f6b8c66f2..33d678e1bd 100644 --- a/plugins/dashboard_pi/src/wind_history.cpp +++ b/plugins/dashboard_pi/src/wind_history.cpp @@ -794,9 +794,14 @@ void DashboardInstrument_WindDirHistory::DrawForeground(wxGCDC* dc) { m_TotalMaxWindSpd, m_WindSpeedUnit.c_str()); int statw, stath; dc->GetTextExtent(statistics, &statw, &stath, 0, 0, &f); - if (statw < - (m_WindowRect.width - m_LeftLegend - speedw - degw - m_RightLegend)) { + int dispw = + (m_WindowRect.width - m_LeftLegend - speedw - degw - m_RightLegend); + if (statw < dispw) { dc->DrawText(statistics, speedw + m_LeftLegend, 3); + } else { // Try a shorter text + dc->GetTextExtent(statistics.Left(12), &statw, &stath, 0, 0, &f); + if (statw < dispw) + dc->DrawText(statistics.Left(12), speedw + m_LeftLegend, 3); } pen.SetStyle(wxPENSTYLE_SOLID); diff --git a/plugins/demo_pi_sample/CMakeLists.txt b/plugins/demo_pi_sample/CMakeLists.txt index 72256ada90..8cbb0523ba 100644 --- a/plugins/demo_pi_sample/CMakeLists.txt +++ b/plugins/demo_pi_sample/CMakeLists.txt @@ -138,7 +138,7 @@ INCLUDE_DIRECTORIES(nmea0183) ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_DEMO} ${SRC_NMEA0183} ) -target_link_libraries(${PACKAGE_NAME} PRIVATE ocpn::opencpn ) +target_link_libraries(${PACKAGE_NAME} ocpn::opencpn) INCLUDE("cmake/PluginInstall.cmake") INCLUDE("cmake/PluginLocalization.cmake") diff --git a/plugins/demo_pi_sample/src/nmea0183/response.cpp b/plugins/demo_pi_sample/src/nmea0183/response.cpp index b186c45821..014a65ce89 100644 --- a/plugins/demo_pi_sample/src/nmea0183/response.cpp +++ b/plugins/demo_pi_sample/src/nmea0183/response.cpp @@ -40,6 +40,8 @@ ** You can use it any way you like. */ +extern wxString g_TalkerIdText; + RESPONSE::RESPONSE() { Talker.Empty(); diff --git a/plugins/grib_pi/po/ar_SA.po b/plugins/grib_pi/po/ar_SA.po index ce3611fcc7..1bc26ca6aa 100644 --- a/plugins/grib_pi/po/ar_SA.po +++ b/plugins/grib_pi/po/ar_SA.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Arabic\n" "Language: ar_SA\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/bg_BG.po b/plugins/grib_pi/po/bg_BG.po index 2d343f5ec9..af90381a82 100644 --- a/plugins/grib_pi/po/bg_BG.po +++ b/plugins/grib_pi/po/bg_BG.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/ca_ES.po b/plugins/grib_pi/po/ca_ES.po index 4f48f028d4..163627a999 100644 --- a/plugins/grib_pi/po/ca_ES.po +++ b/plugins/grib_pi/po/ca_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Catalan\n" "Language: ca_ES\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Iniciar una petició" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Error! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " conté dades no vàlides!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "Configuració" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Seleccioneu un arxiu GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " no es pot llegir!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Control de vistes GRIB" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vent" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Ràfegues de vent" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Pressió" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Onades" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Corrent" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Precipitacións" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Nuvolositat" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "Temperatura del mar" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -294,7 +294,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Alerta!" @@ -304,6 +304,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Anterior" @@ -608,77 +612,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Opcions generals" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Utilitzar gràfics d'alta definició" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Utilitzar degradat de color" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Copieu el primer registre acumulatiu perdut" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Copiar els registres d'onades que falten" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Carregar el fitxer més recent en el directori" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Carregar l'últim fitxer obert" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Opcions de càrrega de fitxer" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Obrir el primer pronòstic en fitxers GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Comencen a les previsions més pròximes a l'hora actual" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Autoritzar la interpolació per començar a l'hora actual" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Opcions d'Inici" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Hora Local" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Opcions horàries" @@ -686,235 +690,239 @@ msgstr "Opcions horàries" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Perfil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Adreça de correu electrònic del remitent" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Correu a " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Model de previsió " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Moviment de GRIB" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Velocitat" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Kts" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Curs" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Deg" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Login zyGrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Codi zyGrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolució" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Interval" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Hores" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Interval de temps" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dies" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Selecció d'Àrea" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Selecció Manual" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Selecció de Dades" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Temperatura de l'aire(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temperatura del mar (surf.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Alçada geopotencial" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Correu" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Mida aproximada del fitxer" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Max. mida)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Dades en la posició:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Tanca" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -922,19 +930,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Error de correu: MAPI32.DLL no està instal·lat o no és vàlid en aquest ordinador!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Taula de dades GRIB" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1016,11 +1024,11 @@ msgstr "El connector GRIB per a OpenCPN\n" "- Energia potencial convectiva disponible (CAPE)\n" "- Vent, altitud, temperatura i humitat relativa als 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Taula Clima" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1349,75 +1357,3 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/cs_CZ.po b/plugins/grib_pi/po/cs_CZ.po index 13e7e7bd9e..517a2c9f6d 100644 --- a/plugins/grib_pi/po/cs_CZ.po +++ b/plugins/grib_pi/po/cs_CZ.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Czech\n" "Language: cs_CZ\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Zahájení požadavku" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Nakesli požadovanou oblast\n" "nebo klepnutím sem zastav požadavek" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Platná oblast a pokračovat" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Soubor: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Chyba! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " neobsahuje žádná platná data!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Žádný platný GRIB soubor" @@ -91,19 +91,19 @@ msgstr "Nastavení" msgid "Draw requested Area or Click here to stop request" msgstr "Nakesli požadovanou oblast nebo klepnutím sem zastav požadavek" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Složka souborů GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " soubory neexistují!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " nelze přečíst!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Ovládání zobrazení GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vítr" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Poryv větru" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Tlak, mBar" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Vlny" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Rychlost proudu, Kts." #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Srážky" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Oblačnost" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Povrchová teplota moře, C" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Rozhodl ses povolit interpolace. \n" " a tím se sníží přesnost!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Varování!" @@ -309,6 +309,10 @@ msgstr "Tato možnost znamená, že schválíš intrepolaci\n" "Nezapomeň, že zobrazená data nebudou reálná, ale přepočítávaná\n" "a to může snížit přesnost!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Předchozí" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Obecné nastavení" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Použít grafiku ve velkém rozlišení" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Použít postupné barvy" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Zkopírovat první kumulativní chybějící záznam" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopírovat chybějící záznamy vln" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Kreslit hroty šípů" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Nahrát novější soubor v adresáři" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Načíst naposledy otevřený soubor" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Možnosti načtení souboru" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Začít první předpovědí v souboru GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Začít na nejbližší předpovědi pro aktuální čas" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Autorizovat začátek interpolace v aktuálním čase" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Možnosti spuštění" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Místní čas" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Možnosti času" @@ -691,235 +695,239 @@ msgstr "Možnosti času" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "E-mail odesílatele" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Mail na " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Model prognózy " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Pohyblivý Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Rychlost" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Kts" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kurs" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Deg" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib uživatelské jméno" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib kód" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Rozlišení" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Interval" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Hodin" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Časový rozsah" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dny" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Výběr oblasti" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Ruční výběr" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Používej vždy tuto oblast" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max z.š." -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "S" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max z.d." -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "V" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min z.š." -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "J" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min z.d." -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "Z" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Výběr dat" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Teplota vzduchu (2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Teplota povrchu moře" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotenciální výška" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Pošta" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Předpokládaná velikost souboru" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Maximální velikost)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Údaje na pozici:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Zavřít" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Chyba MAIL: MAPI32.DLL není nainstalována nebo nefunguje v tomto počítači." -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Nastavení" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Tabulka dat GRIB" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1013,11 +1021,11 @@ msgstr "Doplněk GRIB pro OpenCPN\n" "- teplotu povrchu moře\n" "- rychlost a směr povrchových proudů." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Tabulka počasí" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1348,75 +1356,3 @@ msgstr "" msgid "Menu" msgstr "Nabídka" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/da_DK.po b/plugins/grib_pi/po/da_DK.po index c8bc56182d..00c9a78652 100644 --- a/plugins/grib_pi/po/da_DK.po +++ b/plugins/grib_pi/po/da_DK.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Danish\n" "Language: da_DK\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "Indstillinger" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Meteorologi(GRIB) folder" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Meteorologi(GRIB) visning" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vind" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Vindstød" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Tryk, mBar" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Bølger" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Hastighed, knob" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Nedbør" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Skydække" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "Havoverflade temperatur, C" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Brug højopløsningsgrafik" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopier manglende bølgeoptagelser" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Indlæs den nyeste fil i bibliotek" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Indlæs den seneste åbnede fil" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Indlæs filindstillinger" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Start ved den første prognose i GRIB filen" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Start med prognosen tættest på nuværende tidspunkt" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Tillad at interpolation starter på nuværende tidspunkt" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Startindstillinger" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Lokal tid" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Tidsindstillinger" @@ -685,235 +689,239 @@ msgstr "Tidsindstillinger" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Afsenderens E-mail adresse" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Mail til " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Prognosemodel " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Hastighed" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Knob" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kurs" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Grader" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib Login" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib kode" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Opløsning" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Interval" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Timer" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Tidsinterval" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dage" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Valg af område" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Manuelt valg" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Lufttemperatur (2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Havtemperatur (overfl.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotential højde" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Mail" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Anslået filstørrelse" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Max størrelse)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/de_DE.po b/plugins/grib_pi/po/de_DE.po index 1ae23d1b43..d25d1b9921 100644 --- a/plugins/grib_pi/po/de_DE.po +++ b/plugins/grib_pi/po/de_DE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 20:50\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de_DE\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Anfrage-Start" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Angefragtes Gebiet zeichnen\n" "oder hier Klicken, um die Anfrage abzubrechen" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Gebiet validieren und fortsetzen" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Datei: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Fehler! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " enthält keine gültigen Daten!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Keine gültige GRIB Datei" @@ -91,19 +91,19 @@ msgstr "Einstellungen" msgid "Draw requested Area or Click here to stop request" msgstr "Angefragtes Gebiet zeichnen oder hier Klicken, um die Anfrage abzubrechen" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Grib-Verzeichnis auswählen" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " Dateien sind nicht vorhanden!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " nicht lesbar!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Grib-Anzeige Einstellungen" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Wind" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Wind-Boe" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Luftdruck" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Wellen" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Strömung" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Regen" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Bewölkung" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "See-Temperatur" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Sie haben Interpolation erlaubt.\n" "Die Genauigkeit leidet!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Warnung!" @@ -309,6 +309,10 @@ msgstr "Mit dieser Option erlauben Sie Interpolation.\n" "Die angezeigten Daten sind nicht echt sondern berechnet!\n" "Die Genauigkeit kann leiden!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "Wählen Sie das GRIB-Dateiverzeichnis" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "vorher" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Abbrechen" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Allgemeine Optionen" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Hochauflösende Grafik verwenden" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Verwende abgestufte Farben" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Kopiere ersten fehlenden kumulativen Datensatz" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopiere fehlende Wellen-Daten" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Windfahnen zeigen" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zoom zur Mitte beim Öffnen" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Lade neueste Datei im Verzeichnis" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Lade zuletzt offene Datei" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Lade Datei-Optionen" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Starte mit erster Vorhersage in Grib-Datei" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Starte mit nächster Vorhersage zur akt. Zeit" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Erlaube Interpolation-Start bei aktueller Zeit" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Start-Optionen" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Lokale Zeit" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Zeit-Optionen" @@ -691,235 +695,239 @@ msgstr "Zeit-Optionen" msgid "Icons Size Factor" msgstr "Faktor Größe Icons" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "GRIB-Download-Verzeichnis auswählen" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "GRIB Plugin Voreinstellungen" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "GRIB herunterladen..." -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "Länge der Vorhersage" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "24 Stunden" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "3 Tage" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "Maximum" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "Modell" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "Herunterladen" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "Welt" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "Katalog aktualisieren" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "Lokale Modelle" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Sender eMail Adresse" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Mail an " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Vorhersage-Modell" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Beweglich. Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Geschw." -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Knoten" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kurs" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Grad" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib Login" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib Code" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Auflösung" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervall" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Stunden" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Zeit-Bereich" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Tage" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Bereich-Auswahl" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Hand-Auswahl" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Verwende immer dies Gebiet" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max. Breite" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max. Länge" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "O" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min. Breite" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min. Länge" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Datenauswahl" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Luft-Temperatur(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Comp. Reflect." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "See-Temperatur(Oberfl.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotential Höhe" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Mail" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Voraussichtl. Dateigröße" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Max Größe)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "E-Mail" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "XyGrib" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Grib Daten an Position:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Schließen" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "Erwartete Position" @@ -927,19 +935,19 @@ msgstr "Erwartete Position" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Mail Fehler: MAPI32.DLL ist nicht installiert oder ungültig auf diesem Computer!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Einstellungen" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "Vorhersage anfordern..." -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Grib Datentabelle" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "Grib Plugin für OpenCPN\n" "- Konvektive potentielle Energie (CAPE)\n" "- Wind, Höhe, Temperatur und rel. Feuchte bei 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Wetter-Tabelle" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1361,75 +1369,3 @@ msgstr "Zeige Iso Reflectivity" msgid "Menu" msgstr "Menü" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "Seegang Modell" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "Wettermodell" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "Lauf" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "Wind (10m)" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "Böen (Grund)" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "Luftdruck (MSL)" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "Temperatur (2m)" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "CAPE (Boden)" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "Reflektivität (Atmosphäre)" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "Bedeckung (Gesamt)" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "Gesamtniederschlag" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "Welle signifikante Höhe" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "Windsee" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "Parameter" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "Status :" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "Bereit" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "Geschätzte Größe:" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "Unbekannt" - diff --git a/plugins/grib_pi/po/el_GR.po b/plugins/grib_pi/po/el_GR.po index de44bb509d..57e4419c1f 100644 --- a/plugins/grib_pi/po/el_GR.po +++ b/plugins/grib_pi/po/el_GR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Αρχή αιτήματος" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Δείξε την περιοχή\n" "Κάνε κλικ εδώ για ακύρωση" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Επικύρωση περιοχής και να συνέχεια" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Αρχείο: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Σφάλμα! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " δεν περιέχει έγκυρα δεδομένα!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Μη έγκυρο αρχείο GRIB" @@ -91,19 +91,19 @@ msgstr "Επιλογές" msgid "Draw requested Area or Click here to stop request" msgstr "Δείξε την περιοχή ή κάνε κλικ εδώ για ακύρωση" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Επιλέξτε ένα αρχείο GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " δεν υπάρχουν αρχεία!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " δεν διαβάζεται!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Έλεγχος Εμφάνισης GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Άνεμος" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Σπιλιάδες" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Πίεση" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Κύματα" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Ρεύμα" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Βροχόπτωση" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Νεφοκάλυψη" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Θερμοκρασία θαλάσσης" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "ΔΔΕΣ (CAPE)" @@ -297,7 +297,7 @@ msgstr "Έχετε επιτρέψει παρεμβολή δεδομένων. \n" "Aυτό μπορεί να μειώσει την ακρίβεια!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Προσοχή!" @@ -309,6 +309,10 @@ msgstr "Αυτή η επιλογή συνεπάγεται εξουσιοδότη "Μην ξεχάσετε ότι τα δεδομένα που εμφανίζονται δεν είναι πραγματικά αλλά υπολογισμένα\n" " Αυτό μπορεί να μειώσει την ακρίβεια!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Προηγούμενο" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Ακύρωση" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Γενικές επιλογές" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Χρήση Γραφικών Υψηλής Ευκρίνειας" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Χρήση συνεχούς χρωματικής παλέτας" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Αντίγραψε το πρώτο αθροιστικό δεδομένο που λείπει" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Αντίγραψε τα δεδομένα κυματισμού που λείπουν" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Κεφαλή αγκαθωτών βελών" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Ζουμ στο κέντρο όταν ανοιχτεί το αρχείο" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Άνοιξε το πιο πρόσφατο αρχείο στον φάκελλο" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Άνοιξε το αρχείο που χρησιμοποιήθηκε τελευταία" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Επιλογές φόρτωσης του αρχείου" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Αρχή με την πρώτη πρόγνωση στο αρχείο GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Αρχή με την πρόγνωση πιο κοντά στην τρέχουσα χρονική στιγμή" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Η παρεμβολή να αρχίζει από τώρα" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Επιλογές εκκίνησης" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Τοπική ώρα" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Επιλογές ώρας" @@ -691,235 +695,239 @@ msgstr "Επιλογές ώρας" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "Επιλογές προσθέτου GRIB" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Προφίλ" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Διεύθυνση eMail αποστολέα" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Στείλε σε " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Μοντέλο πρόγνωσης" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Κινητό GRIB" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Ταχύτητα" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "κόμβοι" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Πορεία" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "βαθμοί" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib Login" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib Κωδικός" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Διακριτική ικανότητα" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Διάστημα" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Ώρες" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Χρονικά όρια" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Μέρες" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Επιλογή περιοχής" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Επιλογή με το χέρι" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Μόνιμη χρήση αυτής της περιοχής" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Μεγ. πλάτος" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "Β" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Μεγ. μήκος" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "Α" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Ελ. πλάτος" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "Ν" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Ελ. μήκος" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "Δ" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Επιλογή δεδομένων" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Θερμοκρασία αέρος (2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Συνθ. ανταν." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Θερμοκρασία θαλάσσης (επιφανειακή)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Γεωδυναμικό ύψος" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "eMail" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Εκτιμώμενο μέγεθος αρχείου" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "  (Μέγιστο μέγεθος)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Δεδομένa στη θέση:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Κλείσιμο" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Σφάλμα στο MAIL: Το αρχείο MAPI32.DLL δεν υπάρχει ή είναι άκυρο!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Προτιμήσεις" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Πίνακας δεδομένων GRIB" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "Πρόσθετο GRIB για το OpenCPN\n" "- Διαθέσιμη Δυναμική Ενέργεια Συναγωγής (CAPE)\n" "- άνεμος, υψόμετρο, θερμοκρασία και σχετική υγρασία για 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Μετεωρολογικός πίνακας" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1359,75 +1367,3 @@ msgstr "Δείξε αντανακλαστικότητα ISO" msgid "Menu" msgstr "Μενού" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/en_GB.po b/plugins/grib_pi/po/en_GB.po index 5ba3bda144..4fccb25a53 100644 --- a/plugins/grib_pi/po/en_GB.po +++ b/plugins/grib_pi/po/en_GB.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: English, United Kingdom\n" "Language: en_GB\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/es_ES.po b/plugins/grib_pi/po/es_ES.po index fa6c4309dc..2db4e0c82e 100644 --- a/plugins/grib_pi/po/es_ES.po +++ b/plugins/grib_pi/po/es_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 20:51\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Iniciar una petición" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Dibuja región solicitada\n" "o haz Clic aquí para terminar" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Validar región y continua" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Archivo: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "¡Error! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " ¡no contiene datos válidos!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Archivo GRIB no válido" @@ -91,19 +91,19 @@ msgstr "Ajustes" msgid "Draw requested Area or Click here to stop request" msgstr "Dibuja región solicitada o haz Clic aquí para terminar" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Seleccionar archivo GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " ¡los ficheros no existen!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " ¡no puede leerse!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Control Visualización GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Viento" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Rachas Viento" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Presión" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Olas" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Corrientes" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Lluvia" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Nubosidad" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Temperatura mar" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Ha elegido autorizar una interpolación.\n" "Esto ¡podrá bajar la precisión!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "¡Atención!" @@ -309,6 +309,10 @@ msgstr "Esta opción implica autorizar una interpolación\n" "No olvide que los datos mostrados no serán reales hasta su recálculo\n" "Esto ¡podrá bajar la precisión!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Previo" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "GUI" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Cancelar" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Opciones Generales" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Usar Gráficos Alta Definición" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Usar Colores graduales" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Copiar primero registros acumulados perdidos" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Copiar registros de ola perdidos" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Mostrar barbas del vector de viento" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zoom al centro del archivo al cargar" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Cargar los archivos recientes en Carpeta" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Cargar los últimos archivos abiertos" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Opciones carga de archivo" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Iniciar en el primer archivo de previsiones GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Iniciar en la previsión más próxima a ahora" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Autorizar interpolación para iniciar ahora" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Opciones al Iniciar" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Hora Local" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Opciones de hora" @@ -691,235 +695,239 @@ msgstr "Opciones de hora" msgid "Icons Size Factor" msgstr "Factor de tamaño de iconos" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "Preferencias de PlugIn GRIB" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "Descargar grib..." -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "Duración del pronóstico" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "24 horas" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "3 días" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "Máximo" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "Modelo" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "Descargar" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "Mundo" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "Actualizar catálogo" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "Modelos locales" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Perfil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Remitente del email " -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Enviar email a" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Modelo de previsión" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Grib móvil" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Velocidad" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Nudos" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Rumbo" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Grados" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Login zyGrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Código zyGrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolución" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervalo" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Horas" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Intervalo de tiempo" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Días" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Selección de área" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Selección manual" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Utilice siempre esta Área" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Selección de datos" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Temperatura Aire(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Refl. Comp." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temperatura mar(sup.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Altitud geopotencial" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Correo" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Tamaño estimado de archivo" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "(Max. tamaño)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "e-mail" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "XyGrib" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Datos en la posición:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Cerrar" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "Posición del proyecto" @@ -927,19 +935,19 @@ msgstr "Posición del proyecto" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "MAIL Error:¡ MAPI32.DLL no está instalada o no es válida en este ordenador!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Preferencias" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "Obtener predicción..." -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Tabla de Datos Grib" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "PlugIn GRIB para OpenCPN\n" "- Energía potencial de convención disponible (CAPE)\n" "- viento, altitud, temperatura y humedad relativa a 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Tabla del tiempo" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1360,75 +1368,3 @@ msgstr "Mostrar Reflectividad Iso" msgid "Menu" msgstr "Menú" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "Modelo de ola" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "Modelo meteorológico" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "Ejecutar" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "Viento (10m)" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "Racha de viento (superficie)" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "Presión (MSL)" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "Temperatura (2m)" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "CAPE (superficie)" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "Reflectividad (atmósfera)" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "Nubosidad (total)" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "Precipitación total" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "Altura Significativa de ola" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "Mar de viento" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "Parámetros" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "Estado :" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "Listo" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "Tamaño estimado :" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "Desconocido" - diff --git a/plugins/grib_pi/po/et_EE.po b/plugins/grib_pi/po/et_EE.po index 4f052fb88a..49007c0202 100644 --- a/plugins/grib_pi/po/et_EE.po +++ b/plugins/grib_pi/po/et_EE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Estonian\n" "Language: et_EE\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Saada päring" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Joonista soovitud ala\n" "või klikka siin päringu peatamiseks" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Korrektne ala ja jätka" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Fail: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Viga! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " sisaldab kehtetuid andmeid!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Kehtivat GRIB-faili ei ole" @@ -91,19 +91,19 @@ msgstr "Sätted" msgid "Draw requested Area or Click here to stop request" msgstr "Joonista soovitud ala või klikka siin päringu peatamiseks" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Vali GRIB-i fail" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " faile pole olemas!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " ei ole loetav!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB-i kuvamise kontroll" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Tuul" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Tuuleiil" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Õhurõhk" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Lained" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Hoovus" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Sademed" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Pilvekate" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Mere temperatuur" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Oled otsustanud lubada interpolatsiooni.\n" "See võib vähendada täpsust!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Hoiatus!" @@ -309,6 +309,10 @@ msgstr "See valik eeldab interpolatsiooni lubamist\n" "Ära unustada, et kuvatud andmed ei ole reaalsed, vaid ümberarvutatud\n" "See võib vähendada täpsust!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Eelmine" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "GKL" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Loobu" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Üldised valikud" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "kasuta kõrgresulutsiooni graafikat" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "kasuta astmelisi värve" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "kopeeri esimene puuduv koondkirje" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "kopeeri puuduvad lainekirjed" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "kuva ogaliste noolte otsi" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "suumi avamisel faili keskele" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "lae kõige uuem fail kaustas" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "lae viimati avatud fail" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Faili laadimise valikud" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "käivita GRIB-faili esimese ennustuse juures" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "käivita praegusele ajale lähima ennustuse juures" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "kinnita interpolatsioon alustamisek praegusest ajahektest" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Käivitamise valikud" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "kohalik aeg" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Aja valikud" @@ -691,235 +695,239 @@ msgstr "Aja valikud" msgid "Icons Size Factor" msgstr "Ikooni suuruse faktor" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "GRIB-plugIna eelistused" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profiil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Saatja e-kirja aadress" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Kiri (kuhu)" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Ilmaennustuse mudel" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Liigutan Grib'i" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Kiirus" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "slm" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kurss" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Krd" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib logimisnimi" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib kood" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolutsioon" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervall" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Tunnid" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Aja vahemik" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Päevad" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Ala valik" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Käsitsi valik" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Kasuta alati seda ala" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max laius" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max pikkus" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min laius" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min pikkus" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Andmete valimine" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Õhu temperattur (2 m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Komp.peegeldus" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Mere temperatuur(pind.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotentsiaalne kõrgus" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "E-kiri" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Eeldatav faili suurus" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "(max suurus)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Andmed asukohas:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Sulge" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Maili viga: MAPI32.DLL pole paigaldatud või on kehtetu selles kompuutris!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Eelistused" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "GRIB-andmete tabel" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1019,11 +1027,11 @@ msgstr "GRIB plugin OpenCPN-ile\n" "- soojusjuhtiv saadaval olev potentsiaalne energia (CAPE)\n" "- tuul, kõrgus, temperatuur ja suhteline niiskus 300, 500, 700 850 hPa juures." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Ilmatabel" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1359,75 +1367,3 @@ msgstr "Kuva iso-peegeldust" msgid "Menu" msgstr "Menuu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/fi_FI.po b/plugins/grib_pi/po/fi_FI.po index 419075c27d..895a125034 100644 --- a/plugins/grib_pi/po/fi_FI.po +++ b/plugins/grib_pi/po/fi_FI.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Finnish\n" "Language: fi_FI\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Aloita pyyntö" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Piirrä pyydetty alue\n" "tai napsautus tästä pysäyttää pyynön" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Valitse alue ja jatka" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Tiedosto: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Virhe! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " ei sisällä kelvollisia tietoja!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Ei kelvollista GRIB tiedostoa" @@ -91,19 +91,19 @@ msgstr "Asetukset" msgid "Draw requested Area or Click here to stop request" msgstr "Piirrä pyydetty alue tai klikkaa tästä pysäyttääksesi pyynnön" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Valitse GRIB-tiedosto" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " tiedostoja ei ole!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " ei voi lukea!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB Näyttöohjaus" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Tuuli" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Puuska" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Paine" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Aallot" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Nykyhetki" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Sademäärä" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Pilvisyys" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Meriveden lämpötila" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "Konvektioenergia" @@ -297,7 +297,7 @@ msgstr "Olet sallinut interpoloinnin.\n" "mikä voi vähentää tarkkuutta!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Varoitus!" @@ -309,6 +309,10 @@ msgstr "Asetus sallii interpoloinnin.\n" "Muista että näytetty tieto on laskennallista,\n" "mikä voi vähentää tarkkuutta!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Edellinen" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "GUI" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Peruuta" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Yleiset asetukset" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Käytä tarkkuusgrafiikkaa" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Käytä asteittaisia värejä" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Kopioi ensimmäinen puuttuva kumuloituva tietue" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopioi puuttuvat aaltotietueet" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Piirrä pyälletty nuolen pää" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zoomaa tiedoston keskelle avattaessa" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Lataa uusimmat tiedostot hakemistoon" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Lataa viimeinen avattu tiedosto" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Tiedostojen latausvaihtoehdot" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Aloita ensimmäisestä ennusteesta GRIB-tiedostossa" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Aloita lähimmästä nykyhetken ennusteesta" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Anna interpoloinnin alkaa nykyhetkestä" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Käynnistysasetuksia" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Paikallinen aika" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Aika-asetukset" @@ -691,235 +695,239 @@ msgstr "Aika-asetukset" msgid "Icons Size Factor" msgstr "Kuvakkeiden Koko Kerroin" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "GRIB-lisäosan ominaisuudet" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "Lataa GRIP-tiedosto..." -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "Ennusteen pituus" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "24 tuntia" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "3 päivää" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "Maksimi" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "Malli" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "Lataa" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "Maailma" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "Päivitä luettelo" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "Paikalliset mallit" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profiili" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Lähettäjän eMail osoite" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Lähetä " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Ennustemalli " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Liikkuva Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Nopeus" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "kn" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kurssi" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Astetta" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib kirjautuminen" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib koodi" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resoluutio" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Aikaväli" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Tunnit" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Aikaväli" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Päivät" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Alueen valinta" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Käsivalinta" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Käytä aina tätä aluetta" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "P" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "I" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "E" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "L" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Tietojen valinta" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Ilman lämpötila(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Heijastuskyky" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Meren pintalämpötila" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotentiaalinen korkeus" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Posti" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Arvioitu tiedostokoko" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Enimmäiskoko)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "Sähköposti" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "XyGrip" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Sijainnin tiedot:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Sulje" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "Enustettu sijainti" @@ -927,19 +935,19 @@ msgstr "Enustettu sijainti" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "MAIL virhe: MAPI32.DLL-tiedostoa ei ole asennettu tai se ei kelpaa tässä tietokoneessa!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Ominaisuudet" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "Lataa ennuste..." -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Grib arvotaulukko" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "GRIB moduuli OpenCPN:lle\n" "- Konvektiivinen saatavilla oleva energia (CAPE)\n" "- tuuli, korkeus, lämpötila ja suhteellinen kosteus 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Sää taulukko" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1361,75 +1369,3 @@ msgstr "Näytä heijastuskyvyn samanarvonkäyrät" msgid "Menu" msgstr "Valikko" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "Aaltomalli" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "Säämalli" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "Suorita" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "Tuuli (10m)" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "Tuulen puuska (pinta)" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "Paine (keskiarvopinta)" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "Lämpötila (2m)" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "CAPE (pinta)" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "Heijastavuus (ilmakehä)" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "Pilvipeitto (yhteensä)" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "Kokonaissademäärä" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "Merkitsevä aallonkorkeus" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "Aallokko" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "Parametrit" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "Tila :" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "Valmis" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "Arvioitu koko :" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "Tuntematon" - diff --git a/plugins/grib_pi/po/fil_PH.po b/plugins/grib_pi/po/fil_PH.po index 042a0d6b86..6164a157ca 100644 --- a/plugins/grib_pi/po/fil_PH.po +++ b/plugins/grib_pi/po/fil_PH.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Filipino\n" "Language: fil_PH\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Simulan ang isang kahilingan" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Iguhit ang hiniling na Lugar\n" "o Mag-klik ito upang mahinto ang kahilingan" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Balidong Lugar at Magpatuloy" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Talaksan: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "May Pagkakamali! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " naglalaman ng walang balidong datos!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Walang balidong talaksan na GRIB" @@ -91,19 +91,19 @@ msgstr "Mga Pagkakatalaga" msgid "Draw requested Area or Click here to stop request" msgstr "Iguhit ang hiniling Lugar o Mag-klik dito upang ihinto ang hiling" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Pumili ng talaksan na GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " ang mga talaksan ay hindi umiiral!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " hindi mabasa!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Kontrol sa Displey ng GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Hangin" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Bugso ng Hangin" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Presyon" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Mga Alon" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Daloy ng Alon" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Ulan" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Pagkulimlim ng Panahon" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Temperatura ng Dagat" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Napili mong pahintulotan ang pag-aalis.\n" "Ito ay maaaring makabawas sa katumpakan!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Babala!" @@ -309,6 +309,10 @@ msgstr "Ang pagpipiliang ito ay nagpapahiwatig na ikaw nagpapahintulot sa pag-aa "Huwag kalimutan na ang datos na nadispley ay hindi magiging tunay ngunit kukwentahing muli\n" "Ito ay maaaring makabawas sa katumpakan!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Nakaraan" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Mga Pangkalahatang Pagpipilian" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Gumamit ng mga Grapika na may Mataas na Resolusyon" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Gumamit ng Banayad na mga Kulay" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Kopyahin ang Nawawalang Rekord ng Unang Pinagsama" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopyahin ang Nawawalang Rekord ng Alon" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Gumuhit ng mga Ulo ng Palaso na may Tinik" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Ikarga ang Mas Bagong Taklasan sa Direktoryo" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Ikarga ang Huling Nabuksan na Taklasan" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Mga Pagpipilian sa Pagkarga ng Taklasan" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Simulan sa unang hula sa taklasang GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Simulan sa pinakamalapit na hula kasalukuyang oras" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Pahintulutan ang Pag-aalis upang masimulan sa kasalukuyang oras" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Mga Pagpipilian sa Pagsisimula" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Lokal na Oras" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Mga Pagpipilian sa Oras" @@ -691,235 +695,239 @@ msgstr "Mga Pagpipilian sa Oras" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profile" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Adres ng eMail ng Nagpadala" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "I-meil Kay " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Modelo sa Paghula " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Nililipat ang Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Bilis" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Kts" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Pagdaraanan" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Deg" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Mag-login sa zyGrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Kodigo sa zyGrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolusyon" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Agwat" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Oras" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Saklaw ng Oras" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Araw" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Pagpili ng Lugar" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Manwal na Pagpili" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Gamitin Lagi ang Lugar na ito" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "H" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "S" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "T" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "K" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Pagpili ng Datos" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Tempertaura ng Hangin(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temperatura ng Dagat(surf.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Taas ng Geopotensyal" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Meil" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Tinatayang Sukat ng Taklasan" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Max. sukat )" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Datos sa Posisyon:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Isarado" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Pagkakamali sa Meil: Ang MAPI32.DLL ay hindi na-install o hindi balido sa kompyuter na ito!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Mga Preperensya" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Talaan sa Datos ng Grib" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "GRIB PlugIn for OpenCPN\n" "- Magagamit na Enerhiyang Potensyal na Convective (CAPE)\n" "- hangin, altitude, temperatura at kaukulang kahalumigmigan na nasa 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Talaan ng Panahon" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1356,75 +1364,3 @@ msgstr "" msgid "Menu" msgstr "Talaan" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/fr_FR.po b/plugins/grib_pi/po/fr_FR.po index f0f84f9d45..cf2596c688 100644 --- a/plugins/grib_pi/po/fr_FR.po +++ b/plugins/grib_pi/po/fr_FR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Démarrer une requête" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Dessiner la zone demandée ou cliquer ici pour cesser cette demande" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Zone valide et continuer" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Fichier : " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Erreur ! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " ne contient aucune donnée valide!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Aucun fichier GRIB valide" @@ -90,19 +90,19 @@ msgstr "Préférences" msgid "Draw requested Area or Click here to stop request" msgstr "Dessiner la zone demandée ou cliquer ici pour cesser cette demande" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Sélectionnez un fichier GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " Les fichiers n’existent pas !" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " ne peut pas être lu !" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Gestionnaire d'affichage GRIB" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vent" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Raf. vent" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Pression" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Vagues" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Courant" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Précipit." #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Nébulosité" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "Température de l'eau" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -296,7 +296,7 @@ msgstr "Vous avez choisi d'accepté l'interpolation.\n" "Ceci peut en réduire la qualité !" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Alerte !" @@ -308,6 +308,10 @@ msgstr "Cette option implique que vous acceptez l'interpolation.\n" "N'oubliez pas que les données affichées ne seront jamais réelles mais recalculées.\n" "Ceci peut en réduire la qualité !" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "Choix dossier stock. Gribs" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Précédent" @@ -612,77 +616,77 @@ msgid "GUI" msgstr "Interface utilisateur" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Annuler" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Options générales" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Utiliser le graphisme haute définition" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Utiliser le dégradé de couleur" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Copier le premier enregistrement cumulatif manquant" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Copier les enregistrements de vagues manquants" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Dessiner une flèche avec une barbule" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zoomer en centrant sur la zone du fichier grib" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Charger le plus récent fichier du dossier" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Charger le dernier fichier utilisé" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Options de chargement de fichier" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Ouvrir la première tranche de prévisions météo" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Ouvrir la tranche horaire de prévisions météo la plus proche de l'heure actuelle" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Permettre l'interpolation pour démarrer à l'heure actuelle" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Options de démarrage" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Heure Locale" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Options d'heure" @@ -690,235 +694,239 @@ msgstr "Options d'heure" msgid "Icons Size Factor" msgstr "Facteur de taille des icônes" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "Choix dossier charg. Gribs" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "Préférences du PlugIn GRIB" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "Grib : Télécharger" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "Durée de la prévision" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "24 heures" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "3 jours" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "Maximum" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "Modèle" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "Télécharger" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "Monde" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "Catalogue : Mettre à jour" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "Modèles locaux" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Votre adresse de messagerie" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Mail pour" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Modèle des prévisions" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Grib mobile" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Vitesse" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Kts" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Cap" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Deg" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Votre login Zygrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Votre code Zygrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Résolution" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervalle" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "heures" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Durée" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Jours" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Sélectionner une zone" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Sélection manuelle" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Toujours utiliser cette zone" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Sélection de données" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Temp. de l'air(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Réflectivité max." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temp. de l'eau(Surf.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Altitude géopotentielle pour :" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Mail" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Taille estimée du fichier" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "(Taille maximale)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "email" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "XyGrib" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Donnée à la position :" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Fermer" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "Position du projet" @@ -926,19 +934,19 @@ msgstr "Position du projet" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Erreur de mail : MAPI32.DLL n'est pas installé ou est invalide dans ce PC !" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Préférences" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "Récupérer les prévisions..." -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Table des données issues du fichier grib " -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1022,11 +1030,11 @@ msgstr "Complément \"Météo\" pour l'affichage des fichiers GRIB par OpenCPN\n "- Énergie potentielle convective disponible (CAPE)\n" "- Vent, altitude, température et humidité relative à 300, 500, 700 et 850hpa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Météotable" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1362,75 +1370,3 @@ msgstr "Afficher l'iso réflectivité" msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "Mode de vagues" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "Modèle météo :" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "Lancer" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "Vent (10m)" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "Rafale (surface)" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "Pression (MSL)" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "Température (2m)" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "CAPE (surface)" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "Réflectivité (atmosphère)" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "Couverture nuageuse (total)" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "Précipitation totale" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "Vague : Hauteur significative" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "Vent et vagues" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "Paramètres" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "Statut :" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "Prêt" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "Taille estimée" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "Inconnu" - diff --git a/plugins/grib_pi/po/gl_ES.po b/plugins/grib_pi/po/gl_ES.po index f9c98276b3..f99dba717a 100644 --- a/plugins/grib_pi/po/gl_ES.po +++ b/plugins/grib_pi/po/gl_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Galician\n" "Language: gl_ES\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/grib_pi.pot b/plugins/grib_pi/po/grib_pi.pot index a30e1692f6..2f5b982131 100644 --- a/plugins/grib_pi/po/grib_pi.pot +++ b/plugins/grib_pi/po/grib_pi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grib_pi 5.9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-10 22:11-0400\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,33 +17,33 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "" "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -91,19 +91,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -296,7 +296,7 @@ msgid "" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -307,6 +307,10 @@ msgid "" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -612,77 +616,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -690,36 +694,40 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 @@ -730,195 +738,195 @@ msgstr "" msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -926,19 +934,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1008,11 +1016,11 @@ msgid "" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "" "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but " diff --git a/plugins/grib_pi/po/he_IL.po b/plugins/grib_pi/po/he_IL.po index 398ec49e01..c83511f3e4 100644 --- a/plugins/grib_pi/po/he_IL.po +++ b/plugins/grib_pi/po/he_IL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hebrew\n" "Language: he_IL\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/hi_IN.po b/plugins/grib_pi/po/hi_IN.po index 5c3505ea37..c6abedee5d 100644 --- a/plugins/grib_pi/po/hi_IN.po +++ b/plugins/grib_pi/po/hi_IN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hindi\n" "Language: hi_IN\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "अनुरोधित क्षेत्र को आकर्षित करें \n" "or ही अनुरोध को रोकने के लिए यहां क्लिक करें" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "मान्य क्षेत्र और जारी रखें" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -91,19 +91,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "अनुरोधित क्षेत्र को आकर्षित करें या अनुरोध को रोकने के लिए यहां क्लिक करें" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -294,7 +294,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -306,6 +306,10 @@ msgstr "यह विकल्प आपको सूचित करता ह "यह नहीं भूलना चाहिए कि प्रदर्शित डेटा वास्तविक नहीं होगा, लेकिन पुन: कंप्यूट किया जाएगा\n" "यह सटीकता कम कर सकता है!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -610,77 +614,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -688,235 +692,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -924,19 +932,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1004,11 +1012,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1330,75 +1338,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/hu_HU.po b/plugins/grib_pi/po/hu_HU.po index c9602597aa..3d4becc851 100644 --- a/plugins/grib_pi/po/hu_HU.po +++ b/plugins/grib_pi/po/hu_HU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hungarian\n" "Language: hu_HU\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Indítson egy lekérést" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "A kért terület kirajzolása \n" "vagy klikk ide a lekérés megállításához" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Fájl:" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Hiba! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "nem tartalmaz érvényes adatot!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Nincs érvényes GRIB fájl" @@ -91,19 +91,19 @@ msgstr "Beállítások" msgid "Draw requested Area or Click here to stop request" msgstr "A kért terület kirajzolása vagy klikk ide a lekérés megállításához" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "GRIB könyvtár kiválasztása" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "fájl nem létezik!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "nem olvasható!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB kijelzés vezérlés" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Szél" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Széllökés" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Légnyomás, mBar" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Hullám" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Áramlat sebessége, csomó." #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Eső" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Felhőtakaró" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Tenger felszín hőmérséklete, C" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -294,7 +294,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Figyelem!" @@ -304,6 +304,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Előző" @@ -608,77 +612,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Mégse" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Általános beállítások" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Nagyfelbontású grafika használata" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Színátmenetek használata" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Hiányó hullám adatok másolása" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Belenagyítás a fájl megnyitásakor" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "A könyvtárból a legfrissebb fájl megnyitása" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Utoljára megnyitott fájl betöltése" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Fájl betöltési lehetőségek" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "A GRIB fájlban található első előrejelzéssel kezdjen" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Az aktuális időponthoz legközelebbi előrejelzéssel kezdjen" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Interpolálás engedélyezése aktuális időponttól kezdve" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Indítási beállítások" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Helyi idő" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Idő opciók" @@ -686,235 +690,239 @@ msgstr "Idő opciók" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Küldő e-mail címe" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Címzett:" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Előrejelzési modell " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Sebesség" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Csomó" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Fok" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib Login" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib Code" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Felbontás" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Óra" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Időtartomány" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Napok" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Terület kiválasztás" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Kézi kiválasztás" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Mindig ezt a területet használja" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max szélesség" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "É" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max hosszúság" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "K" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min szélesség" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "D" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min hosszúság" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "Ny" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Adat kiválasztás" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Levegő hőmérséklet (2m-en)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Komp. refl." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Tenger felszín hőmérséklete" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "E-Mail" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Becsült fájl méret:" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (max méret)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Adat a pozíción:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Bezárás" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -922,19 +930,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Email hiba: MAPI32.DLL nincs telepítve, vagy érvénytelen ezen a számítógépen!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Beállítások" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Grib adat táblázat" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1008,11 +1016,11 @@ msgstr "A GRIB OpenCPN modul\n" "- tenger felszíni hőmérséklete\n" "- felszíni áramlás iránya és sebessége." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Időjárás táblázat" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1344,75 +1352,3 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/id_ID.po b/plugins/grib_pi/po/id_ID.po index 23e32672e9..7731978351 100644 --- a/plugins/grib_pi/po/id_ID.po +++ b/plugins/grib_pi/po/id_ID.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Indonesian\n" "Language: id_ID\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Permintaan awal" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Berlangganan ke area yang diminta\n" "atau klik di sini untuk membatalkan permintaan" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Area yang cocok dan Lanjutkan" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Berkas: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Kesalahan! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " tidak memuat data yang cocok!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Tidak ada file GRIB yang sah" @@ -91,19 +91,19 @@ msgstr "Pengaturan" msgid "Draw requested Area or Click here to stop request" msgstr "Gambarlah Area yang diminta atau Klik di sini untuk membatalkan permintaan" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Memilih berkas GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " tidak ada berkas!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " tidak bisa dibaca!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Kontrol Tampilan GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Angin" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Hembusan Angin" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Tekanan" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Ombak" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Saat ini" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Curah hujan" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Tutup awan" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Suhu Laut" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "TANJUNG" @@ -297,7 +297,7 @@ msgstr "Memberi otorisasi interpolasi telah anda pilih.\n" " ini akan mengurangkan ketepatannya!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Peringatan!" @@ -309,6 +309,10 @@ msgstr "Pilihan ini menyiratkan Anda mengizinkan interpolasi\n" "Jangan lupa data yang ditampilkan tidak akan nyata tapi dihitung ulang\n" "Hal ini bisa menurunkan akurasi!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Sebelumnya" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Pilihan Umum" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Menggunakan Grafis Definisi Tinggi" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Gunakan Warna Bertahap" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Salin kumulatif Data Pertama yang Hilang" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Salin Gelombang Catatan Hilang" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Menggambar Kepala Panah Berduri" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Muat File yang Lebih Baru di Direktori" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Muat File yang Dibuka Terakhir" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Beban File Pilihan" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Mulai dari perkiraan pertama di file GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Mulai dari yang terdekat dengan pola untuk waktu saat ini" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Interpolasi Otorisasi untuk memulai pada waktu saat ini" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Mulai Pilihan" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Waktu lokal" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Pilihan Waktu" @@ -691,235 +695,239 @@ msgstr "Pilihan Waktu" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Alamat eMail Pengirim" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Mail ke " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Model Prakiraan " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Pindah Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Kecepatan" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kursus" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zygrib masuk" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolusi" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Selang" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Jam" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Rentang Waktu" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Hari" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Seleksi Area" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Pilihan Manual" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Gunakan Selalu Area Ini" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Pemilihan data" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Suhu Udara (2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Suhu Laut (surf.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Tinggi Geopotensial" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Surat" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Perkiraan Ukuran File" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Ukuran Maksimal )" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Data di Posisi:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Dekat" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Kesalahan MAIL: MAPI32.DLL tidak dipasang atau tidak valid di komputer ini!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Preferensi" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Tabel Data Grib" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "Grib plugin untuk OpenCPN\n" "- Energi Potensial Konvektif Tersedia (CAPE)\n" "- angin, ketinggian, suhu dan kelembaban relatif di 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Daftar Cuaca" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1356,75 +1364,3 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/is_IS.po b/plugins/grib_pi/po/is_IS.po index 770d16a301..197e0f0ccc 100644 --- a/plugins/grib_pi/po/is_IS.po +++ b/plugins/grib_pi/po/is_IS.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Icelandic\n" "Language: is_IS\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Skrá: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Villa! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "Stillingar" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vindur" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Vindhviður" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Þrýstingur" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Öldur" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "Sjávarhiti" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Aðvörun!" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Fyrra" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Staðartími" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Senda póst til " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Hraði" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Tímar" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dagar" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "A" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "V" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Póstur" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Loka" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "Valmynd" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/it_IT.po b/plugins/grib_pi/po/it_IT.po index d0c189d8be..f3c77cc27f 100644 --- a/plugins/grib_pi/po/it_IT.po +++ b/plugins/grib_pi/po/it_IT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Inizia una richiesta" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Disegna la richiesta area o Clicca qui per interrompere la richiesta" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Area valida e Continua" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "File: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Errore! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " contiene dati non validi!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "File GRIB non valido" @@ -90,19 +90,19 @@ msgstr "Impostazioni" msgid "Draw requested Area or Click here to stop request" msgstr "Disegna la richiesta area o Clicca qui per interrompere la richiesta" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Seleziona Cartella dei file GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " file è inesistente!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " non può essere letto!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Pannello GRIB" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vento" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Raffiche" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Pressione (hPa)" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Onde" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Corrente" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Precipitazioni" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Copertura nuvolosa" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "Temperatura acqua" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -295,7 +295,7 @@ msgstr "Si è scelto di autorizzare l'interpolazione.\n" "Non dimenticare che i dati visualizzati non saranno reali ma ricalcolati e ciò può diminuire la precisione!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Attenzione!" @@ -306,6 +306,10 @@ msgid "This option imply you authorize intrepolation\n" msgstr "Questa impostazione implica che si autorizzi l'interpolazione\n" "Non dimenticare che i dati visualizzati non saranno reali ma ricalcolati e ciò può diminuire la precisione!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Precedente" @@ -610,77 +614,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Annulla" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Impostazioni generali" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Usa grafica ad alta definizione" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Usa colori graduali" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Copia il primo record cumulativo mancante" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Copia i record mancanti relativi al moto ondoso" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Disegna Frecce Spinato Testa" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Ingrandisci al centro della area quando aperto" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Carica il file più recente nella cartella" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Carica l'ultimo file aperto" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Opzioni di caricamento file" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Inizia alla prima previsione del file GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Inizia alla previsione più vicina all'ora corrente" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Autorizza l'interpolazione a partire dall'ora corrente" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Impostazioni di avvio" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Ora Locale" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Impostazioni tempo" @@ -688,235 +692,239 @@ msgstr "Impostazioni tempo" msgid "Icons Size Factor" msgstr "Fattore dimensione icona" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "Preferenze del Plugin GRIB" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profilo" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Indirizzo Email Mittente" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Mail a " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Modello di previsione " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Grib area in movimento" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Velocità" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Kts" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Rotta" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Deg" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Login zyGrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Codice zyGrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Risoluzione" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervallo" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Ore" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Intervallo di tempo" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Giorni" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Selezione dell'area" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Selezione manuale" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Usa sempre questa area" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Selezione dei dati" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Temperatura aria(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Mass.riflet." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temperatura del mare(sup.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Altezza geopotenziale" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Mail" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Dimensioni file stimate" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Dimensione massima)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Dati in:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Chiudi" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -924,19 +932,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "MAIL Error: MAPI32.DLL non installato o non valido su questo computer!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Preferenze" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Tabella dati Grib" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1015,11 +1023,11 @@ msgstr "GRIB PlugIn per OpenCPN\n" "- Convective Available Potential Energy (CAPE)\n" "- vento, altezza, temperatura e umidità relativa a 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Tabella Meteo" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1354,75 +1362,3 @@ msgstr "Mostra la riflettività iso " msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/ja_JP.po b/plugins/grib_pi/po/ja_JP.po index e08b5d7534..dbf82a2975 100644 --- a/plugins/grib_pi/po/ja_JP.po +++ b/plugins/grib_pi/po/ja_JP.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Japanese\n" "Language: ja_JP\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "要求を開始します。" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "要求されたエリアを描画\n" "または止める場合はここをクリック" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "有効なエリアと継続" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "ファイル: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "エラー! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " 有効なデータが含まれていない!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "有効なGRIBファイルがありません。" @@ -91,19 +91,19 @@ msgstr "設定" msgid "Draw requested Area or Click here to stop request" msgstr "要求されたエリアを描画または止める場合はここをクリック" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "GRIB ファイルを選択します。" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " ファイルが存在しません!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " 読み取ることができません!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB 表示コントロール" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "風" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "最大瞬間風速" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "気圧" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "波浪" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "潮流" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "降雨量" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "雲量" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "海の温度" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "対流有効位置エネルギー(CAPE)" @@ -297,7 +297,7 @@ msgstr "あなたは、補間を承認しました\n" "これは精度の低下を招きます" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "警告 !" @@ -309,6 +309,10 @@ msgstr "このオプションの意味は補間を承認するものです\n" "表示されたデータは実際のものではなく計算されたものであることを忘れないでください\n" "これは精度の低下を招きます" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "前へ" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "一般的なオプション" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "高解像度グラフィックスを使用します。" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "段階的な色を使用" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "最初の累積的に不足しているレコードをコピーします。" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "失われた波の記録をコピーします。" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "風速の矢羽を描画" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "ディレクトリに新しいファイルを読み込む" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "最後に開いたファイルを読み込む" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "ファイルの読み込みオプション" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "GRIB ファイルで最初の予報を開始します。" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "現在の時刻に最も近い予報を開始します。" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "現在の時刻に開始する補間を承認します。" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "起動オプション" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "ローカル時刻" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "タイムオプション" @@ -691,235 +695,239 @@ msgstr "タイムオプション" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "プロファイル" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "送信者メール アドレス" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "メールする " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "予測モデル " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Grib の移動" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "速度" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "ノット" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "コース" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "度" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib ログイン" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib コード" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "解像度" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "インターバル" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "時間" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "時間範囲" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "日" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "エリア選択" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "手動選択" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "常にこの領域を使用" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "最大緯度" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "最大経度" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "最小緯度" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "最小経度" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "データの選択" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "気温(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "海表面の温度" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "ジオポテンシャル高度" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "メール" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "推定ファイル サイズ" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (最大サイズ)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "位置データ:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "閉じる" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "メール エラー: MAPI32。DLL がインストールされてない、またはこのコンピューターで無効です!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "設定" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Grib データ テーブル" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1022,11 +1030,11 @@ msgstr "OpenCPN用のGRIBプラグイン\n" "- 対流有効位置エネルギー(CAPE)\n" "- 300、500、700、850ヘクトパスカルでの風、高度、温度と相対湿度" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "気象表" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1358,75 +1366,3 @@ msgstr "" msgid "Menu" msgstr "メニュー" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/ko_KR.po b/plugins/grib_pi/po/ko_KR.po index deac6fb2c0..3f0607975a 100644 --- a/plugins/grib_pi/po/ko_KR.po +++ b/plugins/grib_pi/po/ko_KR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Korean\n" "Language: ko_KR\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/mr_IN.po b/plugins/grib_pi/po/mr_IN.po index cc11feafd6..f9ad9c54fb 100644 --- a/plugins/grib_pi/po/mr_IN.po +++ b/plugins/grib_pi/po/mr_IN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Marathi\n" "Language: mr_IN\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/nb_NO.po b/plugins/grib_pi/po/nb_NO.po index d85ebc5bcb..d036176a58 100644 --- a/plugins/grib_pi/po/nb_NO.po +++ b/plugins/grib_pi/po/nb_NO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Start en forespørsel" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Tegn forespurt område\n" "eller klikk her for å avbryte" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Gyldig område og fortsett" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Fil: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Feil! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " inneholder ingen gyldige data!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Ingen gyldig GRIB-fil" @@ -91,19 +91,19 @@ msgstr "Innstillinger" msgid "Draw requested Area or Click here to stop request" msgstr "Tegn forespurt område eller klikk her for å avbryte" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Velg en GRIB fil" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " filene eksisterer ikke!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " kan ikke leses!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB visningskontroll" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vind" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Vindkast" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Trykk" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Bølger" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Strøm" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Nedbør" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Skydekke" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Havtemperatur" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Du har valgt å godkjenne interpolering.\n" "Dette kan redusere nøyaktigheten!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Advarsel!" @@ -309,6 +309,10 @@ msgstr "Dette valget innebærer at du godkjenner interpolering\n" "Ikke glem at vist data ikke vil være ekte, men omregnet.\n" "Dette kan redusere nøyaktigheten!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Forrige" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "GUI" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Avbryt" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Generelle alternativer" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Benytt HD grafikk" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Bruk gradiente farger" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Kopier første manglende kumulative registrering" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopier manglende bølgeregistreringer" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Tegn taggede pilhoder" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zoom til fil, sentrer når åpnet" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Last inn nyere fil i mappen" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Last inn sist åpnet fil" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Last inn fil-alternativer" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Start på den første værmeldingen i GRIB filen" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Start på den nærmeste værmeldingen til nåværende tidspunkt" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Godta at interpolering starter på nåværende tidspunkt" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Alternativer for start" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Lokaltid" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Alternativer for Tid" @@ -691,235 +695,239 @@ msgstr "Alternativer for Tid" msgid "Icons Size Factor" msgstr "Ikonenes størrelses faktor" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "GRIB utvidelse innstillinger" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Epost avsender adresse" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Epost til " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Værmeldings modell " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Bevegelig GRIB" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Fart" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Knop" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kurs" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Gra" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib Innlogging" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib Kode" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Oppløsning" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervall" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Timer" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Tidsperiode" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dager" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Valgt område" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Manuelt valg" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Bruk alltid dette området" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Maks B.grad" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Maks L.grad" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "Ø" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min. B.grad" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min. L.grad" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "V" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Data valg" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Lufttemperatur(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Komp. Refleksj." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Havtemperatur(overfl.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotensiell høyde" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Epost" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Estimert filstørrelse" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Max størrelse)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Data ved posisjon:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Lukk" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "EPOST Feil: MAPI32.dll er ikke installert eller er ugyldig på denne datamaskinen!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Alternativer" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "GRIB Datatabell" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "GRIB utvidelse for OpenCPN\n" "- Konvektiv tilgjengelig potensiell energi (CAPE)\n" "- Vind, høyde, temperatur og relativ fuktighet ved 300, 500, 700 og 850 hpa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Værtabell" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1361,75 +1369,3 @@ msgstr "Vis Iso Refleksjon" msgid "Menu" msgstr "Meny" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/nl_NL.po b/plugins/grib_pi/po/nl_NL.po index aec0d45675..a0993e25ec 100644 --- a/plugins/grib_pi/po/nl_NL.po +++ b/plugins/grib_pi/po/nl_NL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Start verzoek" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Teken gevraagd gebied\n" "of klik hier om te stoppen" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Gebied valideren en doorgaan" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Bestand: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Fout! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " bevat geen geldige gegevens!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Geen geldig GRIB-bestand" @@ -91,19 +91,19 @@ msgstr "Instellingen" msgid "Draw requested Area or Click here to stop request" msgstr "Teken verzocht gebied of klik hier om te stoppen" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Selecteer een GRIB-bestand" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " bestanden bestaan niet!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " kan niet gelezen worden!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB Weergaveopties" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Wind" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Windvlagen" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Luchtdruk" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Golfhoogte" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Stroomsnelheid" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Neerslag" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Bewolking" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Zeewatertemperatuur" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "U hebt toegestaan om interpolatie te gebruiken. \n" " Dit kan de nauwkeurigheid verminderen!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Waarschuwing!" @@ -309,6 +309,10 @@ msgstr "Deze optie impliceert dat u interpolatie gebruikt\n" "Vergeet niet dat gegevens die worden weergegeven niet exact, maar geïnterpoleerd zullen zijn.\n" " Dit kan de nauwkeurigheid verminderen!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Vorige" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "GUI" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Annuleer" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Algemene Opties" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Gebruik hoge grafische resolutie" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Gebruik graduele kleuren" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Kopieer 'First Cumulative Missing Record' " -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopieer ontbrekende golfgegevens" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Teken Weerhaken Hoofd" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zoom naar centrum van GRIB-bestand bij openen" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Laad het meest recente bestand uit de map" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Laad het laatst geopende bestand" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Opties voor Laden Bestand" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Beginnen bij de eerste prognose in GRIB-bestand" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Start met de verwachting die het dichtst bij de huidige tijd is" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Laat interpolatie starten op huidige tijd" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Startopties" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Lokale tijd" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Tijdopties" @@ -691,235 +695,239 @@ msgstr "Tijdopties" msgid "Icons Size Factor" msgstr "Icon Grootte Factor" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "GRIB PlugIn voorkeuren" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profiel" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "E-mailadres verzender" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "E-mail aan" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Verwachtingsmodel" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "'Moving' GRIB" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Snelheid" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "kn" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "koers" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "°" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib login" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib code" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolutie" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Interval" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "uren" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Periode" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "dagen" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Gebiedsselectie" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Handmatige selectie" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Altijd dit gebied gebruiken" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max. breedte" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max. lengte" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "O" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min. breedte" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "Z" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min. lengte" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Gegevensselectie" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Luchttemp. (2 m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Berekende reflectie" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Zeewateroppervl.temp." -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotentiële hoogte" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "E-mail" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Geschatte bestandsgrootte" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (max. grootte)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Gegevens op positie:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Sluiten" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Mail-fout: MAPI32.DLL is niet geinstalleerd of ongeldig op deze computer!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Voorkeuren" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "GRIB-gegevenstabel" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "GRIB-PlugIn voor OpenCPN\n" "- convectief beschikbare potentiële energie\n" "- wind, hoogte, temperatuur en relatieve vochtigheid op 300, 500, 700 en 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Weertabel" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1361,75 +1369,3 @@ msgstr "Laat Iso Reflectie zien" msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/pl_PL.po b/plugins/grib_pi/po/pl_PL.po index 11995c2f0e..2254887bff 100644 --- a/plugins/grib_pi/po/pl_PL.po +++ b/plugins/grib_pi/po/pl_PL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Rozpocznij żądanie" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Zaznacz żądany obszar\n" "lub klliknij tu, aby przerwać" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Wybrany Obszar i Kontynuuj" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Plik: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Wystąpił błąd! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " nie zawiera prawidłowych danych!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Brak prawidłowego pliku GRIB" @@ -91,19 +91,19 @@ msgstr "Ustawienia" msgid "Draw requested Area or Click here to stop request" msgstr "Zaznacz żądany obszar lub kliknij tu, aby porzucić przerwać" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Wybierz plik GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " pliki nie istnieją!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " nie można odczytać!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Ustawienia wyświetlania GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Wiatr" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Wiatr w porywach" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Ciśnienie, mBar" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Falowanie" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Prędkość prądu" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Opady" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Zachmurzenie" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Temperatura morza" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Wybrano opcję Autoryzuj interpolację. \n" "To może zmniejszyć dokładność!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Uwaga!" @@ -309,6 +309,10 @@ msgstr "Ta opcja oznacza, że akceptujesz interpolację\n" "Nie zapomnij, że dane wyświetlane nie będą prawdziwe, ale przeliczone\n" "To może zmniejszyć dokładność!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Poprzedni" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Ustawienia ogólne" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Użyj grafiki wysokiej rozdzielczości" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Użyj łagodnych przejść barwnych" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Skopiuj pierwszy brakujący rekord sumaryczny" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Skopiuj brakujące rekordy Wave" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Ustaw na środku po otwarciu pliku" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Załaduj najnowszy plik w katalogu" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Załaduj ostatnio otwarty plik" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Opcje ładowania plików" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Zacznij od pierwszej prognozy w pliku GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Zacznij od prognozy najbliższej aktualnej daty" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Zatwierdź interpolację od aktualnej daty" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Wybór początkowej prognozy" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Czas lokalny" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Ustawienia czasu" @@ -691,235 +695,239 @@ msgstr "Ustawienia czasu" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Adres mailowy nadawcy" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Wyślij do" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Model prognozy " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Ruchomy GRIB" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Prędkość" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "w." -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Kurs" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Stopni" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Login zyGrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Kod zyGrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Rozdzielczość" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Interwał" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Godzin" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Zakres czasowy" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "dni" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Wybór obszaru" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Wybór ręczny" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Używaj zawsze tego obszaru" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Szer." -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Dług." -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Szer." -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Dług." -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Wybór danych" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Temp. powietrza (2 m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temperatura powierzchni morza" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Liczba geopotencjalna" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Treść wiadomości" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Szacowana wielkość pliku" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Maksymalny rozmiar)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Dane w pozycji:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Zamknij" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Błąd: MAPI32.DLL na tym komputerze nie jest zainstalowany lub jest uszkodzony!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Ustawienia" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Tabela danych GRIB" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1020,11 +1028,11 @@ msgstr "Wtyczka GRIB dla OpenCPN\n" "- energia potencjalna dostępna konwekcyjnie (CAPE)\n" "- wiatr, temperatura i wilgotność względna dla 300, 500, 700, 850 hPa" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Tabela danych pogodowych" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1357,75 +1365,3 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/pt_BR.po b/plugins/grib_pi/po/pt_BR.po index ced9f77deb..a963b7c8ab 100644 --- a/plugins/grib_pi/po/pt_BR.po +++ b/plugins/grib_pi/po/pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Iniciar uma solicitação" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Solicitada Area\n" "ou clique aqui para parar o pedido" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Validar a área e continuar" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Arquivo: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Erro! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " contém nenhum dado válido!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Nenhum arquivo GRIB válido" @@ -91,19 +91,19 @@ msgstr "Configurações" msgid "Draw requested Area or Click here to stop request" msgstr "Marque a área do pedido ou clicar aqui para interromper o pedido" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Selecione um arquivo GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " arquivos não existem!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " não pode ser lido!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Controle de exibição do GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vento" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Rajada" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Pressão" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Ondas" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Corrente" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Chuva" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Cobertura de nuvens" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Temperatura do mar" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CABO" @@ -297,7 +297,7 @@ msgstr "Você optou por autorizar a interpolação.\n" "Isso pode diminuir a precisão!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Aviso!" @@ -309,6 +309,10 @@ msgstr "Esta opção implica autorizar interpolação\n" "Não se esqueça que os dados exibidos não serão reais mas recalculados\n" "Isso pode diminuir a precisão!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Anterior" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "GUI" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Opções gerais" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Usar Gráficos de Alta Definição" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Usar cores Gradual" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Copiar o primeiro acumulado registos em falta" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Copiar registos de onda em falta" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Desenhar Cabeça farpada das setas" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Carregar o arquivo mais recente do diretório" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Carregue o último arquivo aberto" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Opções de carga de arquivo" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Comece na primeira previsão do arquivo GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Começar na previsão mais próxima da hora atual" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Permitir interpolação para começar na hora atual" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Opções de início" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Hora Local" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Opções horárias" @@ -691,235 +695,239 @@ msgstr "Opções horárias" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Perfil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Endereço eMail do remetente" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Enviar eMail para " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Modelo de previsão " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Grib movel" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Velocidade" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Nós" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Curso" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Deg" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "login zyGrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "código zyGrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolução" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervalo" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Horas" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Intervalo de tempo" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dias" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Seleção de área" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Seleção manual" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Use sempre nesta área" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Seleção de dados" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Temperatura do ar (2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temperatura do mar(superfície)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Altura geopotencial" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Correio" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Tamanho estimado do arquivo" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Tamanho máximo )" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Dados na Posição:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Fechar" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Erro de correio: MAPI32.DLL não está instalada ou é inválida neste computador!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Preferências" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Tabela de Dados Grib" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "Plugin GRIB para OpenCPN\n" "- Avaliação da energia Potencial de Convecção (CAPE)\n" "- vento, altitude, temperatura e umidade relativa a 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Tabela do tempo" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1356,75 +1364,3 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/pt_PT.po b/plugins/grib_pi/po/pt_PT.po index fe4f6296b2..ab122629a9 100644 --- a/plugins/grib_pi/po/pt_PT.po +++ b/plugins/grib_pi/po/pt_PT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Portuguese\n" "Language: pt_PT\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Iniciar um pedido" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Marque a área do pedido\n" "ou prima aqui para interromper o pedido" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Validar a área e continuar" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Ficheiro: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Erro! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " contém nenhum dado válido!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Nenhum ficheiro GRIB válido" @@ -91,19 +91,19 @@ msgstr "Configurações" msgid "Draw requested Area or Click here to stop request" msgstr "Marque a área do pedido ou prima aqui para interromper o pedido" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Seleccione um ficheiro GRIB" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " ficheiros inexistentes!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " não pode ser lido!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "Controle de apresentação GRIB" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vento" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Rajada" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Pressão" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Ondas" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Corrente" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Precipitação" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Nebulosidade" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Temperatura do mar" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Você optou por autorizar a interpolação.\n" "Isso pode diminuir a precisão!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Atenção!" @@ -309,6 +309,10 @@ msgstr "Esta opção implica autorizar interpolação\n" "Não esqueça que os dados apresentados não serão reais, mas recalculados\n" "Isso pode diminuir a precisão!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Anterior" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "GUI" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Cancelar" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Opções Gerais" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Usar gráficos de alta definição" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Usar cores esbatidas" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Copiar o primeiro acumulado de registos em falta" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Copiar registos de onda em falta" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Desenhar pontas de seta farpadas" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zoom para o centro do ficheiro quando aberto" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Carregar o ficheiro mais recente do diretório" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Carregar o último ficheiro aberto" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Opções de carregamento de ficheiros" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Começar na primeira previsão do ficheiro GRIB" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Começar na previsão mais próxima da hora actual" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Permitir interpolação para começar na hora atual" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Opções de início" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Hora Local" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Opções horárias" @@ -691,235 +695,239 @@ msgstr "Opções horárias" msgid "Icons Size Factor" msgstr "Fator de Tamanho dos ícones" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "Preferências do PlugIn GRIB" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Perfil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Endereço eMail do remetente" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Enviar eMail para " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Modelo de previsão " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Grib movél" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Velocidade" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Kts" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Rumo" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Graus" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Login zyGrib" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Código zyGrib" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Resolução" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervalo" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Horas" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Intervalo de tempo" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dias" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Selecção de área" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Selecção manual" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Use sempre esta área" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "O" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Dados pretendidos" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Temperatura do ar (2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Refletiv. Comp." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Temperatura do mar(sup.)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Altitude Geopotencial" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Correio" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Tamanho estimado do ficheiro" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Tamanho máximo )" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Dados na Posição:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Fechar" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Erro de correio: MAPI32.DLL não está instalada ou é inválida neste computador!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Preferências" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Tabela de Dados Grib" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "Plugin GRIB para OpenCPN\n" "- Energia Potencial de Conveção Disponível (CAPE)\n" "- vento, altitude, temperatura e humidade relativa a 300, 500, 700, 850 hPa." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Tabela do tempo" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1360,75 +1368,3 @@ msgstr "Mostrar a refletividade Iso" msgid "Menu" msgstr "Menu" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/ro_RO.po b/plugins/grib_pi/po/ro_RO.po index 4699c21932..f0c08aeeee 100644 --- a/plugins/grib_pi/po/ro_RO.po +++ b/plugins/grib_pi/po/ro_RO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Romanian\n" "Language: ro_RO\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/ru_RU.po b/plugins/grib_pi/po/ru_RU.po index 63b24514a2..638aaf354f 100644 --- a/plugins/grib_pi/po/ru_RU.po +++ b/plugins/grib_pi/po/ru_RU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 20:51\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Начать запрос" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Выделите запрашиваемую область \n" "или Нажмите здесь, чтобы остановить запрос" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Подтвердить выбор области и продолжить" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Файл: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Ошибка! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " не содержит допустимые данные!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Недопустимый файл" @@ -91,19 +91,19 @@ msgstr "Настройки" msgid "Draw requested Area or Click here to stop request" msgstr "Выделите запрашиваемую область или Нажмите здесь, чтобы остановить запрос" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Выберите GRIB-файл" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " файл не существует!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " не удается прочитать!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB — Управление отображением" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Ветер" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Порыв ветра" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Давление" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Волны" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Течение" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Осадки" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Облачность" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Температура воды" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "Энергия конвекции" @@ -297,7 +297,7 @@ msgstr "Вы активировали интерполяцию данных.\n" "будут интерполированными, а не реальными!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Внимание!" @@ -309,6 +309,10 @@ msgstr "Вы активировали интерполяцию данных.\n" "Имейте в виду, что отображаемые данные\n" "будут интерполированными, а не реальными!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Раньше" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Отмена" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Основные Настройки" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Рисовать с высоким качеством" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Рисовать с переливами цветов" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Копировать первую отсутствующую накопительную запись" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Копировать отсутствующие данные о волнах" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Направление Ветра Стрелкой" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Приблизить к центру файла при открытии" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Загружать наиболее свежий файл из папки" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Загружать последний открытый файл" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Параметры загрузки файла" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Начинать с первого прогноза в файле" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Начинать с наиболее актуального прогноза" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Разрешить интерполяцию с текущего времени" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Параметры инициализации" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Местное время" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "Гринвичское время (UTC)" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Параметры отображения времени" @@ -691,235 +695,239 @@ msgstr "Параметры отображения времени" msgid "Icons Size Factor" msgstr "Размер иконок" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "Настройки модуля GRIB" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "Загрузить grib..." -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "Длина прогноза" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "24 часа" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "3 дня" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "Максимум" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "Модель" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "Загрузить" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "Весь мир" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "Обновить каталог" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "Локальные модели" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Профиль запроса" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Адрес отправителя" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Поставщик данных" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Модель прогноза" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Данные для рейса" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Скорость" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "уз." -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Курс" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "°" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "Учётная запись zyGRIB" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "Персональный код zyGRIB" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Разрешение" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Интервал" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "ч" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Диапазон времени" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "дн." -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Выбор области" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Ручной выбор области" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Использовать эту области всегда" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Макс. Широта" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "C" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Макс. Долгота" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "В" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Мин. Широта" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "Ю" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Мин. Долгота" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "З" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Выбор данных" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Температура воздуха (2 м)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Отраж. Спос." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Температура воды (0 м)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Геопотенциальная Высота" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 гПа" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 гПа" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 гПа" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 гПа" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Почта" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Приблизительный размер файла" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (макс. размер)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "эл. почта" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Данные в позиции:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Закрыть" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "Проекция позиции" @@ -927,19 +935,19 @@ msgstr "Проекция позиции" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Ошибка: почтовая библиотека MAPI32.DLL не установлена или неисправна." -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Настройки" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "Получить прогноз..." -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "Таблица метео данных Grib" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1008,11 +1016,11 @@ msgid "GRIB PlugIn for OpenCPN\n" msgstr "Модуль «GRIB» для OpenCPN\n" "Запрашивает прогноз погоды и отображает его поверх карты." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Таблица прогноза погоды" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1344,75 +1352,3 @@ msgstr "Отображение Iso Reflectivity" msgid "Menu" msgstr "Меню" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/sv_SE.po b/plugins/grib_pi/po/sv_SE.po index 8107e71633..40e602d50a 100644 --- a/plugins/grib_pi/po/sv_SE.po +++ b/plugins/grib_pi/po/sv_SE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Skicka begäran" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "Rita inställd area\n" "eller klicka här för att avbryta" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Acceptera området och fortsätt" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Fil: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Fel! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " innehåller inga giltiga data!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Ingen giltig GRIB-fil" @@ -91,19 +91,19 @@ msgstr "Inställningar" msgid "Draw requested Area or Click here to stop request" msgstr "Rita inställd area eller klicka här för att avbryta" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Välj en GRIB-fil" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " hittar inte filerna!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " går inte att läsa!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB Visningskontroll" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "dBZ" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Vind" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Vindby" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Lufttryck" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Våghöjd" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Ström" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Nederbörd" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Molntäcke" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Vattentemperatur" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Du har valt att tillåta interpolation. \n" "minskad noggrannhet!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Varning" @@ -309,6 +309,10 @@ msgstr "Detta alternativ innebär interpolation. \n" "Tänk på att data som då visas är beräknade och möjligen\n" "har minskad noggrannhet!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Föregående" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "Avbryt" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Allmänna inställningar" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Använd högupplöst grafik" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Använd gradvisa färger" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Kopiera första ökande information som saknas" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kopiera saknad våginformation" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "Rita hullingförsedda vindpilar" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "Zooma till filens mitt vid inläsning" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Välj nyaste fil i katalogen" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Välj senast öppnad fil" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Inställningar för inläsning av fil" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "Starta vid den första prognosen i GRIB-filen" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Starta vid den prognos som är närmast aktuell tid" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Tillåt interpolering för att starta vid aktuell tid" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Startinställningar" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Lokal tid" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Tidsinställningar" @@ -691,235 +695,239 @@ msgstr "Tidsinställningar" msgid "Icons Size Factor" msgstr "Ikoner. Justera storlek" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "Inställningar för GRIB PlugIn" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "Hämta grib..." -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "Prognos längd" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "24 timmar" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "3 dagar" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "Maximalt" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "Prognosmodell" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "Hämta" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "Värld" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "Uppdatera katalog" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "Lokala modeller" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Avsändarens epostadress" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "Epost Till" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Prognosmodell" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Glidande Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Fart" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Knop" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Timmar" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Grader" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "ZyGrib användarnamn" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "ZyGrib lösenord" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Upplösning" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Intervall" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Timmar" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Avstånd" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Dagar" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Val av område för Grib-filen" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Manuellt val av område" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Använd alltid detta område" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max Lat" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "N" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Long" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "E" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Lat" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "S" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Long" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "W" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Dataurval" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Lufttemperatur(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "Sam. Refl." -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Vattentemperatur(ytan)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geopotential höjd" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850 hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "Epost" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Beräknad filstorlek" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (Max storlek)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "emejl" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "XyGrib" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Data på position:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Avsluta" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "Förväntad position" @@ -927,19 +935,19 @@ msgstr "Förväntad position" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "Epostfel: Mapi är inte installerat eller saknas på datorn!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Inställningar" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "Hämta prognos..." -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "GRIB datatabell" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1013,11 +1021,11 @@ msgstr "GRIB-modul för OpenCPN\n" "- ytvattentemperatur\n" "- strömhastighet och riktning" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Vädertabell" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1353,75 +1361,3 @@ msgstr "Visa Iso-reflektivitet" msgid "Menu" msgstr "Meny" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "Vågmodell" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "Vädermodell" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "Start" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "Vind (10m)" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "Byvind (ytan)" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "Lufttryck (MSL)" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "Temperatur (2m)" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "CAPE (yta)" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "Reflektivitet (atmosfär)" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "molntäcke(totalt)" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "Total nederbörd" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "Våghöjd" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "Vindvågor" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "Inställningar" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "Status :" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "Klart" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "Uppskattad storlek" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "Okänd" - diff --git a/plugins/grib_pi/po/th_TH.po b/plugins/grib_pi/po/th_TH.po index 1677cf7fa6..a9e05c0256 100644 --- a/plugins/grib_pi/po/th_TH.po +++ b/plugins/grib_pi/po/th_TH.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Thai\n" "Language: th_TH\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/tr_TR.po b/plugins/grib_pi/po/tr_TR.po index 46f8f5576f..dbabb4ed4d 100644 --- a/plugins/grib_pi/po/tr_TR.po +++ b/plugins/grib_pi/po/tr_TR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "Bir istek başlat" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "İstenen alanı çiz\n" "yada talebi geri çekmek için buraya tıkla" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "Geçerli Alan ve Devam" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "Dosya: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "Hata! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " geçerli veri içermiyor!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "Geçerli GRIB dosyası yok" @@ -91,19 +91,19 @@ msgstr "Yapılandırma" msgid "Draw requested Area or Click here to stop request" msgstr "İstenen alanı çizin yada isteği durdurmak için Buraya tıklayın" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "Bir GRIB dosyası seçin" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " dosyalar yok!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " okunamıyor!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIP Görünüm Denetimi" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "Rüzgar" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "Rüzgar Kaçağı" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "Basınç" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "Dalga" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "Akıntı" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "Yağmur" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "Bulut Durumu" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "Deniz Suyu Sıcaklığı" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "CAPE" @@ -297,7 +297,7 @@ msgstr "Enterpolasyonu yetkilendirmeyi seçtiniz\n" "Bu, doğruluğunu düşürebilir!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "Dikkat!" @@ -309,6 +309,10 @@ msgstr "Bu seçenek enterpolasyon yetkisi verdiğinizi ima eder\n" "Unutmayın ki görüntülenen veri gerçek değil yeniden hesaplanmış bir veri olacaktır\n" "Bu, doğruluğunu düşürebilir!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "Önceki" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "Genel Ayarlar" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "Yüksek Çözünürlüklü Grafik Kullan" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "Geçişken Renkler Kullan" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "Önce Kayıp Birikimli Kaydı Kopyala" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "Kayıp Dalga Kaydını Kopyala" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "Klasördeki En Son Dosyayı yükle" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "Son Açılan Dosyayı Yükle" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "Dosya Seçeneklerini Aç" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "GRIB dosyasındaki ilk hava tahminini başlat" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "Şimdiki zamana en yakın olan tahmini Başlat" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "Şimdiki zamanda başlatmak için ortalama değerlere izin verin." -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "Seçenekleri Başlat" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "Yerel Saat" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "UTC" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "Zaman Seçenekleri" @@ -691,235 +695,239 @@ msgstr "Zaman Seçenekleri" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "Profil" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "Göndericinin ePosta Adresi" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "E-posta gönder " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "Tahmin Modeli" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "Hareketli Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "Hız" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "Kts" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "Yön" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "Derece" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib Dosyasının Yeri" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib Kodu" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "Çözünürlük" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "Rapor Aralığı" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "Saat" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "Zaman Aralığı" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "Gün" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "Bölge Seçimi" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "Elle Seçim" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "Her zaman bu alanı kullanın" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "Max enlem" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "K" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "Max Boylam" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "D" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "Min Enlem" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "G" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "Min Boylam" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "B" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "Veri Seçimi" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "Hava Sıcaklığı(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "Deniz Suyu Sıcaklığı (Yüzey)" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "Geografik Yükseklik" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "850hPa" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "700 hPa" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "500 hPa" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "300 hPa" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "E-posta" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "Hesaplanan Dosya Boyutu" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "(Max büyüklük)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "Konumdaki Veriler:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "Kapat" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "MAIL Hatası: MAPI32.DLL bu bilgisayarda yok ya da doğru yüklenmemiş." -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "Tercihler" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "GRIB Veri Tablosu" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "OpenCPN için GRIB Eklentisi\n" "- Convective Eldeedilebilir Potansiyel Enerji (CAPE)\n" "- Rüzgar, yükseklik, sıcaklık ve görece nem (300, 500, 700, 850 hPa)." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "Hava Raporu Tablosu" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1356,75 +1364,3 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/vi_VN.po b/plugins/grib_pi/po/vi_VN.po index 4f8a5c21cc..4c5847a799 100644 --- a/plugins/grib_pi/po/vi_VN.po +++ b/plugins/grib_pi/po/vi_VN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Vietnamese\n" "Language: vi_VN\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/zh_CN.po b/plugins/grib_pi/po/zh_CN.po index 028c8d621b..0555ec8c47 100644 --- a/plugins/grib_pi/po/zh_CN.po +++ b/plugins/grib_pi/po/zh_CN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -17,33 +17,33 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "开始请求" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "画出请求区域\n" "或点击此处停止请求" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "有效区域并继续" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "文件: " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "出错! " -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr " 没有有效数据!" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "无有效GRIB文件" @@ -91,19 +91,19 @@ msgstr "设置" msgid "Draw requested Area or Click here to stop request" msgstr "画出请求区域或点击此处停止请求" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "选择一个GRIB文件" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr " 文件不存在!" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr " 不能读取!" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "GRIB显示控制" @@ -177,40 +177,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "风" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "阵风" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "压力" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "海浪" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "海流" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "降雨" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "云层覆盖" @@ -223,7 +223,7 @@ msgid "Sea Temperature" msgstr "海水温度" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "对流有效位能" @@ -297,7 +297,7 @@ msgstr "已选择授权更改数值\n" "精度会降低!" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "警告!" @@ -309,6 +309,10 @@ msgstr "本选项可授权更改数值\n" "注意显示数据为非真实数据,是运算出的\n" "精度会降低!" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "上一个" @@ -613,77 +617,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "通用选项" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "使用高清图形" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "使用渐变色" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "复制第一个累积的丢失记录" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "复制丢失的海浪记录" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "画出带刺的箭头" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "打开后缩放至文件中心" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "装载目录中最近的文件" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "装载最后打开的文件" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "装载文件选项" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "启动GRIB文件中第一个预报" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "启动距当前时间最近的预报" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "当期时间启动时授权数值更改" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "启动选项" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "当地时间" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "时间选项" @@ -691,235 +695,239 @@ msgstr "时间选项" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "档案" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "发送者邮件地址" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "邮件至 " -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "预报模型 " -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "移动Grib" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "速度" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "节" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "航向" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "度" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "zyGrib登录" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "zyGrib代码" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "分辨率" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "间隔" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "小时" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "时间长短" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "天" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "区域选择" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "手动选择" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "总使用此区域" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "最大纬度" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "最大经度" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "最小纬度" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "最小经度" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "数据选择" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "气温(2m)" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "海平面温度" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "位势高度" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "邮件" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "估计文件大小" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr " (最大规格)" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "位置数据:" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "关闭" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -927,19 +935,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "邮件出错:此计算机未安装MAPI32.DLL或无效!" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "首选项" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "GRIB数据表" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1021,11 +1029,11 @@ msgstr "OpenCPN GRIB插件\n" "- 对流可用势能 (CAPE)\n" "- 300, 500, 700, 850 hPa时的风,高度,温度及相对湿度." -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "天气表" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1356,75 +1364,3 @@ msgstr "" msgid "Menu" msgstr "菜单" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/po/zh_TW.po b/plugins/grib_pi/po/zh_TW.po index 93472d5ea7..3833f21b18 100644 --- a/plugins/grib_pi/po/zh_TW.po +++ b/plugins/grib_pi/po/zh_TW.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 09:21+0200\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-30 21:39-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" @@ -17,32 +17,32 @@ msgstr "" "X-Crowdin-File: /plugins/grib_pi/po/grib_pi.pot\n" "X-Crowdin-File-ID: 114\n" -#: src/GribUIDialog.cpp:427 src/GribUIDialog.cpp:1027 +#: src/GribUIDialog.cpp:428 src/GribUIDialog.cpp:1027 msgid "Start a request" msgstr "" -#: src/GribUIDialog.cpp:433 +#: src/GribUIDialog.cpp:434 msgid "Draw requested Area\n" "or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:438 src/GribUIDialog.cpp:1030 +#: src/GribUIDialog.cpp:439 src/GribUIDialog.cpp:1030 msgid "Valid Area and Continue" msgstr "" -#: src/GribUIDialog.cpp:479 +#: src/GribUIDialog.cpp:480 msgid "File: " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid "Error! " msgstr "" -#: src/GribUIDialog.cpp:484 +#: src/GribUIDialog.cpp:485 msgid " contains no valid data!" msgstr "" -#: src/GribUIDialog.cpp:519 +#: src/GribUIDialog.cpp:520 msgid "No valid GRIB file" msgstr "" @@ -90,19 +90,19 @@ msgstr "" msgid "Draw requested Area or Click here to stop request" msgstr "" -#: src/GribUIDialog.cpp:1708 src/GribUIDialog.cpp:1736 +#: src/GribUIDialog.cpp:1710 src/GribUIDialog.cpp:1738 msgid "Select a GRIB file" msgstr "" -#: src/GribUIDialog.cpp:2025 +#: src/GribUIDialog.cpp:2027 msgid " files don't exist!" msgstr "" -#: src/GribUIDialog.cpp:2046 +#: src/GribUIDialog.cpp:2048 msgid " can't be read!" msgstr "" -#: src/GribUIDialog.cpp:2393 src/GribUIDialog.cpp:2397 +#: src/GribUIDialog.cpp:2395 src/GribUIDialog.cpp:2399 #: src/GribUIDialogBase.h:199 msgid "GRIB Display Control" msgstr "" @@ -176,40 +176,40 @@ msgid "dBZ" msgstr "" #: src/GribSettingsDialog.cpp:64 src/GribUIDialogBase.cpp:603 -#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2783 +#: src/GribUIDialogBase.cpp:1342 src/GribUIDialogBase.cpp:2803 #: src/GribOverlayFactory.cpp:1467 msgid "Wind" msgstr "" #: src/GribSettingsDialog.cpp:65 src/GribUIDialogBase.cpp:622 -#: src/GribUIDialogBase.cpp:2791 +#: src/GribUIDialogBase.cpp:2811 msgid "Wind Gust" msgstr "" #: src/GribSettingsDialog.cpp:66 src/GribUIDialogBase.cpp:635 -#: src/GribUIDialogBase.cpp:2787 src/GribTable.cpp:134 +#: src/GribUIDialogBase.cpp:2807 src/GribTable.cpp:134 msgid "Pressure" msgstr "" #: src/GribSettingsDialog.cpp:67 src/GribUIDialogBase.cpp:650 -#: src/GribUIDialogBase.cpp:2832 +#: src/GribUIDialogBase.cpp:2852 msgid "Waves" msgstr "" #: src/GribSettingsDialog.cpp:68 src/GribUIDialogBase.cpp:675 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2823 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2843 msgid "Current" msgstr "" #: src/GribSettingsDialog.cpp:69 src/GribUIDialogBase.cpp:695 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2795 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2815 #: src/GribTable.cpp:171 msgid "Rainfall" msgstr "" #: src/GribSettingsDialog.cpp:70 src/GribUIDialogBase.cpp:710 #: src/GribUIDialogBase.cpp:716 src/GribUIDialogBase.cpp:1343 -#: src/GribUIDialogBase.cpp:2799 src/GribTable.cpp:180 +#: src/GribUIDialogBase.cpp:2819 src/GribTable.cpp:180 msgid "Cloud Cover" msgstr "" @@ -222,7 +222,7 @@ msgid "Sea Temperature" msgstr "" #: src/GribSettingsDialog.cpp:73 src/GribUIDialogBase.cpp:752 -#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2809 +#: src/GribUIDialogBase.cpp:1343 src/GribUIDialogBase.cpp:2829 #: src/GribTable.cpp:208 msgid "CAPE" msgstr "" @@ -293,7 +293,7 @@ msgid "You have chosen to authorize interpolation.\n" msgstr "" #: src/GribSettingsDialog.cpp:1141 src/GribSettingsDialog.cpp:1190 -#: src/grib_pi.cpp:861 src/GribRequestDialog.cpp:1359 +#: src/grib_pi.cpp:884 src/GribRequestDialog.cpp:1359 msgid "Warning!" msgstr "" @@ -303,6 +303,10 @@ msgid "This option imply you authorize intrepolation\n" "This can decrease accuracy!" msgstr "" +#: src/GribUIDialog.h:185 src/GribUIDialogBase.cpp:2323 +msgid "Choose GRIB File Directory" +msgstr "" + #: src/GribUIDialogBase.cpp:40 src/GribUIDialogBase.cpp:164 msgid "Previous" msgstr "" @@ -607,77 +611,77 @@ msgid "GUI" msgstr "" #: src/GribUIDialogBase.cpp:1840 src/GribUIDialogBase.cpp:2077 -#: src/GribUIDialogBase.cpp:2936 src/GribRequestDialog.cpp:567 +#: src/GribUIDialogBase.cpp:2956 src/GribRequestDialog.cpp:567 #: src/GribRequestDialog.cpp:772 src/GribRequestDialog.cpp:825 #: src/GribRequestDialog.cpp:2054 msgid "Cancel" msgstr "" -#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2214 +#: src/GribUIDialogBase.cpp:2085 src/GribUIDialogBase.cpp:2223 msgid "General Options" msgstr "" -#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2219 +#: src/GribUIDialogBase.cpp:2093 src/GribUIDialogBase.cpp:2228 msgid "Use High Definition Graphics" msgstr "" -#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2224 +#: src/GribUIDialogBase.cpp:2098 src/GribUIDialogBase.cpp:2233 msgid "Use Gradual Colors" msgstr "" -#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2229 +#: src/GribUIDialogBase.cpp:2103 src/GribUIDialogBase.cpp:2238 msgid "Copy First Cumulative Missing Record" msgstr "" -#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2234 +#: src/GribUIDialogBase.cpp:2108 src/GribUIDialogBase.cpp:2243 msgid "Copy Missing Wave Records" msgstr "" -#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2239 +#: src/GribUIDialogBase.cpp:2113 src/GribUIDialogBase.cpp:2248 msgid "Draw Barbed Arrows Head" msgstr "" -#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2244 +#: src/GribUIDialogBase.cpp:2118 src/GribUIDialogBase.cpp:2253 msgid "Zoom to file center when opened" msgstr "" -#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2249 +#: src/GribUIDialogBase.cpp:2127 src/GribUIDialogBase.cpp:2258 msgid "Load the More Recent File in Directory" msgstr "" -#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2250 +#: src/GribUIDialogBase.cpp:2128 src/GribUIDialogBase.cpp:2259 msgid "Load the Last Opened File" msgstr "" -#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2254 +#: src/GribUIDialogBase.cpp:2132 src/GribUIDialogBase.cpp:2263 msgid "Load File Options" msgstr "" -#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2261 +#: src/GribUIDialogBase.cpp:2139 src/GribUIDialogBase.cpp:2270 msgid "Start at the first forecast in GRIB file" msgstr "" -#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2262 +#: src/GribUIDialogBase.cpp:2140 src/GribUIDialogBase.cpp:2271 msgid "Start at the nearest forecast to current time" msgstr "" -#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2263 +#: src/GribUIDialogBase.cpp:2141 src/GribUIDialogBase.cpp:2272 msgid "Authorize Interpolation to start at current time" msgstr "" -#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2267 +#: src/GribUIDialogBase.cpp:2145 src/GribUIDialogBase.cpp:2276 msgid "Start Options" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "Local Time" msgstr "" -#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2273 +#: src/GribUIDialogBase.cpp:2150 src/GribUIDialogBase.cpp:2282 msgid "UTC" msgstr "" -#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2276 +#: src/GribUIDialogBase.cpp:2153 src/GribUIDialogBase.cpp:2285 msgid "Time Options" msgstr "" @@ -685,235 +689,239 @@ msgstr "" msgid "Icons Size Factor" msgstr "" -#: src/GribUIDialogBase.cpp:2200 +#: src/GribUIDialogBase.cpp:2175 +msgid "Select GRIB download directory" +msgstr "" + +#: src/GribUIDialogBase.cpp:2209 msgid "GRIB PlugIn Preferences" msgstr "" -#: src/GribUIDialogBase.cpp:2334 src/GribUIDialogBase.cpp:2408 +#: src/GribUIDialogBase.cpp:2354 src/GribUIDialogBase.cpp:2428 #: src/GribRequestDialog.cpp:738 msgid "Download grib..." msgstr "" -#: src/GribUIDialogBase.cpp:2343 +#: src/GribUIDialogBase.cpp:2363 msgid "Forecast length" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "24 hours" msgstr "" -#: src/GribUIDialogBase.cpp:2348 +#: src/GribUIDialogBase.cpp:2368 msgid "3 days" msgstr "" -#: src/GribUIDialogBase.cpp:2349 +#: src/GribUIDialogBase.cpp:2369 msgid "Maximum" msgstr "" -#: src/GribUIDialogBase.cpp:2358 +#: src/GribUIDialogBase.cpp:2378 msgid "Model" msgstr "" -#: src/GribUIDialogBase.cpp:2376 src/GribUIDialogBase.cpp:2423 +#: src/GribUIDialogBase.cpp:2396 src/GribUIDialogBase.cpp:2443 #: src/GribRequestDialog.cpp:554 src/GribRequestDialog.cpp:627 #: src/GribRequestDialog.cpp:759 src/GribRequestDialog.cpp:798 #: src/GribRequestDialog.cpp:812 src/GribRequestDialog.cpp:833 #: src/GribRequestDialog.cpp:889 src/GribRequestDialog.cpp:951 #: src/GribRequestDialog.cpp:2029 src/GribRequestDialog.cpp:2090 #: src/GribRequestDialog.cpp:2124 src/GribRequestDialog.cpp:2150 -#: src/GribRequestDialog.cpp:2182 src\XyGribPanel.cpp:122 +#: src/GribRequestDialog.cpp:2182 msgid "Download" msgstr "" -#: src/GribUIDialogBase.cpp:2385 +#: src/GribUIDialogBase.cpp:2405 msgid "World" msgstr "" -#: src/GribUIDialogBase.cpp:2417 +#: src/GribUIDialogBase.cpp:2437 msgid "Update Catalog" msgstr "" -#: src/GribUIDialogBase.cpp:2432 +#: src/GribUIDialogBase.cpp:2452 msgid "Local models" msgstr "" -#: src/GribUIDialogBase.cpp:2452 +#: src/GribUIDialogBase.cpp:2472 msgid "Profile" msgstr "" -#: src/GribUIDialogBase.cpp:2466 +#: src/GribUIDialogBase.cpp:2486 msgid "Sender eMail Address" msgstr "" -#: src/GribUIDialogBase.cpp:2500 +#: src/GribUIDialogBase.cpp:2520 msgid "Mail To " msgstr "" -#: src/GribUIDialogBase.cpp:2513 +#: src/GribUIDialogBase.cpp:2533 msgid "Forecast Model " msgstr "" -#: src/GribUIDialogBase.cpp:2533 +#: src/GribUIDialogBase.cpp:2553 msgid "Moving Grib" msgstr "" -#: src/GribUIDialogBase.cpp:2542 src/GribUIDialogBase.cpp:3488 +#: src/GribUIDialogBase.cpp:2562 src/GribUIDialogBase.cpp:3508 msgid "Speed" msgstr "" -#: src/GribUIDialogBase.cpp:2553 +#: src/GribUIDialogBase.cpp:2573 msgid "Kts" msgstr "" -#: src/GribUIDialogBase.cpp:2560 src/GribUIDialogBase.cpp:3479 +#: src/GribUIDialogBase.cpp:2580 src/GribUIDialogBase.cpp:3499 msgid "Course" msgstr "" -#: src/GribUIDialogBase.cpp:2570 src/GribUIDialogBase.cpp:2626 +#: src/GribUIDialogBase.cpp:2590 src/GribUIDialogBase.cpp:2646 msgid "Deg" msgstr "" -#: src/GribUIDialogBase.cpp:2585 +#: src/GribUIDialogBase.cpp:2605 msgid "zyGrib Login" msgstr "" -#: src/GribUIDialogBase.cpp:2595 +#: src/GribUIDialogBase.cpp:2615 msgid "zyGrib Code" msgstr "" -#: src/GribUIDialogBase.cpp:2615 src\XyGribPanel.cpp:27 +#: src/GribUIDialogBase.cpp:2635 msgid "Resolution" msgstr "" -#: src/GribUIDialogBase.cpp:2632 src\XyGribPanel.cpp:39 +#: src/GribUIDialogBase.cpp:2652 msgid "Interval" msgstr "" -#: src/GribUIDialogBase.cpp:2644 +#: src/GribUIDialogBase.cpp:2664 msgid "Hours" msgstr "" -#: src/GribUIDialogBase.cpp:2651 +#: src/GribUIDialogBase.cpp:2671 msgid "Time Range" msgstr "" -#: src/GribUIDialogBase.cpp:2662 src\XyGribPanel.cpp:31 +#: src/GribUIDialogBase.cpp:2682 msgid "Days" msgstr "" -#: src/GribUIDialogBase.cpp:2675 +#: src/GribUIDialogBase.cpp:2695 msgid "Area Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2689 +#: src/GribUIDialogBase.cpp:2709 msgid "Manual Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2694 +#: src/GribUIDialogBase.cpp:2714 msgid "Use Always this Area" msgstr "" -#: src/GribUIDialogBase.cpp:2705 +#: src/GribUIDialogBase.cpp:2725 msgid "Max Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2715 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2735 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "N" msgstr "" -#: src/GribUIDialogBase.cpp:2720 +#: src/GribUIDialogBase.cpp:2740 msgid "Max Long" msgstr "" -#: src/GribUIDialogBase.cpp:2730 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2750 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "E" msgstr "" -#: src/GribUIDialogBase.cpp:2736 +#: src/GribUIDialogBase.cpp:2756 msgid "Min Lat" msgstr "" -#: src/GribUIDialogBase.cpp:2746 src/GribRequestDialog.cpp:461 +#: src/GribUIDialogBase.cpp:2766 src/GribRequestDialog.cpp:461 #: src/GribRequestDialog.cpp:464 msgid "S" msgstr "" -#: src/GribUIDialogBase.cpp:2752 +#: src/GribUIDialogBase.cpp:2772 msgid "Min Long" msgstr "" -#: src/GribUIDialogBase.cpp:2762 src/GribRequestDialog.cpp:462 +#: src/GribUIDialogBase.cpp:2782 src/GribRequestDialog.cpp:462 #: src/GribRequestDialog.cpp:463 msgid "W" msgstr "" -#: src/GribUIDialogBase.cpp:2775 +#: src/GribUIDialogBase.cpp:2795 msgid "Data Selection" msgstr "" -#: src/GribUIDialogBase.cpp:2804 +#: src/GribUIDialogBase.cpp:2824 msgid "Air Temperature(2m)" msgstr "" -#: src/GribUIDialogBase.cpp:2814 +#: src/GribUIDialogBase.cpp:2834 msgid "Comp. Reflect." msgstr "" -#: src/GribUIDialogBase.cpp:2819 +#: src/GribUIDialogBase.cpp:2839 msgid "Sea Temperature(surf.)" msgstr "" -#: src/GribUIDialogBase.cpp:2850 +#: src/GribUIDialogBase.cpp:2870 msgid "Geopotential Height" msgstr "" -#: src/GribUIDialogBase.cpp:2860 +#: src/GribUIDialogBase.cpp:2880 msgid "850 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2865 +#: src/GribUIDialogBase.cpp:2885 msgid "700 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2870 +#: src/GribUIDialogBase.cpp:2890 msgid "500 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2874 +#: src/GribUIDialogBase.cpp:2894 msgid "300 hPa" msgstr "" -#: src/GribUIDialogBase.cpp:2886 +#: src/GribUIDialogBase.cpp:2906 msgid "Mail" msgstr "" -#: src/GribUIDialogBase.cpp:2914 +#: src/GribUIDialogBase.cpp:2934 msgid "Estimated File Size" msgstr "" -#: src/GribUIDialogBase.cpp:2924 +#: src/GribUIDialogBase.cpp:2944 msgid " (Max size )" msgstr "" -#: src/GribUIDialogBase.cpp:2945 +#: src/GribUIDialogBase.cpp:2965 msgid "e-mail" msgstr "" -#: src/GribUIDialogBase.cpp:2952 +#: src/GribUIDialogBase.cpp:2972 msgid "XyGrib" msgstr "" -#: src/GribUIDialogBase.cpp:3404 +#: src/GribUIDialogBase.cpp:3424 msgid "Data at Position:" msgstr "" -#: src/GribUIDialogBase.cpp:3435 +#: src/GribUIDialogBase.cpp:3455 msgid "Close" msgstr "" -#: src/GribUIDialogBase.cpp:3474 +#: src/GribUIDialogBase.cpp:3494 msgid "Project position" msgstr "" @@ -921,19 +929,19 @@ msgstr "" msgid "MAIL Error: MAPI32.DLL is not installed or invalid on this computer!" msgstr "" -#: src/GribUIDialogBase.h:383 +#: src/GribUIDialogBase.h:385 msgid "Preferences" msgstr "" -#: src/GribUIDialogBase.h:502 +#: src/GribUIDialogBase.h:504 msgid "Get forecast..." msgstr "" -#: src/GribUIDialogBase.h:529 +#: src/GribUIDialogBase.h:531 msgid "Grib Data Table" msgstr "" -#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:463 +#: src/grib_pi.h:122 src/GribOverlayFactory.cpp:401 src/grib_pi.cpp:486 #: src/GribRequestDialog.cpp:230 src/GribRequestDialog.cpp:319 #: src/GribRequestDialog.cpp:1185 src/CursorData.cpp:150 msgid "Dialog" @@ -1001,11 +1009,11 @@ msgid "GRIB PlugIn for OpenCPN\n" "- wind, altitude, temperature and relative humidity at 300, 500, 700, 850 hPa." msgstr "" -#: src/grib_pi.cpp:430 +#: src/grib_pi.cpp:453 msgid "Weather table" msgstr "" -#: src/grib_pi.cpp:858 +#: src/grib_pi.cpp:881 msgid "You have chosen to authorize interpolation.\n" "Don't forget that data displayed at current time will not be real but Recomputed\n" "This can decrease accuracy!" @@ -1327,75 +1335,3 @@ msgstr "" msgid "Menu" msgstr "" -#: src\XyGribPanel.cpp:19 -msgid "Wave model" -msgstr "" - -#: src\XyGribPanel.cpp:23 -msgid "Weather model" -msgstr "" - -#: src\XyGribPanel.cpp:35 -msgid "Run" -msgstr "" - -#: src\XyGribPanel.cpp:78 -msgid "Wind (10m)" -msgstr "" - -#: src\XyGribPanel.cpp:82 -msgid "Wind gust (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:86 -msgid "Pressure (MSL)" -msgstr "" - -#: src\XyGribPanel.cpp:89 -msgid "Temperature (2m)" -msgstr "" - -#: src\XyGribPanel.cpp:92 -msgid "CAPE (surface)" -msgstr "" - -#: src\XyGribPanel.cpp:95 -msgid "Reflectivity (atmosphere)" -msgstr "" - -#: src\XyGribPanel.cpp:98 -msgid "Cloud cover (total)" -msgstr "" - -#: src\XyGribPanel.cpp:101 -msgid "Total precipitation" -msgstr "" - -#: src\XyGribPanel.cpp:104 -msgid "Wave Significant height" -msgstr "" - -#: src\XyGribPanel.cpp:108 -msgid "Wind waves" -msgstr "" - -#: src\XyGribPanel.cpp:115 -msgid "Parameters" -msgstr "" - -#: src\XyGribPanel.cpp:129 -msgid "Status :" -msgstr "" - -#: src\XyGribPanel.cpp:133 -msgid "Ready" -msgstr "" - -#: src\XyGribPanel.cpp:137 -msgid "Estimated size :" -msgstr "" - -#: src\XyGribPanel.cpp:141 -msgid "Unknown" -msgstr "" - diff --git a/plugins/grib_pi/src/CursorData.cpp b/plugins/grib_pi/src/CursorData.cpp index 7618d22687..fcac452bf5 100644 --- a/plugins/grib_pi/src/CursorData.cpp +++ b/plugins/grib_pi/src/CursorData.cpp @@ -388,7 +388,8 @@ void CursorData::UpdateTrackingControls(void) { wxString::Format(_T("%2d bf"), (int)round(vk)))); } - m_tcWindDirection->SetValue(wxString::Format(_T("%03d%c"), (int)(ang), 0x00B0)); + m_tcWindDirection->SetValue( + wxString::Format(_T("%03d%c"), (int)(ang), 0x00B0)); } else { m_tcWindSpeed->SetValue(_("N/A")); m_tcWindSpeedBf->SetValue(_("N/A")); diff --git a/plugins/grib_pi/src/CustomGrid.cpp b/plugins/grib_pi/src/CustomGrid.cpp index 2ef0323335..a4850856dc 100644 --- a/plugins/grib_pi/src/CustomGrid.cpp +++ b/plugins/grib_pi/src/CustomGrid.cpp @@ -65,7 +65,7 @@ CustomGrid::CustomGrid(wxWindow* parent, wxWindowID id, const wxPoint& pos, wxFont labelfont = GetOCPNGUIScaledFont_PlugIn(_T("Dialog")).MakeBold(); SetLabelFont(labelfont); wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - if(colour.Red() > 128) { + if (colour.Red() > 128) { GetGlobalColor(_T("DILG0"), &colour); GetGlobalColor(_T("GREEN1"), &m_greenColour); GetGlobalColor(_T("DILG1"), &m_greyColour); diff --git a/plugins/grib_pi/src/GrabberWin.cpp b/plugins/grib_pi/src/GrabberWin.cpp index c1e655e5e3..3c4d308c3a 100644 --- a/plugins/grib_pi/src/GrabberWin.cpp +++ b/plugins/grib_pi/src/GrabberWin.cpp @@ -36,9 +36,10 @@ //---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(GribGrabberWin, wxPanel) EVT_MOUSE_EVENTS(GribGrabberWin::OnMouseEvent) - EVT_PAINT(GribGrabberWin::OnPaint) END_EVENT_TABLE() +EVT_PAINT(GribGrabberWin::OnPaint) +END_EVENT_TABLE() - GribGrabberWin::GribGrabberWin(wxWindow* parent) { + GribGrabberWin::GribGrabberWin(wxWindow* parent) { Create(parent); m_bLeftDown = false; @@ -132,7 +133,7 @@ void GribGrabberWin::OnPaint(wxPaintEvent& event) { void GribGrabberWin::Size() { wxBitmap bitmap = (wxBitmap(grabber)); - int height = GetParent()->GetSize().y - 2; //keep a small margin of 2 + int height = GetParent()->GetSize().y - 2; // keep a small margin of 2 int width = height / 2; wxImage scaled_image = bitmap.ConvertToImage(); diff --git a/plugins/grib_pi/src/GribOverlayFactory.cpp b/plugins/grib_pi/src/GribOverlayFactory.cpp index 88c5a24265..63b2839329 100644 --- a/plugins/grib_pi/src/GribOverlayFactory.cpp +++ b/plugins/grib_pi/src/GribOverlayFactory.cpp @@ -223,29 +223,28 @@ int adjustSpacing(int dialogSetSpacing) { //---------------------------------------------------------------------------------------------------------- GRIBOverlayFactory::GRIBOverlayFactory(GRIBUICtrlBar &dlg) : m_dlg(dlg), m_Settings(dlg.m_OverlaySettings) { - if (wxGetDisplaySize().x > 0) { - //#ifdef __WXGTK__ - // GdkScreen *screen = gdk_screen_get_default(); - // m_pixelMM = (double)gdk_screen_get_monitor_width_mm(screen, 0) / - // wxGetDisplaySize().x; - //#else + // #ifdef __WXGTK__ + // GdkScreen *screen = gdk_screen_get_default(); + // m_pixelMM = (double)gdk_screen_get_monitor_width_mm(screen, 0) / + // wxGetDisplaySize().x; + // #else m_pixelMM = (double)PlugInGetDisplaySizeMM() / wxMax(wxGetDisplaySize().x, wxGetDisplaySize().y); - //#endif + // #endif m_pixelMM = wxMax(.02, m_pixelMM); // protect against bad data } else m_pixelMM = 0.27; // semi-standard number... - //qDebug() << "m_pixelMM: " << m_pixelMM; + // qDebug() << "m_pixelMM: " << m_pixelMM; m_pGribTimelineRecordSet = NULL; m_last_vp_scale = 0.; m_oDC = NULL; - #if wxUSE_GRAPHICS_CONTEXT +#if wxUSE_GRAPHICS_CONTEXT m_gdc = NULL; - #endif +#endif m_Font_Message = NULL; InitColorsTable(); @@ -260,12 +259,11 @@ GRIBOverlayFactory::GRIBOverlayFactory(GRIBUICtrlBar &dlg) // Generate the wind arrow cache - if (m_pixelMM < 0.2){ + if (m_pixelMM < 0.2) { windArrowSize = 5.0 / m_pixelMM; // Target scaled arrow size - windArrowSize = wxMin(windArrowSize, - wxMax(wxGetDisplaySize().x, wxGetDisplaySize().y) / 20); - } - else + windArrowSize = wxMin( + windArrowSize, wxMax(wxGetDisplaySize().x, wxGetDisplaySize().y) / 20); + } else windArrowSize = 26; // Standard value for desktop int r = 5, i = 0; // wind is very light, draw a circle @@ -353,10 +351,10 @@ GRIBOverlayFactory::GRIBOverlayFactory(GRIBUICtrlBar &dlg) if (i == 0) { if (m_pixelMM > 0.2) { arrowSize = 5.0 / m_pixelMM; // Target scaled arrow size - arrowSize = wxMin(arrowSize, - wxMax(wxGetDisplaySize().x, wxGetDisplaySize().y) / 20); - dec1 = arrowSize / 6; // pointer length - dec2 = arrowSize / 8; // space between double lines + arrowSize = wxMin( + arrowSize, wxMax(wxGetDisplaySize().x, wxGetDisplaySize().y) / 20); + dec1 = arrowSize / 6; // pointer length + dec2 = arrowSize / 8; // space between double lines } else arrowSize = 26; // Standard value for desktop } else @@ -399,10 +397,10 @@ void GRIBOverlayFactory::SetMessageFont() { fo = GetOCPNGUIScaledFont_PlugIn(_T("Dialog")); #else fo = *OCPNGetFont(_("Dialog"), 10); - fo.SetPointSize((fo.GetPointSize() * g_ContentScaleFactor / OCPN_GetWinDIPScaleFactor())); + fo.SetPointSize( + (fo.GetPointSize() * g_ContentScaleFactor / OCPN_GetWinDIPScaleFactor())); #endif - if (m_Font_Message) - delete m_Font_Message; + if (m_Font_Message) delete m_Font_Message; m_Font_Message = new wxFont(fo); } @@ -434,16 +432,16 @@ bool GRIBOverlayFactory::RenderGLGribOverlay(wxGLContext *pcontext, if (m_oDC) { delete m_oDC; } - #ifdef ocpnUSE_GL - // Set the minimum line width - GLint parms[2]; - #ifndef USE_ANDROID_GLES2 - glGetIntegerv(GL_SMOOTH_LINE_WIDTH_RANGE, &parms[0]); - #else - glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, &parms[0]); - #endif - g_piGLMinSymbolLineWidth = wxMax(parms[0], 1); - #endif +#ifdef ocpnUSE_GL + // Set the minimum line width + GLint parms[2]; +#ifndef USE_ANDROID_GLES2 + glGetIntegerv(GL_SMOOTH_LINE_WIDTH_RANGE, &parms[0]); +#else + glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, &parms[0]); +#endif + g_piGLMinSymbolLineWidth = wxMax(parms[0], 1); +#endif m_oDC = new pi_ocpnDC(); } @@ -548,7 +546,8 @@ void GRIBOverlayFactory::SettingsIdToGribId(int i, int &idx, int &idy, bool GRIBOverlayFactory::DoRenderGribOverlay(PlugIn_ViewPort *vp) { if (!m_pGribTimelineRecordSet) { - DrawMessageWindow((m_Message), vp->pix_width, vp->pix_height, m_Font_Message); + DrawMessageWindow((m_Message), vp->pix_width, vp->pix_height, + m_Font_Message); return false; } @@ -556,8 +555,7 @@ bool GRIBOverlayFactory::DoRenderGribOverlay(PlugIn_ViewPort *vp) { if (!m_pdc) { m_TexFontNumbers.Build(*m_Font_Message); - if (m_oDC) - m_oDC->SetFont(*m_Font_Message); + if (m_oDC) m_oDC->SetFont(*m_Font_Message); } m_Message_Hiden.Empty(); @@ -575,8 +573,7 @@ bool GRIBOverlayFactory::DoRenderGribOverlay(PlugIn_ViewPort *vp) { for (int i = 0; i < GribOverlaySettings::SETTINGS_COUNT; i++) { if (i == GribOverlaySettings::WIND) { if (overlay) { /* render overlays first */ - if (m_dlg.m_bDataPlot[i]) - RenderGribOverlayMap(i, pGR, vp); + if (m_dlg.m_bDataPlot[i]) RenderGribOverlayMap(i, pGR, vp); } else { if (m_dlg.m_bDataPlot[i]) { RenderGribBarbedArrows(i, pGR, vp); @@ -626,7 +623,7 @@ bool GRIBOverlayFactory::DoRenderGribOverlay(PlugIn_ViewPort *vp) { .Append(m_Settings.GetUnitSymbol(GribOverlaySettings::PRESSURE)) .Append(_T(" ! ")); } - if(m_dlg.ProjectionEnabled()) { + if (m_dlg.ProjectionEnabled()) { int x, y; m_dlg.GetProjectedLatLon(x, y); DrawProjectedPosition(x, y); @@ -634,7 +631,7 @@ bool GRIBOverlayFactory::DoRenderGribOverlay(PlugIn_ViewPort *vp) { if (!m_Message_Hiden.IsEmpty()) m_Message_Hiden.Append(_T("\n")); m_Message_Hiden.Append(m_Message); DrawMessageWindow(m_Message_Hiden, vp->pix_width, vp->pix_height, - m_Font_Message); + m_Font_Message); if (m_dlg.m_highlight_latmax - m_dlg.m_highlight_latmin > 0.01 && m_dlg.m_highlight_lonmax - m_dlg.m_highlight_lonmin > 0.01) { @@ -643,17 +640,19 @@ bool GRIBOverlayFactory::DoRenderGribOverlay(PlugIn_ViewPort *vp) { GetCanvasPixLL(vp, &p2, m_dlg.m_highlight_latmax, m_dlg.m_highlight_lonmax); if (m_pdc) { m_pdc->SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT))); - m_pdc->SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), - wxBRUSHSTYLE_CROSSDIAG_HATCH)); - m_pdc->DrawRectangle(p1.x,p1.y,p2.x-p1.x,p2.y-p1.y); + m_pdc->SetBrush( + wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), + wxBRUSHSTYLE_CROSSDIAG_HATCH)); + m_pdc->DrawRectangle(p1.x, p1.y, p2.x - p1.x, p2.y - p1.y); } else { - #ifdef ocpnUSE_GL - //GL +#ifdef ocpnUSE_GL + // GL m_oDC->SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT))); - m_oDC->SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), - wxBRUSHSTYLE_CROSSDIAG_HATCH)); - m_oDC->DrawRectangle(p1.x,p1.y,p2.x-p1.x,p2.y-p1.y); - #endif + m_oDC->SetBrush( + wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), + wxBRUSHSTYLE_CROSSDIAG_HATCH)); + m_oDC->DrawRectangle(p1.x, p1.y, p2.x - p1.x, p2.y - p1.y); +#endif } } return true; @@ -680,10 +679,8 @@ void GRIBOverlayFactory::GetCalibratedGraphicColor(int settings, double val_in, settings == GribOverlaySettings::CLOUD) && val_in < 0.01) a = 0; - if ((settings == GribOverlaySettings::COMP_REFL) && - val_in < 5) - a = 0; - + if ((settings == GribOverlaySettings::COMP_REFL) && val_in < 5) a = 0; + GetGraphicColor(settings, val_in, r, g, b); } else r = 255, g = 255, b = 255, a = 0; @@ -881,7 +878,7 @@ bool GRIBOverlayFactory::CreateGribGLTexture(GribOverlay *pGO, int settings, glTexParameteri(texture_format, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(texture_format, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -#if 0//ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); @@ -1019,11 +1016,10 @@ static ColorMap AirTempMap[] = { {82, _T("#ff8100")}, {86, _T("#f1780c")}, {90, _T("#e26a23")}, {95, _T("#d5453c")}, {100, _T("#b53c59")}}; - - // Color map similar to: - // https://www.ospo.noaa.gov/data/sst/contour/global.cf.gif +// Color map similar to: +// https://www.ospo.noaa.gov/data/sst/contour/global.cf.gif static ColorMap SeaTempMap[] = { - {-2, _T("#cc04ae")}, {2, _T("#8f06e4")}, {6, _T("#486afa")}, + {-2, _T("#cc04ae")}, {2, _T("#8f06e4")}, {6, _T("#486afa")}, {10, _T("#00ffff")}, {15, _T("#00d54b")}, {19, _T("#59d800")}, {23, _T("#f2fc00")}, {27, _T("#ff1500")}, {32, _T("#ff0000")}, {36, _T("#d80000")}, {40, _T("#a90000")}, {44, _T("#870000")}, @@ -1780,8 +1776,7 @@ void GRIBOverlayFactory::RenderGribOverlayMap(int settings, GribRecord **pGR, _("Overlays not supported by this graphics hardware (Disable " "OpenGL)")); else { - if (!pGO->m_iTexture) - CreateGribGLTexture(pGO, settings, pGRA); + if (!pGO->m_iTexture) CreateGribGLTexture(pGO, settings, pGRA); if (pGO->m_iTexture) DrawGLTexture(pGO, pGRA, vp); @@ -1969,7 +1964,7 @@ void GRIBOverlayFactory::DrawNumbers(wxPoint p, double value, int settings, m_pdc->DrawBitmap(label, p.x, p.y, true); } else { #ifdef ocpnUSE_GL -#if 0 //ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -2113,24 +2108,24 @@ void GRIBOverlayFactory::RenderGribParticles(int settings, GribRecord **pGR, lvp = *vp; } else // just panning, do quicker update - if (vp->clat != lvp.clat || vp->clon != lvp.clon) { - wxPoint p1, p2; - GetCanvasPixLL(vp, &p1, 0, 0); - GetCanvasPixLL(&lvp, &p2, 0, 0); + if (vp->clat != lvp.clat || vp->clon != lvp.clon) { + wxPoint p1, p2; + GetCanvasPixLL(vp, &p1, 0, 0); + GetCanvasPixLL(&lvp, &p2, 0, 0); - p1 -= p2; + p1 -= p2; - for (it = particles.begin(); it != particles.end(); it++) - for (int i = 0; i < it->m_HistorySize; i++) { - Particle::ParticleNode &n = it->m_History[i]; - float(&p)[2] = n.m_Pos; - if (p[0] == -10000) continue; + for (it = particles.begin(); it != particles.end(); it++) + for (int i = 0; i < it->m_HistorySize; i++) { + Particle::ParticleNode &n = it->m_History[i]; + float(&p)[2] = n.m_Pos; + if (p[0] == -10000) continue; - n.m_Screen[0] += p1.x; - n.m_Screen[1] += p1.y; - } - lvp = *vp; - } + n.m_Screen[0] += p1.x; + n.m_Screen[1] += p1.y; + } + lvp = *vp; + } double ptime = 0; @@ -2188,7 +2183,7 @@ void GRIBOverlayFactory::RenderGribParticles(int settings, GribRecord **pGR, float angr = ang / 180 * M_PI; p[0] = pp[0] + sinf(angr) * d / 60; p[1] = pp[1] + cosf(angr) * d / 60; -#else // spherical (close enough) +#else // spherical (close enough) float angr = ang / 180 * M_PI; float latr = pp[1] * M_PI / 180; float D = d / 3443; // earth radius in nm @@ -2420,16 +2415,16 @@ void GRIBOverlayFactory::DrawProjectedPosition(int x, int y) { wxDC &dc = *m_pdc; dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - dc.DrawRectangle(x,y,20,20); - dc.DrawLine(x,y,x+20,y+20); - dc.DrawLine(x,y+20,x+20,y); + dc.DrawRectangle(x, y, 20, 20); + dc.DrawLine(x, y, x + 20, y + 20); + dc.DrawLine(x, y + 20, x + 20, y); } else { if (m_oDC) { m_oDC->SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); m_oDC->SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - m_oDC->DrawRectangle(x-10,y-10,20,20); - m_oDC->StrokeLine(x-10,y-10,x+10,y+10); - m_oDC->StrokeLine(x-10,y+10,x+10,y-10); + m_oDC->DrawRectangle(x - 10, y - 10, 20, 20); + m_oDC->StrokeLine(x - 10, y - 10, x + 10, y + 10); + m_oDC->StrokeLine(x - 10, y + 10, x + 10, y - 10); } } } @@ -2438,7 +2433,7 @@ void GRIBOverlayFactory::DrawMessageWindow(wxString msg, int x, int y, wxFont *mfont) { if (msg.empty()) return; - int ScaleBare_H = 30;//futur : get the position/size from API? + int ScaleBare_H = 30; // futur : get the position/size from API? if (m_pdc) { wxDC &dc = *m_pdc; @@ -2549,9 +2544,9 @@ void GRIBOverlayFactory::drawWindArrowWithBarbs(int settings, int x, int y, if (m_Settings.Settings[settings].m_iBarbedColour == 1) arrowColor = GetGraphicColor(settings, vkn); -//TODO -// Needs investigation -// This conditional should not really be necessary, but is safe. +// TODO +// Needs investigation +// This conditional should not really be necessary, but is safe. #ifndef __MSVC__ float penWidth = .6 / m_pixelMM; #else @@ -2659,7 +2654,7 @@ void GRIBOverlayFactory::drawLineBuffer(LineBuffer &buffer, int x, int y, void GRIBOverlayFactory::DrawSingleGLTexture(GribOverlay *pGO, GribRecord *pGR, double uv[], double x, double y, double width, double height) { -#if 1//def __OCPN__ANDROID__ +#if 1 // def __OCPN__ANDROID__ glEnable(texture_format); @@ -2814,7 +2809,7 @@ void GRIBOverlayFactory::DrawGLTexture(GribOverlay *pGO, GribRecord *pGR, // optimization for non-rotated mercator, since longitude is linear if (vp->rotation == 0 && vp->m_projection_type == PI_PROJECTION_MERCATOR) - xsquares = 1; + xsquares = 1; // It is possible to have only 1 square when the viewport covers more than // 180 longitudes but there is more logic needed. This is simpler. @@ -2895,7 +2890,7 @@ void GRIBOverlayFactory::DrawGLTexture(GribOverlay *pGO, GribRecord *pGR, uv[6] = u3; uv[7] = v3; - if(u1 > u0){ + if (u1 > u0) { DrawSingleGLTexture(pGO, pGR, uv, x, y, xs, ys); } } diff --git a/plugins/grib_pi/src/GribRecord.cpp b/plugins/grib_pi/src/GribRecord.cpp index 9630188e11..1c5348a142 100644 --- a/plugins/grib_pi/src/GribRecord.cpp +++ b/plugins/grib_pi/src/GribRecord.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . #include -//#include +// #include #include "GribRecord.h" diff --git a/plugins/grib_pi/src/GribRequestDialog.cpp b/plugins/grib_pi/src/GribRequestDialog.cpp index f21abdbde5..6cba2580ce 100644 --- a/plugins/grib_pi/src/GribRequestDialog.cpp +++ b/plugins/grib_pi/src/GribRequestDialog.cpp @@ -2711,7 +2711,8 @@ void GribRequestSetting::UpdateGribSizeEstimate() { wxString warningStr = ""; if (estimate / (1024 * 1024) > XYGRIB_MAX_DOWNLOADABLE_GRIB_SIZE_MB) { - warningStr = wxString::Format("(Warning GRIB exceeds %d MB limit)", XYGRIB_MAX_DOWNLOADABLE_GRIB_SIZE_MB); + warningStr = wxString::Format("(Warning GRIB exceeds %d MB limit)", + XYGRIB_MAX_DOWNLOADABLE_GRIB_SIZE_MB); } m_xygribPanel->m_sizeestimate_text->SetLabel( diff --git a/plugins/grib_pi/src/GribSettingsDialog.cpp b/plugins/grib_pi/src/GribSettingsDialog.cpp index 0221c59753..d1f8c0a854 100644 --- a/plugins/grib_pi/src/GribSettingsDialog.cpp +++ b/plugins/grib_pi/src/GribSettingsDialog.cpp @@ -196,8 +196,7 @@ void GribOverlaySettings::Read() { int units; pConf->Read(Name + _T ( "Units" ), &units, 0); int j; - for (j = 0; !unit_names[unittype[i]][j].empty(); j++) - ; + for (j = 0; !unit_names[unittype[i]][j].empty(); j++); Settings[i].m_Units = (units < 0 || units > j - 1) ? (SettingsType)0 : (SettingsType)units; @@ -815,7 +814,7 @@ void GribSettingsDialog::SetSettingsDialogSize() { sc->SetSize(wxSize(wxMin(scr.x, w), wxMin(scr.y, h))); // Constrain size on small displays - if(display_height < 600){ + if (display_height < 600) { sc->SetSize(scr.x, h); } diff --git a/plugins/grib_pi/src/GribUIDialog.cpp b/plugins/grib_pi/src/GribUIDialog.cpp index ea63592cb6..947212b2a4 100644 --- a/plugins/grib_pi/src/GribUIDialog.cpp +++ b/plugins/grib_pi/src/GribUIDialog.cpp @@ -169,13 +169,16 @@ GRIBUICtrlBar::GRIBUICtrlBar(wxWindow *parent, wxWindowID id, : GRIBUICtrlBarBase(parent, id, title, pos, size, style) { pParent = parent; pPlugIn = ppi; - // Preinitialize the vierwport with an existing value, see https://github.com/OpenCPN/OpenCPN/pull/4002/files + // Preinitialize the vierwport with an existing value, see + // https://github.com/OpenCPN/OpenCPN/pull/4002/files m_vp = new PlugIn_ViewPort(pPlugIn->GetCurrentViewPort()); pReq_Dialog = NULL; m_bGRIBActiveFile = NULL; m_pTimelineSet = NULL; m_gCursorData = NULL; m_gGRIBUICData = NULL; + m_gtk_started = false; + wxFileConfig *pConf = GetOCPNConfigObject(); m_gGrabber = new GribGrabberWin(this); // add the grabber to the dialog @@ -230,29 +233,29 @@ GRIBUICtrlBar::GRIBUICtrlBar(wxWindow *parent, wxWindowID id, wxStandardPathsBase &spath = wxStandardPaths::Get(); pConf->SetPath(_T ( "/Directories" )); - pConf->Read(_T ( "GRIBDirectory" ), &m_grib_dir, spath.GetDocumentsDir()); + pConf->Read(_T ( "GRIBDirectory" ), &m_grib_dir); pConf->SetPath(_T( "/PlugIns/GRIB" )); pConf->Read(_T( "ManualRequestZoneSizing" ), &m_SavedZoneSelMode, 0); // Read XyGrib related configuration pConf->SetPath(_T ( "/Settings/GRIB/XyGrib" )); - pConf->Read(_T( "AtmModelIndex" ), &xyGribConfig.atmModelIndex , 0); - pConf->Read(_T( "WaveModelIndex" ), &xyGribConfig.waveModelIndex , 0); - pConf->Read(_T( "ResolutionIndex" ), &xyGribConfig.resolutionIndex , 0); - pConf->Read(_T( "DurationIndex" ), &xyGribConfig.durationIndex , 0); - pConf->Read(_T( "RunIndex" ), &xyGribConfig.runIndex , 0); - pConf->Read(_T( "IntervalIndex" ), &xyGribConfig.intervalIndex , 0); - pConf->Read(_T( "Wind" ), &xyGribConfig.wind , true); - pConf->Read(_T( "Gust" ), &xyGribConfig.gust , true); - pConf->Read(_T( "Pressure" ), &xyGribConfig.pressure , false); - pConf->Read(_T( "Temperature" ), &xyGribConfig.temperature , true); - pConf->Read(_T( "Cape" ), &xyGribConfig.cape , false); - pConf->Read(_T( "Reflectivity" ), &xyGribConfig.reflectivity , false); - pConf->Read(_T( "CloudCover" ), &xyGribConfig.cloudCover , true); - pConf->Read(_T( "Precipitation" ), &xyGribConfig.precipitation , true); - pConf->Read(_T( "WaveHeight" ), &xyGribConfig.waveHeight , true); - pConf->Read(_T( "WindWaves" ), &xyGribConfig.windWaves , true); + pConf->Read(_T( "AtmModelIndex" ), &xyGribConfig.atmModelIndex, 0); + pConf->Read(_T( "WaveModelIndex" ), &xyGribConfig.waveModelIndex, 0); + pConf->Read(_T( "ResolutionIndex" ), &xyGribConfig.resolutionIndex, 0); + pConf->Read(_T( "DurationIndex" ), &xyGribConfig.durationIndex, 0); + pConf->Read(_T( "RunIndex" ), &xyGribConfig.runIndex, 0); + pConf->Read(_T( "IntervalIndex" ), &xyGribConfig.intervalIndex, 0); + pConf->Read(_T( "Wind" ), &xyGribConfig.wind, true); + pConf->Read(_T( "Gust" ), &xyGribConfig.gust, true); + pConf->Read(_T( "Pressure" ), &xyGribConfig.pressure, false); + pConf->Read(_T( "Temperature" ), &xyGribConfig.temperature, true); + pConf->Read(_T( "Cape" ), &xyGribConfig.cape, false); + pConf->Read(_T( "Reflectivity" ), &xyGribConfig.reflectivity, false); + pConf->Read(_T( "CloudCover" ), &xyGribConfig.cloudCover, true); + pConf->Read(_T( "Precipitation" ), &xyGribConfig.precipitation, true); + pConf->Read(_T( "WaveHeight" ), &xyGribConfig.waveHeight, true); + pConf->Read(_T( "WindWaves" ), &xyGribConfig.windWaves, true); } // init zone selection parameters m_ZoneSelMode = m_SavedZoneSelMode; @@ -270,8 +273,10 @@ GRIBUICtrlBar::GRIBUICtrlBar(wxWindow *parent, wxWindowID id, Fit(); SetMinSize(GetBestSize()); - m_ProjectBoatPanel->SetSpeed(pPlugIn->m_boat_sog); - m_ProjectBoatPanel->SetCourse(pPlugIn->m_boat_cog); + if (m_ProjectBoatPanel) { + m_ProjectBoatPanel->SetSpeed(pPlugIn->m_boat_sog); + m_ProjectBoatPanel->SetCourse(pPlugIn->m_boat_cog); + } m_highlight_latmax = 0; m_highlight_lonmax = 0; m_highlight_latmin = 0; @@ -344,7 +349,6 @@ GRIBUICtrlBar::~GRIBUICtrlBar() { pConf->Write(_T( "Precipitation" ), xyGribConfig.precipitation); pConf->Write(_T( "WaveHeight" ), xyGribConfig.waveHeight); pConf->Write(_T( "WindWaves" ), xyGribConfig.windWaves); - } delete m_vp; delete m_pTimelineSet; @@ -661,13 +665,11 @@ class FileCollector : public wxDirTraverser { }; wxArrayString GRIBUICtrlBar::GetFilesInDirectory() { - if (!wxDir::Exists(m_grib_dir)) { - wxStandardPathsBase &path = wxStandardPaths::Get(); - m_grib_dir = path.GetDocumentsDir(); - } + wxArrayString file_array; + if (!wxDir::Exists(m_grib_dir)) return file_array; + // Get an array of GRIB file names in the target directory, not descending // into subdirs - wxArrayString file_array; wxRegEx pattern(_T(".+\\.gri?b2?(\\.(bz2|gz))?$"), wxRE_EXTENDED | wxRE_ICASE | wxRE_NOSUB); FileCollector collector(file_array, pattern); @@ -761,8 +763,8 @@ void GRIBUICtrlBar::SetDialogsStyleSizePosition(bool force_recompute) { } if ((m_DialogStyle >> 1 == SEPARATED || !m_CDataIsShown) && - !m_HasCaption) { // Size and show grabber if necessary - Fit(); // each time CtrlData dialog will be alone + !m_HasCaption) { // Size and show grabber if necessary + Fit(); // each time CtrlData dialog will be alone m_gGrabber->Size(); // or separated m_gGrabber->Show(); } @@ -788,17 +790,21 @@ void GRIBUICtrlBar::SetDialogsStyleSizePosition(bool force_recompute) { m_gGRIBUICData->Update(); m_gGRIBUICData->Show(); pPlugIn->MoveDialog(m_gGRIBUICData, pPlugIn->GetCursorDataXY()); + m_gGRIBUICData->Layout(); + m_gGRIBUICData->Fit(); } } Layout(); Fit(); wxSize sd = GetSize(); #ifdef __WXGTK__ - if (m_HasCaption && sd.y == GetClientSize().y) sd.y += 30; + if (!m_gtk_started && m_HasCaption /*&& sd.y == GetSize().y*/) { + sd.y += 30; + m_gtk_started = true; + } #endif SetSize(wxSize(sd.x, sd.y)); SetMinSize(wxSize(sd.x, sd.y)); - #ifdef __OCPN__ANDROID__ wxRect tbRect = GetMasterToolbarRect(); // qDebug() << "TBR" << tbRect.x << tbRect.y << tbRect.width << tbRect.height @@ -871,9 +877,9 @@ void GRIBUICtrlBar::OnAltitude(wxCommandEvent &event) { MenuAppend( amenu, ID_CTRLALTITUDE + 1000 + i, - m_OverlaySettings.GetAltitudeFromIndex( - i, m_OverlaySettings.Settings[GribOverlaySettings::PRESSURE] - .m_Units), + m_OverlaySettings.GetAltitudeFromIndex( + i, m_OverlaySettings.Settings[GribOverlaySettings::PRESSURE] + .m_Units), wxITEM_RADIO); } } @@ -945,16 +951,15 @@ void GRIBUICtrlBar::MenuAppend(wxMenu *menu, int id, wxString label, wxItemKind kind, wxBitmap bitmap, wxMenu *submenu) { wxMenuItem *item = new wxMenuItem(menu, id, label, _T(""), kind); - //add a submenu to this item if necessary - if (submenu) - item->SetSubMenu(submenu); - -/* Menu font do not work properly for MSW (wxWidgets 3.2.1) -#ifdef __WXMSW__ - wxFont *qFont = OCPNGetFont(_("Menu"), 10); - item->SetFont(*qFont); -#endif -*/ + // add a submenu to this item if necessary + if (submenu) item->SetSubMenu(submenu); + + /* Menu font do not work properly for MSW (wxWidgets 3.2.1) + #ifdef __WXMSW__ + wxFont *qFont = OCPNGetFont(_("Menu"), 10); + item->SetFont(*qFont); + #endif + */ #if defined(__WXMSW__) || defined(__WXGTK__) if (!bitmap.IsSameAs(wxNullBitmap)) item->SetBitmap(bitmap); @@ -983,18 +988,19 @@ void GRIBUICtrlBar::OnMouseEvent(wxMouseEvent &event) { m_bGRIBActiveFile->m_GribIdxArray.Index(Idx_WIND_VY + i) != wxNOT_FOUND)) || i == 0) { - MenuAppend(smenu, ID_CTRLALTITUDE + 1000 + i, - m_OverlaySettings.GetAltitudeFromIndex( - i, m_OverlaySettings - .Settings[GribOverlaySettings::PRESSURE] - .m_Units), - wxITEM_RADIO); + MenuAppend( + smenu, ID_CTRLALTITUDE + 1000 + i, + m_OverlaySettings.GetAltitudeFromIndex( + i, m_OverlaySettings.Settings[GribOverlaySettings::PRESSURE] + .m_Units), + wxITEM_RADIO); } } smenu->Check(ID_CTRLALTITUDE + 1000 + m_Altitude, true); MenuAppend( xmenu, wxID_ANY, _("Select geopotential altitude"), wxITEM_NORMAL, - GetScaledBitmap(wxBitmap(altitude), _T("altitude"), m_ScaledFactor),smenu); + GetScaledBitmap(wxBitmap(altitude), _T("altitude"), m_ScaledFactor), + smenu); } MenuAppend(xmenu, ID_BTNNOW, _("Now"), wxITEM_NORMAL, GetScaledBitmap(wxBitmap(now), _T("now"), m_ScaledFactor)); @@ -1083,8 +1089,7 @@ void GRIBUICtrlBar::SetViewPort(PlugIn_ViewPort *vp) { delete m_vp; m_vp = new PlugIn_ViewPort(*vp); - if (pReq_Dialog) - pReq_Dialog->OnVpChange(vp); + if (pReq_Dialog) pReq_Dialog->OnVpChange(vp); } void GRIBUICtrlBar::OnClose(wxCloseEvent &event) { @@ -1561,18 +1566,17 @@ GribTimelineRecordSet *GRIBUICtrlBar::GetTimeLineRecordSet(wxDateTime time) { return set; } -void GRIBUICtrlBar::GetProjectedLatLon(int &x, int &y) -{ - wxPoint p(0,0); +void GRIBUICtrlBar::GetProjectedLatLon(int &x, int &y) { + wxPoint p(0, 0); auto now = TimelineTime(); auto sog = m_ProjectBoatPanel->GetSpeed(); auto cog = m_ProjectBoatPanel->GetCourse(); - double dist = static_cast(now.GetTicks() - pPlugIn->m_boat_time) * sog / 3600.0; - PositionBearingDistanceMercator_Plugin(pPlugIn->m_boat_lat, pPlugIn->m_boat_lon, - cog, - dist, &m_projected_lat, - &m_projected_lon); - if(m_vp) { + double dist = + static_cast(now.GetTicks() - pPlugIn->m_boat_time) * sog / 3600.0; + PositionBearingDistanceMercator_Plugin(pPlugIn->m_boat_lat, + pPlugIn->m_boat_lon, cog, dist, + &m_projected_lat, &m_projected_lon); + if (m_vp) { GetCanvasPixLL(m_vp, &p, m_projected_lat, m_projected_lon); } x = p.x; @@ -1700,13 +1704,14 @@ void GRIBUICtrlBar::OnOpenFile(wxCommandEvent &event) { return; // do nothing when play back is running ! #ifndef __OCPN__ANDROID__ - if (!wxDir::Exists(m_grib_dir)) { - wxStandardPathsBase &path = wxStandardPaths::Get(); - m_grib_dir = path.GetDocumentsDir(); - } + + wxStandardPathsBase &path = wxStandardPaths::Get(); + wxString l_grib_dir = path.GetDocumentsDir(); + + if (wxDir::Exists(m_grib_dir)) l_grib_dir = m_grib_dir; wxFileDialog *dialog = - new wxFileDialog(NULL, _("Select a GRIB file"), m_grib_dir, _T(""), + new wxFileDialog(NULL, _("Select a GRIB file"), l_grib_dir, _T(""), wxT("Grib files " "(*.grb;*.bz2;*.gz;*.grib2;*.grb2)|*.grb;*.bz2;*.gz;" "*.grib2;*.grb2|All files (*)|*.*"), @@ -1719,9 +1724,8 @@ void GRIBUICtrlBar::OnOpenFile(wxCommandEvent &event) { m_grib_dir = dialog->GetDirectory(); dialog->GetPaths(m_file_names); OpenFile(); - if (g_pi){ - if (g_pi->m_bZoomToCenterAtInit) - DoZoomToCenter(); + if (g_pi) { + if (g_pi->m_bZoomToCenterAtInit) DoZoomToCenter(); } SetDialogsStyleSizePosition(true); } @@ -1952,8 +1956,9 @@ void GRIBUICtrlBar::ComputeBestForecastForNow() { SaveSelectionString(); // memorize the new selected wxChoice date time label m_cRecordForecast->SetString( m_Selection_index, - TToString(now, pPlugIn->GetTimeZone())); // write the now date time label - // in the right place in wxChoice + TToString(now, + pPlugIn->GetTimeZone())); // write the now date time label + // in the right place in wxChoice m_cRecordForecast->SetStringSelection( TToString(now, pPlugIn->GetTimeZone())); // put it in the box diff --git a/plugins/grib_pi/src/GribUIDialog.h b/plugins/grib_pi/src/GribUIDialog.h index 414b3e376d..2b8503db86 100644 --- a/plugins/grib_pi/src/GribUIDialog.h +++ b/plugins/grib_pi/src/GribUIDialog.h @@ -173,22 +173,36 @@ class GRIBUICtrlBar : public GRIBUICtrlBarBase { void DoZoomToCenter(); const wxString GetGribDir() { if (m_grib_dir.IsEmpty() || !wxDirExists(m_grib_dir)) { - m_grib_dir = GetpSharedDataLocation() + m_grib_dir = GetpPrivateApplicationDataLocation() ->Append(wxFileName::GetPathSeparator()) .Append("grib"); - if (!wxDirExists(m_grib_dir)) { - wxMkdir(m_grib_dir); + + if (!wxDirExists(m_grib_dir)) wxMkdir(m_grib_dir); + + wxString dir_spec; + int response = PlatformDirSelectorDialog( + this, &dir_spec, _("Choose GRIB File Directory"), m_grib_dir); + + if (response == wxID_OK) { + m_grib_dir = (dir_spec); } } return m_grib_dir; } void GetProjectedLatLon(int &x, int &y); - bool ProjectionEnabled() { return m_ProjectBoatPanel->ProjectionEnabled(); } + bool ProjectionEnabled() { + if (m_ProjectBoatPanel) + return m_ProjectBoatPanel->ProjectionEnabled(); + else + return false; + } double m_highlight_latmax; double m_highlight_lonmax; double m_highlight_latmin; double m_highlight_lonmin; + wxString m_grib_dir; + wxArrayString m_file_names; /* selected files */ private: void OnClose(wxCloseEvent &event); @@ -254,13 +268,12 @@ class GRIBUICtrlBar : public GRIBUICtrlBarBase { bool m_SelectionIsSaved; int m_Selection_index; wxString m_Selection_label; - wxArrayString m_file_names; /* selected files */ - wxString m_grib_dir; wxSize m_DialogsOffset; double m_projected_lat; double m_projected_lon; // XyGrib panel configuration XyGribConfig_t xyGribConfig; + bool m_gtk_started; }; //---------------------------------------------------------------------------------------------------------- diff --git a/plugins/grib_pi/src/GribUIDialogBase.cpp b/plugins/grib_pi/src/GribUIDialogBase.cpp index 2279e82b27..ce137fc8a2 100644 --- a/plugins/grib_pi/src/GribUIDialogBase.cpp +++ b/plugins/grib_pi/src/GribUIDialogBase.cpp @@ -14,12 +14,13 @@ GRIBUICtrlBarBase::GRIBUICtrlBarBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) { + m_ProjectBoatPanel = NULL; + #ifdef __OCPN__ANDROID__ const bool m_bcompact = true; #else const bool m_bcompact = false; #endif - if (m_bcompact) { this->SetSizeHints(wxDefaultSize, wxDefaultSize); @@ -2170,6 +2171,15 @@ GribPreferencesDialogBase::GribPreferencesDialogBase( fgSizer47->Add(m_sIconSizeFactor, 0, wxALL | wxEXPAND, 5); bSizerPrefsMain->Add(fgSizer47, 0, wxALL | wxEXPAND, 5); #endif + + wxButton* SetSaveButton = + new wxButton(scrollWin, wxID_ANY, _("Select GRIB download directory")); + bSizerPrefsMain->Add(SetSaveButton, 0, wxALL | wxEXPAND, 5); + SetSaveButton->Connect( + wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(GribPreferencesDialogBase::OnDirSelClick), NULL, + this); + Layout(); Fit(); @@ -2308,6 +2318,16 @@ GribPreferencesDialogBase::~GribPreferencesDialogBase() { NULL, this); } +void GribPreferencesDialogBase::OnDirSelClick(wxCommandEvent& event) { + wxString dir_spec; + int response = PlatformDirSelectorDialog( + this, &dir_spec, _("Choose GRIB File Directory"), m_grib_dir_sel); + + if (response == wxID_OK) { + m_grib_dir_sel = dir_spec; + } +} + GribRequestSettingBase::GribRequestSettingBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -3118,56 +3138,56 @@ GribRequestSettingBase::GribRequestSettingBase(wxWindow* parent, wxWindowID id, NULL, this); m_xygribPanel->m_wind_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_gust_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_reflectivity_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_precipitation_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_cape_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_pressure_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_cloudcover_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_temperature_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_waveheight_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_windwave_cbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_resolution_choice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_duration_choice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_interval_choice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); } GribRequestSettingBase::~GribRequestSettingBase() { @@ -3329,56 +3349,56 @@ GribRequestSettingBase::~GribRequestSettingBase() { NULL, this); m_xygribPanel->m_wind_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_gust_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_reflectivity_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_precipitation_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_cape_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_pressure_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_cloudcover_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_temperature_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_waveheight_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_windwave_cbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_resolution_choice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_duration_choice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); m_xygribPanel->m_interval_choice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), - NULL, this); + wxCommandEventHandler(GribRequestSettingBase::OnXyGribConfigChange), NULL, + this); } GRIBTableBase::GRIBTableBase(wxWindow* parent, wxWindowID id, diff --git a/plugins/grib_pi/src/GribUIDialogBase.h b/plugins/grib_pi/src/GribUIDialogBase.h index f922ce422d..42ef93a563 100644 --- a/plugins/grib_pi/src/GribUIDialogBase.h +++ b/plugins/grib_pi/src/GribUIDialogBase.h @@ -108,30 +108,38 @@ /////////////////////////////////////////////////////////////////////////////// /// Class ProjectBoatPanel /////////////////////////////////////////////////////////////////////////////// -class ProjectBoatPanel : public wxPanel -{ - private: - - protected: - wxCheckBox* m_cbProjectPosition; - wxStaticText* m_stCourse; - wxTextCtrl* m_tCourse; - wxStaticText* m_stSpeed; - wxTextCtrl* m_tSpeed; - wxStaticText* m_stSpeedUnit; - - public: - - ProjectBoatPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 580,40 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); - - ~ProjectBoatPanel(); - - double GetCourse(); - double GetSpeed(); - bool ProjectionEnabled(); - void SetCourse(const double course) { m_tCourse->SetValue(!wxIsNaN(course) ? wxString::FromDouble(course) : "0.0"); }; - void SetSpeed(const double speed) { m_tSpeed->SetValue(!wxIsNaN(speed) ? wxString::FromDouble(speed) : "6.0"); }; - void EnableProjection(bool enabled) { m_cbProjectPosition->SetValue(enabled); }; +class ProjectBoatPanel : public wxPanel { +private: +protected: + wxCheckBox* m_cbProjectPosition; + wxStaticText* m_stCourse; + wxTextCtrl* m_tCourse; + wxStaticText* m_stSpeed; + wxTextCtrl* m_tSpeed; + wxStaticText* m_stSpeedUnit; + +public: + ProjectBoatPanel(wxWindow* parent, wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxSize(580, 40), + long style = wxTAB_TRAVERSAL, + const wxString& name = wxEmptyString); + + ~ProjectBoatPanel(); + + double GetCourse(); + double GetSpeed(); + bool ProjectionEnabled(); + void SetCourse(const double course) { + m_tCourse->SetValue(!wxIsNaN(course) ? wxString::FromDouble(course) + : "0.0"); + }; + void SetSpeed(const double speed) { + m_tSpeed->SetValue(!wxIsNaN(speed) ? wxString::FromDouble(speed) : "6.0"); + }; + void EnableProjection(bool enabled) { + m_cbProjectPosition->SetValue(enabled); + }; }; /////////////////////////////////////////////////////////////////////////////// @@ -364,6 +372,7 @@ class GribPreferencesDialogBase : public wxDialog { // Virtual event handlers, overide them in your derived class virtual void OnStartOptionChange(wxCommandEvent& event) { event.Skip(); } virtual void OnOKClick(wxCommandEvent& event) { event.Skip(); } + void OnDirSelClick(wxCommandEvent& event); public: wxCheckBox* m_cbUseHiDef; @@ -375,6 +384,7 @@ class GribPreferencesDialogBase : public wxDialog { wxRadioBox* m_rbLoadOptions; wxRadioBox* m_rbStartOptions; wxRadioBox* m_rbTimeFormat; + wxString m_grib_dir_sel; #ifdef __WXMSW__ wxSlider* m_sIconSizeFactor; #endif @@ -400,7 +410,7 @@ class GribRequestSettingBase : public wxDialog { wxStaticText* m_stForecastLength; wxChoice* m_chForecastLength; wxStaticText* m_stECMWFResolution; - wxChoice* m_chECMWFResolution; + wxChoice* m_chECMWFResolution; wxButton* m_btnDownloadWorld; wxPanel* m_panelLocalModels; wxTreeCtrl* m_SourcesTreeCtrl1; @@ -469,9 +479,9 @@ class GribRequestSettingBase : public wxDialog { // Virtual event handlers, overide them in your derived class virtual void OnClose(wxCloseEvent& event) { event.Skip(); } - virtual void OnNotebookPageChanged( wxNotebookEvent& event ) { event.Skip(); } + virtual void OnNotebookPageChanged(wxNotebookEvent& event) { event.Skip(); } virtual void OnWorldLengthChoice(wxCommandEvent& event) { event.Skip(); } - virtual void OnWorldResolutionChoice( wxCommandEvent& event ) { event.Skip(); } + virtual void OnWorldResolutionChoice(wxCommandEvent& event) { event.Skip(); } virtual void OnWorldDownload(wxCommandEvent& event) { event.Skip(); } virtual void OnLocalTreeItemExpanded(wxTreeEvent& event) { event.Skip(); } virtual void OnLocalTreeSelChanged(wxTreeEvent& event) { event.Skip(); } @@ -493,15 +503,15 @@ class GribRequestSettingBase : public wxDialog { virtual void OnXyGribAtmModelChoice(wxCommandEvent& event) { event.Skip(); } virtual void OnXyGribWaveModelChoice(wxCommandEvent& event) { event.Skip(); } virtual void OnXyGribConfigChange(wxCommandEvent& event) { event.Skip(); } - + public: wxScrolledWindow* m_sScrolledDialog; - GribRequestSettingBase( - wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString& title = _("Get forecast..."), - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxSize(-1, -1), long style = wxDEFAULT_DIALOG_STYLE); + GribRequestSettingBase(wxWindow* parent, wxWindowID id = wxID_ANY, + const wxString& title = _("Get forecast..."), + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxSize(-1, -1), + long style = wxDEFAULT_DIALOG_STYLE); ~GribRequestSettingBase(); }; diff --git a/plugins/grib_pi/src/GribV1Record.cpp b/plugins/grib_pi/src/GribV1Record.cpp index d01a50cc39..dd19221e3f 100644 --- a/plugins/grib_pi/src/GribV1Record.cpp +++ b/plugins/grib_pi/src/GribV1Record.cpp @@ -350,14 +350,14 @@ GribV1Record::GribV1Record(ZUFILE* file, int id_) { b_len_add_8 = false; break; } // end 'G' found in the next bytes - } // end no 'G' found in 1st byte. + } // end no 'G' found in 1st byte. } } // end reading four bytes if (b_haveReadGRIB == 0) { // the four bytes have been read if (strncmp(strgrib, "GRIB", 4) != 0) b_len_add_8 = true; //"GRIB" header no valid so apply length adder. - //Further reading will happen + // Further reading will happen else { b_haveReadGRIB = 2; //"GRIB" header is valid so no further reading b_len_add_8 = false; diff --git a/plugins/grib_pi/src/GribV2Record.cpp b/plugins/grib_pi/src/GribV2Record.cpp index c32aa04912..cc61083db0 100644 --- a/plugins/grib_pi/src/GribV2Record.cpp +++ b/plugins/grib_pi/src/GribV2Record.cpp @@ -150,7 +150,7 @@ class GRIBMetadata { class GRIB2Grid { public: - GRIB2Grid() : gridpoints(0){}; + GRIB2Grid() : gridpoints(0) {}; ~GRIB2Grid() { delete[] gridpoints; }; double *gridpoints; @@ -158,7 +158,7 @@ class GRIB2Grid { class GRIBMessage { public: - GRIBMessage() : buffer(0){}; + GRIBMessage() : buffer(0) {}; ~GRIBMessage() { delete[] buffer; }; unsigned char *buffer; int offset; /* offset in bytes to next GRIB2 section */ @@ -1026,7 +1026,8 @@ static zuchar GRBV2_TO_DATA(int productDiscipline, int dataCat, int dataNum) { ret = GRB_DEWPOINT; break; // DATA_TO_GRBV2[DATA_DEWPOINT] = grb2DataType(0,0,6); case 17: - ret = GRB_WTMP; //Skin temperature [C] SFC="Ground or water surface" + ret = GRB_WTMP; // Skin temperature [C] SFC="Ground or water + // surface" break; // DATA_TO_GRBV2[DATA_DEWPOINT] = grb2DataType(0,0,17); } break; @@ -1479,8 +1480,8 @@ void GribV2Record::translateDataType() { } else if (idCenter == 84 && idModel <= 5 && idGrid == 0) { } // MeteoFrance - else if (idCenter==85) { - if (dataType == GRB_CLOUD_TOT && levelType == LV_GND_SURF && + else if (idCenter == 85) { + if (dataType == GRB_CLOUD_TOT && levelType == LV_GND_SURF && levelValue == 0) { levelType = LV_ATMOS_ALL; } diff --git a/plugins/grib_pi/src/IsoLine.cpp b/plugins/grib_pi/src/IsoLine.cpp index 8e763776ce..4f506ada72 100644 --- a/plugins/grib_pi/src/IsoLine.cpp +++ b/plugins/grib_pi/src/IsoLine.cpp @@ -22,8 +22,8 @@ along with this program. If not, see . #include "wx/wx.h" #endif // precompiled headers -//#include "chcanv.h" -//#include "model/georef.h" +// #include "chcanv.h" +// #include "model/georef.h" #include #include "IsoLine.h" @@ -389,21 +389,21 @@ void IsoLine::drawIsoLine(GRIBOverlayFactory *pof, wxDC *dc, dc->SetPen(ppISO); } else { /* opengl */ #ifdef ocpnUSE_GL - //#ifndef USE_ANDROID_GLES2 - // if(m_pixelMM > 0.2){ // pixel size large enough to - // render well - // // Enable anti-aliased lines, at best quality - // glEnable( GL_LINE_SMOOTH ); - // glEnable( GL_BLEND ); - // glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - // glHint( GL_LINE_SMOOTH_HINT, GL_NICEST ); - // glLineWidth( 2 ); - // } - // else{ - // glLineWidth( 0.4/m_pixelMM); // set a target line - // width by MM - // } - //#else + // #ifndef USE_ANDROID_GLES2 + // if(m_pixelMM > 0.2){ // pixel size large enough to + // render well + // // Enable anti-aliased lines, at best quality + // glEnable( GL_LINE_SMOOTH ); + // glEnable( GL_BLEND ); + // glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + // glHint( GL_LINE_SMOOTH_HINT, GL_NICEST ); + // glLineWidth( 2 ); + // } + // else{ + // glLineWidth( 0.4/m_pixelMM); // set a target line + // width by MM + // } + // #else if (pof->m_oDC) { wxPen ppISO(isoLineColor, 2); pof->m_oDC->SetPen(ppISO); @@ -559,7 +559,7 @@ void IsoLine::drawIsoLineLabelsGL(GRIBOverlayFactory *pof, PlugIn_ViewPort *vp, #if 1 prev = r; if (pof->m_oDC) { - //pof->m_oDC->SetFont( *mfont ); + // pof->m_oDC->SetFont( *mfont ); pof->m_oDC->SetPen(*wxBLACK_PEN); pof->m_oDC->SetBrush(color); pof->m_oDC->DrawRectangle(x, y, w, h); diff --git a/plugins/grib_pi/src/XyGribPanel.cpp b/plugins/grib_pi/src/XyGribPanel.cpp index 93478787a0..eb7efdc684 100644 --- a/plugins/grib_pi/src/XyGribPanel.cpp +++ b/plugins/grib_pi/src/XyGribPanel.cpp @@ -9,145 +9,205 @@ /////////////////////////////////////////////////////////////////////////// -XyGribPanel::XyGribPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) -{ - wxGridBagSizer* m_separator_line; - m_separator_line = new wxGridBagSizer( 0, 0 ); - m_separator_line->SetFlexibleDirection( wxBOTH ); - m_separator_line->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_wavemodel_label = new wxStaticText( this, wxID_ANY, _("Wave model"), wxDefaultPosition, wxDefaultSize, 0 ); - m_wavemodel_label->Wrap( -1 ); - m_separator_line->Add( m_wavemodel_label, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_atmmodel_label = new wxStaticText( this, wxID_ANY, _("Weather model"), wxDefaultPosition, wxDefaultSize, 0 ); - m_atmmodel_label->Wrap( -1 ); - m_separator_line->Add( m_atmmodel_label, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_weathermodel = new wxStaticText( this, wxID_ANY, _("Resolution"), wxDefaultPosition, wxDefaultSize, 0 ); - m_weathermodel->Wrap( -1 ); - m_separator_line->Add( m_weathermodel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_duration_label = new wxStaticText( this, wxID_ANY, _("Days"), wxDefaultPosition, wxDefaultSize, 0 ); - m_duration_label->Wrap( -1 ); - m_separator_line->Add( m_duration_label, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_run_label = new wxStaticText( this, wxID_ANY, _("Run"), wxDefaultPosition, wxDefaultSize, 0 ); - m_run_label->Wrap( -1 ); - m_separator_line->Add( m_run_label, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_interval_label = new wxStaticText( this, wxID_ANY, _("Interval"), wxDefaultPosition, wxDefaultSize, 0 ); - m_interval_label->Wrap( -1 ); - m_separator_line->Add( m_interval_label, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - wxArrayString m_atmmodel_choiceChoices; - m_atmmodel_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_atmmodel_choiceChoices, 0 ); - m_atmmodel_choice->SetSelection( 0 ); - m_separator_line->Add( m_atmmodel_choice, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - - wxArrayString m_wavemodel_choiceChoices; - m_wavemodel_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_wavemodel_choiceChoices, 0 ); - m_wavemodel_choice->SetSelection( 0 ); - m_separator_line->Add( m_wavemodel_choice, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - - wxArrayString m_interval_choiceChoices; - m_interval_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_interval_choiceChoices, 0 ); - m_interval_choice->SetSelection( 0 ); - m_separator_line->Add( m_interval_choice, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - - wxArrayString m_resolution_choiceChoices; - m_resolution_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_resolution_choiceChoices, 0 ); - m_resolution_choice->SetSelection( 0 ); - m_separator_line->Add( m_resolution_choice, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - - wxArrayString m_duration_choiceChoices; - m_duration_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_duration_choiceChoices, 0 ); - m_duration_choice->SetSelection( 0 ); - m_separator_line->Add( m_duration_choice, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - - wxArrayString m_run_choiceChoices; - m_run_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_run_choiceChoices, 0 ); - m_run_choice->SetSelection( 0 ); - m_separator_line->Add( m_run_choice, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - - m_dataconfig_nbook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 ); - m_surfacetab_panel = new wxPanel( m_dataconfig_nbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxGridSizer* m_surfacetab_sizer; - m_surfacetab_sizer = new wxGridSizer( 0, 2, 0, 0 ); - - m_wind_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Wind (10m)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_wind_cbox->SetValue(true); - m_surfacetab_sizer->Add( m_wind_cbox, 0, wxALL, 5 ); - - m_gust_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Wind gust (surface)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_gust_cbox->SetValue(true); - m_surfacetab_sizer->Add( m_gust_cbox, 0, wxALL, 5 ); - - m_pressure_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Pressure (MSL)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_surfacetab_sizer->Add( m_pressure_cbox, 0, wxALL, 5 ); - - m_temperature_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Temperature (2m)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_surfacetab_sizer->Add( m_temperature_cbox, 0, wxALL, 5 ); - - m_cape_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("CAPE (surface)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_surfacetab_sizer->Add( m_cape_cbox, 0, wxALL, 5 ); - - m_reflectivity_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Reflectivity (atmosphere)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_surfacetab_sizer->Add( m_reflectivity_cbox, 0, wxALL, 5 ); - - m_cloudcover_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Cloud cover (total)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_surfacetab_sizer->Add( m_cloudcover_cbox, 0, wxALL, 5 ); - - m_precipitation_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Total precipitation"), wxDefaultPosition, wxDefaultSize, 0 ); - m_surfacetab_sizer->Add( m_precipitation_cbox, 0, wxALL, 5 ); - - m_waveheight_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Wave Significant height"), wxDefaultPosition, wxDefaultSize, 0 ); - m_waveheight_cbox->SetValue(true); - m_surfacetab_sizer->Add( m_waveheight_cbox, 0, wxALL, 5 ); - - m_windwave_cbox = new wxCheckBox( m_surfacetab_panel, wxID_ANY, _("Wind waves"), wxDefaultPosition, wxDefaultSize, 0 ); - m_surfacetab_sizer->Add( m_windwave_cbox, 0, wxALL, 5 ); - - - m_surfacetab_panel->SetSizer( m_surfacetab_sizer ); - m_surfacetab_panel->Layout(); - m_surfacetab_sizer->Fit( m_surfacetab_panel ); - m_dataconfig_nbook->AddPage( m_surfacetab_panel, _("Parameters"), false ); - - m_separator_line->Add( m_dataconfig_nbook, wxGBPosition( 0, 2 ), wxGBSpan( 6, 1 ), wxALL|wxEXPAND, 5 ); - - m_separator_1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_separator_line->Add( m_separator_1, wxGBPosition( 7, 0 ), wxGBSpan( 1, 3 ), wxEXPAND | wxALL, 5 ); - - m_download_button = new wxButton( this, wxID_ANY, _("Download"), wxDefaultPosition, wxDefaultSize, 0 ); - m_separator_line->Add( m_download_button, wxGBPosition( 9, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - - m_progress_gauge = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL ); - m_progress_gauge->SetValue( 0 ); - m_separator_line->Add( m_progress_gauge, wxGBPosition( 9, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - - m_status_label = new wxStaticText( this, wxID_ANY, _("Status :"), wxDefaultPosition, wxDefaultSize, 0 ); - m_status_label->Wrap( -1 ); - m_separator_line->Add( m_status_label, wxGBPosition( 8, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_status_text = new wxStaticText( this, wxID_ANY, _("Ready"), wxDefaultPosition, wxDefaultSize, 0 ); - m_status_text->Wrap( -1 ); - m_separator_line->Add( m_status_text, wxGBPosition( 8, 1 ), wxGBSpan( 1, 2 ), wxALL, 5 ); - - m_sizeestimate_label = new wxStaticText( this, wxID_ANY, _("Estimated size :"), wxDefaultPosition, wxDefaultSize, 0 ); - m_sizeestimate_label->Wrap( -1 ); - m_separator_line->Add( m_sizeestimate_label, wxGBPosition( 6, 1 ), wxGBSpan( 1, 1 ), wxALIGN_RIGHT|wxALL, 5 ); - - m_sizeestimate_text = new wxStaticText( this, wxID_ANY, _("Unknown"), wxDefaultPosition, wxDefaultSize, 0 ); - m_sizeestimate_text->Wrap( -1 ); - m_separator_line->Add( m_sizeestimate_text, wxGBPosition( 6, 2 ), wxGBSpan( 1, 1 ), wxALL, 5 ); - - - this->SetSizer( m_separator_line ); - this->Layout(); - m_separator_line->Fit( this ); +XyGribPanel::XyGribPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, + const wxSize& size, long style, const wxString& name) + : wxPanel(parent, id, pos, size, style, name) { + wxGridBagSizer* m_separator_line; + m_separator_line = new wxGridBagSizer(0, 0); + m_separator_line->SetFlexibleDirection(wxBOTH); + m_separator_line->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + + m_wavemodel_label = new wxStaticText(this, wxID_ANY, _("Wave model"), + wxDefaultPosition, wxDefaultSize, 0); + m_wavemodel_label->Wrap(-1); + m_separator_line->Add(m_wavemodel_label, wxGBPosition(1, 0), wxGBSpan(1, 1), + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5); + + m_atmmodel_label = new wxStaticText(this, wxID_ANY, _("Weather model"), + wxDefaultPosition, wxDefaultSize, 0); + m_atmmodel_label->Wrap(-1); + m_separator_line->Add(m_atmmodel_label, wxGBPosition(0, 0), wxGBSpan(1, 1), + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5); + + m_weathermodel = new wxStaticText(this, wxID_ANY, _("Resolution"), + wxDefaultPosition, wxDefaultSize, 0); + m_weathermodel->Wrap(-1); + m_separator_line->Add(m_weathermodel, wxGBPosition(2, 0), wxGBSpan(1, 1), + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5); + + m_duration_label = new wxStaticText(this, wxID_ANY, _("Days"), + wxDefaultPosition, wxDefaultSize, 0); + m_duration_label->Wrap(-1); + m_separator_line->Add(m_duration_label, wxGBPosition(3, 0), wxGBSpan(1, 1), + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5); + + m_run_label = new wxStaticText(this, wxID_ANY, _("Run"), wxDefaultPosition, + wxDefaultSize, 0); + m_run_label->Wrap(-1); + m_separator_line->Add(m_run_label, wxGBPosition(4, 0), wxGBSpan(1, 1), + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5); + + m_interval_label = new wxStaticText(this, wxID_ANY, _("Interval"), + wxDefaultPosition, wxDefaultSize, 0); + m_interval_label->Wrap(-1); + m_separator_line->Add(m_interval_label, wxGBPosition(5, 0), wxGBSpan(1, 1), + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5); + + wxArrayString m_atmmodel_choiceChoices; + m_atmmodel_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_atmmodel_choiceChoices, 0); + m_atmmodel_choice->SetSelection(0); + m_separator_line->Add(m_atmmodel_choice, wxGBPosition(0, 1), wxGBSpan(1, 1), + wxALL | wxEXPAND, 5); + + wxArrayString m_wavemodel_choiceChoices; + m_wavemodel_choice = + new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + m_wavemodel_choiceChoices, 0); + m_wavemodel_choice->SetSelection(0); + m_separator_line->Add(m_wavemodel_choice, wxGBPosition(1, 1), wxGBSpan(1, 1), + wxALL | wxEXPAND, 5); + + wxArrayString m_interval_choiceChoices; + m_interval_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_interval_choiceChoices, 0); + m_interval_choice->SetSelection(0); + m_separator_line->Add(m_interval_choice, wxGBPosition(5, 1), wxGBSpan(1, 1), + wxALL | wxEXPAND, 5); + + wxArrayString m_resolution_choiceChoices; + m_resolution_choice = + new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + m_resolution_choiceChoices, 0); + m_resolution_choice->SetSelection(0); + m_separator_line->Add(m_resolution_choice, wxGBPosition(2, 1), wxGBSpan(1, 1), + wxALL | wxEXPAND, 5); + + wxArrayString m_duration_choiceChoices; + m_duration_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, + wxDefaultSize, m_duration_choiceChoices, 0); + m_duration_choice->SetSelection(0); + m_separator_line->Add(m_duration_choice, wxGBPosition(3, 1), wxGBSpan(1, 1), + wxALL | wxEXPAND, 5); + + wxArrayString m_run_choiceChoices; + m_run_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + m_run_choiceChoices, 0); + m_run_choice->SetSelection(0); + m_separator_line->Add(m_run_choice, wxGBPosition(4, 1), wxGBSpan(1, 1), + wxALL | wxEXPAND, 5); + + m_dataconfig_nbook = + new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), 0); + m_surfacetab_panel = + new wxPanel(m_dataconfig_nbook, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxTAB_TRAVERSAL); + wxGridSizer* m_surfacetab_sizer; + m_surfacetab_sizer = new wxGridSizer(0, 2, 0, 0); + + m_wind_cbox = new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Wind (10m)"), + wxDefaultPosition, wxDefaultSize, 0); + m_wind_cbox->SetValue(true); + m_surfacetab_sizer->Add(m_wind_cbox, 0, wxALL, 5); + + m_gust_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Wind gust (surface)"), + wxDefaultPosition, wxDefaultSize, 0); + m_gust_cbox->SetValue(true); + m_surfacetab_sizer->Add(m_gust_cbox, 0, wxALL, 5); + + m_pressure_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Pressure (MSL)"), + wxDefaultPosition, wxDefaultSize, 0); + m_surfacetab_sizer->Add(m_pressure_cbox, 0, wxALL, 5); + + m_temperature_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Temperature (2m)"), + wxDefaultPosition, wxDefaultSize, 0); + m_surfacetab_sizer->Add(m_temperature_cbox, 0, wxALL, 5); + + m_cape_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("CAPE (surface)"), + wxDefaultPosition, wxDefaultSize, 0); + m_surfacetab_sizer->Add(m_cape_cbox, 0, wxALL, 5); + + m_reflectivity_cbox = new wxCheckBox(m_surfacetab_panel, wxID_ANY, + _("Reflectivity (atmosphere)"), + wxDefaultPosition, wxDefaultSize, 0); + m_surfacetab_sizer->Add(m_reflectivity_cbox, 0, wxALL, 5); + + m_cloudcover_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Cloud cover (total)"), + wxDefaultPosition, wxDefaultSize, 0); + m_surfacetab_sizer->Add(m_cloudcover_cbox, 0, wxALL, 5); + + m_precipitation_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Total precipitation"), + wxDefaultPosition, wxDefaultSize, 0); + m_surfacetab_sizer->Add(m_precipitation_cbox, 0, wxALL, 5); + + m_waveheight_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Wave Significant height"), + wxDefaultPosition, wxDefaultSize, 0); + m_waveheight_cbox->SetValue(true); + m_surfacetab_sizer->Add(m_waveheight_cbox, 0, wxALL, 5); + + m_windwave_cbox = + new wxCheckBox(m_surfacetab_panel, wxID_ANY, _("Wind waves"), + wxDefaultPosition, wxDefaultSize, 0); + m_surfacetab_sizer->Add(m_windwave_cbox, 0, wxALL, 5); + + m_surfacetab_panel->SetSizer(m_surfacetab_sizer); + m_surfacetab_panel->Layout(); + m_surfacetab_sizer->Fit(m_surfacetab_panel); + m_dataconfig_nbook->AddPage(m_surfacetab_panel, _("Parameters"), false); + + m_separator_line->Add(m_dataconfig_nbook, wxGBPosition(0, 2), wxGBSpan(6, 1), + wxALL | wxEXPAND, 5); + + m_separator_1 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxLI_HORIZONTAL); + m_separator_line->Add(m_separator_1, wxGBPosition(7, 0), wxGBSpan(1, 3), + wxEXPAND | wxALL, 5); + + m_download_button = new wxButton(this, wxID_ANY, _("Download"), + wxDefaultPosition, wxDefaultSize, 0); + m_separator_line->Add(m_download_button, wxGBPosition(9, 0), wxGBSpan(1, 1), + wxALL | wxEXPAND, 5); + + m_progress_gauge = new wxGauge(this, wxID_ANY, 100, wxDefaultPosition, + wxDefaultSize, wxGA_HORIZONTAL); + m_progress_gauge->SetValue(0); + m_separator_line->Add(m_progress_gauge, wxGBPosition(9, 1), wxGBSpan(1, 2), + wxALIGN_CENTER_VERTICAL | wxALL | wxEXPAND, 5); + + m_status_label = new wxStaticText(this, wxID_ANY, _("Status :"), + wxDefaultPosition, wxDefaultSize, 0); + m_status_label->Wrap(-1); + m_separator_line->Add(m_status_label, wxGBPosition(8, 0), wxGBSpan(1, 1), + wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5); + + m_status_text = new wxStaticText(this, wxID_ANY, _("Ready"), + wxDefaultPosition, wxDefaultSize, 0); + m_status_text->Wrap(-1); + m_separator_line->Add(m_status_text, wxGBPosition(8, 1), wxGBSpan(1, 2), + wxALL, 5); + + m_sizeestimate_label = new wxStaticText(this, wxID_ANY, _("Estimated size :"), + wxDefaultPosition, wxDefaultSize, 0); + m_sizeestimate_label->Wrap(-1); + m_separator_line->Add(m_sizeestimate_label, wxGBPosition(6, 1), + wxGBSpan(1, 1), wxALIGN_RIGHT | wxALL, 5); + + m_sizeestimate_text = new wxStaticText(this, wxID_ANY, _("Unknown"), + wxDefaultPosition, wxDefaultSize, 0); + m_sizeestimate_text->Wrap(-1); + m_separator_line->Add(m_sizeestimate_text, wxGBPosition(6, 2), wxGBSpan(1, 1), + wxALL, 5); + + this->SetSizer(m_separator_line); + this->Layout(); + m_separator_line->Fit(this); } -XyGribPanel::~XyGribPanel() -{ -} +XyGribPanel::~XyGribPanel() {} diff --git a/plugins/grib_pi/src/XyGribPanel.h b/plugins/grib_pi/src/XyGribPanel.h index 74560f4845..56f739c209 100644 --- a/plugins/grib_pi/src/XyGribPanel.h +++ b/plugins/grib_pi/src/XyGribPanel.h @@ -34,48 +34,47 @@ /////////////////////////////////////////////////////////////////////////////// /// Class XyGribPanel /////////////////////////////////////////////////////////////////////////////// -class XyGribPanel : public wxPanel -{ - private: +class XyGribPanel : public wxPanel { +private: +protected: + wxStaticText* m_wavemodel_label; + wxStaticText* m_atmmodel_label; + wxStaticText* m_weathermodel; + wxStaticText* m_duration_label; + wxStaticText* m_run_label; + wxStaticText* m_interval_label; + wxNotebook* m_dataconfig_nbook; + wxPanel* m_surfacetab_panel; + wxStaticLine* m_separator_1; + wxStaticText* m_status_label; + wxStaticText* m_sizeestimate_label; - protected: - wxStaticText* m_wavemodel_label; - wxStaticText* m_atmmodel_label; - wxStaticText* m_weathermodel; - wxStaticText* m_duration_label; - wxStaticText* m_run_label; - wxStaticText* m_interval_label; - wxNotebook* m_dataconfig_nbook; - wxPanel* m_surfacetab_panel; - wxStaticLine* m_separator_1; - wxStaticText* m_status_label; - wxStaticText* m_sizeestimate_label; +public: + wxChoice* m_atmmodel_choice; + wxChoice* m_wavemodel_choice; + wxChoice* m_interval_choice; + wxChoice* m_resolution_choice; + wxChoice* m_duration_choice; + wxChoice* m_run_choice; + wxCheckBox* m_wind_cbox; + wxCheckBox* m_gust_cbox; + wxCheckBox* m_pressure_cbox; + wxCheckBox* m_temperature_cbox; + wxCheckBox* m_cape_cbox; + wxCheckBox* m_reflectivity_cbox; + wxCheckBox* m_cloudcover_cbox; + wxCheckBox* m_precipitation_cbox; + wxCheckBox* m_waveheight_cbox; + wxCheckBox* m_windwave_cbox; + wxButton* m_download_button; + wxGauge* m_progress_gauge; + wxStaticText* m_status_text; + wxStaticText* m_sizeestimate_text; - public: - wxChoice* m_atmmodel_choice; - wxChoice* m_wavemodel_choice; - wxChoice* m_interval_choice; - wxChoice* m_resolution_choice; - wxChoice* m_duration_choice; - wxChoice* m_run_choice; - wxCheckBox* m_wind_cbox; - wxCheckBox* m_gust_cbox; - wxCheckBox* m_pressure_cbox; - wxCheckBox* m_temperature_cbox; - wxCheckBox* m_cape_cbox; - wxCheckBox* m_reflectivity_cbox; - wxCheckBox* m_cloudcover_cbox; - wxCheckBox* m_precipitation_cbox; - wxCheckBox* m_waveheight_cbox; - wxCheckBox* m_windwave_cbox; - wxButton* m_download_button; - wxGauge* m_progress_gauge; - wxStaticText* m_status_text; - wxStaticText* m_sizeestimate_text; - - XyGribPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); - - ~XyGribPanel(); + XyGribPanel(wxWindow* parent, wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxSize(-1, -1), long style = wxTAB_TRAVERSAL, + const wxString& name = wxEmptyString); + ~XyGribPanel(); }; - diff --git a/plugins/grib_pi/src/email.cpp b/plugins/grib_pi/src/email.cpp index 76d7e5432a..65e567dfb2 100644 --- a/plugins/grib_pi/src/email.cpp +++ b/plugins/grib_pi/src/email.cpp @@ -107,9 +107,9 @@ bool wxEmail::Send(wxMailMessage& message, int sendMethod, return false; } - msg << "sh -c \" " << sendmail - << " --utf8 --subject '" << message.m_subject << "' " - <<"--body '" << message.m_body << "'"; + msg << "sh -c \" " << sendmail << " --utf8 --subject '" + << message.m_subject << "' " + << "--body '" << message.m_body << "'"; for (size_t rcpt = 0; rcpt < message.m_to.GetCount(); rcpt++) msg << " '" << message.m_to[rcpt] << "'"; // add recipients msg << "\""; @@ -155,5 +155,5 @@ bool wxEmail::Send(wxMailMessage& message, int sendMethod, #else wxLogMessage(_T("Send eMail not yet implemented for this platform")); return false; -//#error Send not yet implemented for this platform. +// #error Send not yet implemented for this platform. #endif diff --git a/plugins/grib_pi/src/email.h b/plugins/grib_pi/src/email.h index bcc15975e7..222c374cfc 100644 --- a/plugins/grib_pi/src/email.h +++ b/plugins/grib_pi/src/email.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_NETUTILS wxEmail { public: //// Ctor/dtor - wxEmail(){}; + wxEmail() {}; //// Operations diff --git a/plugins/grib_pi/src/grib_pi.cpp b/plugins/grib_pi/src/grib_pi.cpp index 6e47fb6275..b453c062ab 100644 --- a/plugins/grib_pi/src/grib_pi.cpp +++ b/plugins/grib_pi/src/grib_pi.cpp @@ -36,7 +36,6 @@ #endif #endif // precompiled headers - #include #include @@ -131,18 +130,20 @@ int grib_pi::Init(void) { // This PlugIn needs a CtrlBar icon, so request its insertion if enabled // locally wxString shareLocn = *GetpSharedDataLocation() + _T("plugins") + - wxFileName::GetPathSeparator() + _T("grib_pi") + - wxFileName::GetPathSeparator() + _T("data") + - wxFileName::GetPathSeparator(); - //Initialize catalog file + wxFileName::GetPathSeparator() + _T("grib_pi") + + wxFileName::GetPathSeparator() + _T("data") + + wxFileName::GetPathSeparator(); + // Initialize catalog file wxString local_grib_catalog = "sources.json"; - wxString data_path = *GetpPrivateApplicationDataLocation() + wxFileName::GetPathSeparator() + "grib_pi"; + wxString data_path = *GetpPrivateApplicationDataLocation() + + wxFileName::GetPathSeparator() + "grib_pi"; if (!wxDirExists(data_path)) { wxMkdir(data_path); } - m_local_sources_catalog = data_path + wxFileName::GetPathSeparator() + local_grib_catalog; + m_local_sources_catalog = + data_path + wxFileName::GetPathSeparator() + local_grib_catalog; if (!wxFileExists(m_local_sources_catalog)) { - wxCopyFile(shareLocn + local_grib_catalog, m_local_sources_catalog); + wxCopyFile(shareLocn + local_grib_catalog, m_local_sources_catalog); } if (m_bGRIBShowIcon) { wxString normalIcon = shareLocn + _T("grib.svg"); @@ -245,6 +246,15 @@ void grib_pi::ShowPreferencesDialog(wxWindow *parent) { Pref->m_rbTimeFormat->SetSelection(m_bTimeZone); Pref->m_rbLoadOptions->SetSelection(m_bLoadLastOpenFile); Pref->m_rbStartOptions->SetSelection(m_bStartOptions); + + wxFileConfig *pConf = GetOCPNConfigObject(); + if (pConf) { + wxString l_grib_dir; + pConf->SetPath(_T ( "/Directories" )); + pConf->Read(_T ( "GRIBDirectory" ), &l_grib_dir); + Pref->m_grib_dir_sel = l_grib_dir; + } + #ifdef __WXMSW__ int val = (m_GribIconsScaleFactor * 10.) - 10; Pref->m_sIconSizeFactor->SetValue(val); @@ -268,15 +278,14 @@ void grib_pi::ShowPreferencesDialog(wxWindow *parent) { wxDisplaySize(&display_width, &display_height); int char_width = GetOCPNCanvasWindow()->GetCharWidth(); int char_height = GetOCPNCanvasWindow()->GetCharHeight(); - if(display_height < 600){ + if (display_height < 600) { wxSize canvas_size = GetOCPNCanvasWindow()->GetSize(); Pref->SetMaxSize(GetOCPNCanvasWindow()->GetSize()); Pref->SetSize(wxSize(60 * char_width, canvas_size.x * 8 / 10)); Pref->CentreOnScreen(); - } - else { + } else { Pref->SetMaxSize(GetOCPNCanvasWindow()->GetSize()); - Pref->SetSize(wxSize(60 * char_width, 29 * char_height)); + Pref->SetSize(wxSize(60 * char_width, 32 * char_height)); } Pref->ShowModal(); @@ -341,8 +350,21 @@ void grib_pi::UpdatePrefs(GribPreferencesDialog *Pref) { m_pGribCtrlBar->ComputeBestForecastForNow(); break; } + if (Pref->m_grib_dir_sel.Length()) { + m_pGribCtrlBar->m_grib_dir = Pref->m_grib_dir_sel; + m_pGribCtrlBar->m_file_names.Clear(); + } } + if (Pref->m_grib_dir_sel.Length()) { + wxFileConfig *pConf = GetOCPNConfigObject(); + if (pConf) { + pConf->SetPath(_T ( "/Directories" )); + pConf->Write(_T ( "GRIBDirectory" ), Pref->m_grib_dir_sel); + pConf->DeleteGroup(_T ( "/Settings/GRIB/FileNames" )); + pConf->Flush(); + } + } SaveConfig(); } @@ -406,7 +428,8 @@ void grib_pi::OnToolbarToolCallback(int id) { bool starting = false; - double scale_factor = GetOCPNGUIToolScaleFactor_PlugIn() * OCPN_GetWinDIPScaleFactor(); + double scale_factor = + GetOCPNGUIToolScaleFactor_PlugIn() * OCPN_GetWinDIPScaleFactor(); #ifdef __WXMSW__ scale_factor *= m_GribIconsScaleFactor; #endif @@ -429,12 +452,12 @@ void grib_pi::OnToolbarToolCallback(int id) { wxMenuItem *table = new wxMenuItem(dummy, wxID_ANY, wxString(_("Weather table")), wxEmptyString, wxITEM_NORMAL); -/* Menu font do not work properly for MSW (wxWidgets 3.2.1) -#ifdef __WXMSW__ - wxFont *qFont = OCPNGetFont(_("Menu"), 10); - table->SetFont(*qFont); -#endif -*/ + /* Menu font do not work properly for MSW (wxWidgets 3.2.1) + #ifdef __WXMSW__ + wxFont *qFont = OCPNGetFont(_("Menu"), 10); + table->SetFont(*qFont); + #endif + */ m_MenuItem = AddCanvasContextMenuItem(table, this); SetCanvasContextMenuItemViz(m_MenuItem, false); @@ -454,12 +477,12 @@ void grib_pi::OnToolbarToolCallback(int id) { // Toggle dialog? if (m_bShowGrib) { - //A new file could have been added since grib plugin opened + // A new file could have been added since grib plugin opened if (!starting && m_bLoadLastOpenFile == 0) { m_pGribCtrlBar->OpenFile(true); starting = true; } - //the dialog font could have been changed since grib plugin opened + // the dialog font could have been changed since grib plugin opened if (m_pGribCtrlBar->GetFont() != *OCPNGetFont(_("Dialog"), 10)) starting = true; if (starting) { @@ -541,7 +564,7 @@ bool grib_pi::DoRenderOverlay(wxDC &dc, PlugIn_ViewPort *vp, int canvasIndex) { m_pGRIBOverlayFactory->RenderGribOverlay(dc, vp); - if ( GetCanvasByIndex(canvasIndex) == GetCanvasUnderMouse() ) { + if (GetCanvasByIndex(canvasIndex) == GetCanvasUnderMouse()) { m_pGribCtrlBar->SetViewPort(vp); if (m_pGribCtrlBar->pReq_Dialog) m_pGribCtrlBar->pReq_Dialog->RenderZoneOverlay(dc); @@ -836,12 +859,12 @@ void grib_pi::SendTimelineMessage(wxDateTime time) { SendPluginMessage(wxString(_T("GRIB_TIMELINE")), out); } -void grib_pi::SetPositionFixEx(PlugIn_Position_Fix_Ex& pfix) { +void grib_pi::SetPositionFixEx(PlugIn_Position_Fix_Ex &pfix) { m_boat_cog = pfix.Cog; m_boat_sog = pfix.Sog; m_boat_lat = pfix.Lat; m_boat_lon = pfix.Lon; - if(pfix.FixTime != 0) { + if (pfix.FixTime != 0) { m_boat_time = pfix.FixTime; } else { m_boat_time = wxDateTime::Now().GetTicks(); diff --git a/plugins/grib_pi/src/grib_pi.h b/plugins/grib_pi/src/grib_pi.h index 058b9a91a4..9f843ee000 100644 --- a/plugins/grib_pi/src/grib_pi.h +++ b/plugins/grib_pi/src/grib_pi.h @@ -189,9 +189,9 @@ class grib_pi : public opencpn_plugin_116 { wxString m_ZyGribLogin; wxString m_ZyGribCode; double m_GUIScaleFactor; - #ifdef __WXMSW__ +#ifdef __WXMSW__ double m_GribIconsScaleFactor; - #endif +#endif bool m_bGRIBShowIcon; bool m_bShowGrib; diff --git a/plugins/grib_pi/src/jsonwriter.cpp b/plugins/grib_pi/src/jsonwriter.cpp index 50e3613c9c..f1722d7187 100644 --- a/plugins/grib_pi/src/jsonwriter.cpp +++ b/plugins/grib_pi/src/jsonwriter.cpp @@ -795,7 +795,7 @@ int wxJSONWriter::WriteStringValue(wxOutputStream& os, const wxString& str) { } } } - } // end for + } // end for os.PutC('\"'); // close quotes return 0; } diff --git a/plugins/grib_pi/src/msg.h b/plugins/grib_pi/src/msg.h index dd257fbfcc..0b87e1b0ef 100644 --- a/plugins/grib_pi/src/msg.h +++ b/plugins/grib_pi/src/msg.h @@ -37,7 +37,7 @@ class WXDLLIMPEXP_NETUTILS wxMailMessage { } } - wxMailMessage(){}; + wxMailMessage() {}; //// Accessors diff --git a/plugins/grib_pi/src/pi_TexFont.cpp b/plugins/grib_pi/src/pi_TexFont.cpp index 5b0398d4ad..067a6cc8dc 100644 --- a/plugins/grib_pi/src/pi_TexFont.cpp +++ b/plugins/grib_pi/src/pi_TexFont.cpp @@ -93,10 +93,8 @@ void TexFont::Build(wxFont &font, bool blur) { wxASSERT(w < 2048 && h < 2048); /* make power of 2 */ - for (tex_w = 1; tex_w < w; tex_w *= 2) - ; - for (tex_h = 1; tex_h < h; tex_h *= 2) - ; + for (tex_w = 1; tex_w < w; tex_w *= 2); + for (tex_h = 1; tex_h < h; tex_h *= 2); wxBitmap tbmp(tex_w, tex_h); wxMemoryDC dc; diff --git a/plugins/grib_pi/src/pi_gl.h b/plugins/grib_pi/src/pi_gl.h index e196a7535d..e5ad398c52 100644 --- a/plugins/grib_pi/src/pi_gl.h +++ b/plugins/grib_pi/src/pi_gl.h @@ -31,21 +31,20 @@ #ifndef _PIGL_H_ #define _PIGL_H_ - #if defined(__OCPN__ANDROID__) - #include - #include // this is a cut-down version of gl.h - #include +#include +#include // this is a cut-down version of gl.h +#include #elif defined(__MSVC__) - #include "glew.h" +#include "glew.h" #elif defined(__WXOSX__) - #include - #include - typedef void (* _GLUfuncptr)(); - #define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 +#include +#include +typedef void (*_GLUfuncptr)(); +#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 #elif defined(__WXQT__) || defined(__WXGTK__) - #include - #include +#include +#include #endif #endif // __FILE__ diff --git a/plugins/grib_pi/src/pi_ocpndc.cpp b/plugins/grib_pi/src/pi_ocpndc.cpp old mode 100755 new mode 100644 index 6c89891327..9280bfb486 --- a/plugins/grib_pi/src/pi_ocpndc.cpp +++ b/plugins/grib_pi/src/pi_ocpndc.cpp @@ -36,9 +36,9 @@ #include "pi_gl.h" #ifndef __OCPN__ANDROID__ -//#include -//#include -//#include +// #include +// #include +// #include #endif #include "ocpn_plugin.h" @@ -91,13 +91,17 @@ int NextPow2(int size) { //---------------------------------------------------------------------------- /* pass the dc to the constructor, or NULL to use opengl */ pi_ocpnDC::pi_ocpnDC(wxGLCanvas &canvas) - : glcanvas(&canvas), dc(NULL), m_pen(wxNullPen), m_brush(wxNullBrush), m_buseGL(true) { + : glcanvas(&canvas), + dc(NULL), + m_pen(wxNullPen), + m_brush(wxNullBrush), + m_buseGL(true) { #ifdef ocpnUSE_GL #if wxUSE_GRAPHICS_CONTEXT pgc = NULL; #endif m_textforegroundcolour = wxColour(0, 0, 0); - m_buseTex = false; //GetLocaleCanonicalName().IsSameAs(_T("en_US")); + m_buseTex = false; // GetLocaleCanonicalName().IsSameAs(_T("en_US")); workBuf = NULL; workBufSize = 0; s_odc_tess_work_buf = NULL; @@ -116,7 +120,11 @@ pi_ocpnDC::pi_ocpnDC(wxGLCanvas &canvas) } pi_ocpnDC::pi_ocpnDC(wxDC &pdc) - : glcanvas(NULL), dc(&pdc), m_pen(wxNullPen), m_brush(wxNullBrush), m_buseGL(false) { + : glcanvas(NULL), + dc(&pdc), + m_pen(wxNullPen), + m_brush(wxNullBrush), + m_buseGL(false) { #if wxUSE_GRAPHICS_CONTEXT pgc = NULL; wxMemoryDC *pmdc = wxDynamicCast(dc, wxMemoryDC); @@ -128,7 +136,7 @@ pi_ocpnDC::pi_ocpnDC(wxDC &pdc) } #endif m_textforegroundcolour = wxColour(0, 0, 0); - m_buseTex = false; //GetLocaleCanonicalName().IsSameAs(_T("en_US")); + m_buseTex = false; // GetLocaleCanonicalName().IsSameAs(_T("en_US")); workBuf = NULL; workBufSize = 0; #ifdef ocpnUSE_GL @@ -137,12 +145,16 @@ pi_ocpnDC::pi_ocpnDC(wxDC &pdc) } pi_ocpnDC::pi_ocpnDC() - : glcanvas(NULL), dc(NULL), m_pen(wxNullPen), m_brush(wxNullBrush), m_buseGL(true) { + : glcanvas(NULL), + dc(NULL), + m_pen(wxNullPen), + m_brush(wxNullBrush), + m_buseGL(true) { #if wxUSE_GRAPHICS_CONTEXT pgc = NULL; #endif m_textforegroundcolour = wxColour(0, 0, 0); - m_buseTex = false; //GetLocaleCanonicalName().IsSameAs(_T("en_US")); + m_buseTex = false; // GetLocaleCanonicalName().IsSameAs(_T("en_US")); workBuf = NULL; workBufSize = 0; #ifdef ocpnUSE_GL @@ -162,11 +174,11 @@ pi_ocpnDC::~pi_ocpnDC() { } void pi_ocpnDC::SetVP(PlugIn_ViewPort *vp) { -//#ifdef __OCPN__ANDROID__ - if ( m_buseGL ) { + // #ifdef __OCPN__ANDROID__ + if (m_buseGL) { configureShaders(vp->pix_width, vp->pix_height); } -//#endif + // #endif m_vpSize = wxSize(vp->pix_width, vp->pix_height); } @@ -420,7 +432,8 @@ void piDrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - GLint pos = glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); + GLint pos = + glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); glEnableVertexAttribArray(pos); glVertexAttribPointer(pos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), vert); @@ -428,8 +441,8 @@ void piDrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, mat4x4 I; mat4x4_identity(I); - GLint matloc = - glGetUniformLocation(GRIBpi_color_tri_shader_program, "TransformMatrix"); + GLint matloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, + "TransformMatrix"); glUniformMatrix4fv(matloc, 1, GL_FALSE, (const GLfloat *)I); wxColor c = pen.GetColour(); @@ -439,7 +452,8 @@ void piDrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, colorv[2] = c.Blue() / float(256); colorv[3] = c.Alpha() / float(256); - GLint colloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); + GLint colloc = + glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); glUniform4fv(colloc, 1, colorv); while (lrun < lpix) { @@ -501,7 +515,8 @@ void piDrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - GLint pos = glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); + GLint pos = + glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); glEnableVertexAttribArray(pos); glVertexAttribPointer(pos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), vert); @@ -509,8 +524,8 @@ void piDrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, mat4x4 I; mat4x4_identity(I); - GLint matloc = - glGetUniformLocation(GRIBpi_color_tri_shader_program, "TransformMatrix"); + GLint matloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, + "TransformMatrix"); glUniformMatrix4fv(matloc, 1, GL_FALSE, (const GLfloat *)I); wxColor c = pen.GetColour(); @@ -520,7 +535,8 @@ void piDrawGLThickLine(float x1, float y1, float x2, float y2, wxPen pen, colorv[2] = c.Blue() / float(256); colorv[3] = c.Alpha() / float(256); - GLint colloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); + GLint colloc = + glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); glUniform4fv(colloc, 1, colorv); glDrawArrays(GL_TRIANGLES, 0, 6); @@ -581,14 +597,15 @@ void pi_ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, glLineWidth(pen_width); } -#if 1 //def USE_ANDROID_GLES2 +#if 1 // def USE_ANDROID_GLES2 if (b_draw_thick) piDrawGLThickLine(x1, y1, x2, y2, m_pen, b_hiqual); else { glUseProgram(GRIBpi_color_tri_shader_program); float fBuf[4]; - GLint pos = glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); + GLint pos = + glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); glVertexAttribPointer(pos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), fBuf); glEnableVertexAttribArray(pos); @@ -604,7 +621,8 @@ void pi_ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, colorv[2] = m_pen.GetColour().Blue() / float(256); colorv[3] = 1.0; - GLint colloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); + GLint colloc = + glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); glUniform4fv(colloc, 1, colorv); wxDash *dashes; @@ -658,7 +676,6 @@ void pi_ocpnDC::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, glDrawArrays(GL_LINES, 0, 2); glDisableVertexAttribArray(pos); - } glUseProgram(0); @@ -887,7 +904,7 @@ void pi_ocpnDC::DrawLines(int n, wxPoint points[], wxCoord xoffset, return; } -#if 0 //ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 glBegin(GL_LINE_STRIP); for (int i = 0; i < n; i++) @@ -909,7 +926,8 @@ void pi_ocpnDC::DrawLines(int n, wxPoint points[], wxCoord xoffset, glUseProgram(GRIBpi_color_tri_shader_program); - GLint pos = glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); + GLint pos = + glGetAttribLocation(GRIBpi_color_tri_shader_program, "position"); glVertexAttribPointer(pos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), workBuf); glEnableVertexAttribArray(pos); @@ -925,7 +943,8 @@ void pi_ocpnDC::DrawLines(int n, wxPoint points[], wxCoord xoffset, colorv[3] = m_pen.GetColour().Alpha() / float(256); 1.0; - GLint colloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); + GLint colloc = + glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); glUniform4fv(colloc, 1, colorv); glDrawArrays(GL_LINE_STRIP, 0, n); @@ -979,8 +998,7 @@ void pi_ocpnDC::StrokeLines(int n, wxPoint *points) { void pi_ocpnDC::DrawGLLineArray(int n, float *vertex_array, float *color_array, unsigned char *color_array_ub, bool b_hiqual) { - if(!n) - return; + if (!n) return; #ifdef ocpnUSE_GL if (ConfigurePen()) { @@ -1016,7 +1034,7 @@ void pi_ocpnDC::DrawGLLineArray(int n, float *vertex_array, float *color_array, glLineWidth(wxMax(g_piGLMinSymbolLineWidth, 1)); } -#if 0//ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_COLOR_ARRAY); @@ -1038,12 +1056,14 @@ void pi_ocpnDC::DrawGLLineArray(int n, float *vertex_array, float *color_array, #else glUseProgram(GRIBpi_colorv_tri_shader_program); - GLint pos = glGetAttribLocation(GRIBpi_colorv_tri_shader_program, "position"); + GLint pos = + glGetAttribLocation(GRIBpi_colorv_tri_shader_program, "position"); glVertexAttribPointer(pos, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), vertex_array); glEnableVertexAttribArray(pos); - GLint colloc = glGetAttribLocation(GRIBpi_colorv_tri_shader_program, "colorv"); + GLint colloc = + glGetAttribLocation(GRIBpi_colorv_tri_shader_program, "colorv"); glVertexAttribPointer(colloc, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(float), color_array); glEnableVertexAttribArray(colloc); @@ -1069,7 +1089,7 @@ void pi_ocpnDC::DrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) { if (dc) dc->DrawRectangle(x, y, w, h); #ifdef ocpnUSE_GL else { -#if 0//ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 if (ConfigureBrush()) { glBegin(GL_QUADS); glVertex2i(x, y); @@ -1175,7 +1195,7 @@ void pi_ocpnDC::DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, wxCoord x1 = x + r, x2 = x + w - r; wxCoord y1 = y + r, y2 = y + h - r; -#if 1//def USE_ANDROID_GLES2 +#if 1 // def USE_ANDROID_GLES2 // Grow the work buffer as necessary size_t bufReq = steps * 8 * 2 * sizeof(float); // large, to be sure @@ -1211,7 +1231,8 @@ void pi_ocpnDC::DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, bcolorv[2] = m_brush.GetColour().Blue() / float(256); bcolorv[3] = m_brush.GetColour().Alpha() / float(256); - GLint bcolloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); + GLint bcolloc = + glGetUniformLocation(GRIBpi_color_tri_shader_program, "color"); glUniform4fv(bcolloc, 1, bcolorv); float angle = 0.; @@ -1227,8 +1248,8 @@ void pi_ocpnDC::DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, Q[3][0] = xoffset; Q[3][1] = yoffset; - GLint matloc = - glGetUniformLocation(GRIBpi_color_tri_shader_program, "TransformMatrix"); + GLint matloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, + "TransformMatrix"); glUniformMatrix4fv(matloc, 1, GL_FALSE, (const GLfloat *)Q); // Perform the actual drawing. @@ -1238,8 +1259,8 @@ void pi_ocpnDC::DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h, // Restore the per-object transform to Identity Matrix mat4x4 IM; mat4x4_identity(IM); - GLint matlocf = - glGetUniformLocation(GRIBpi_color_tri_shader_program, "TransformMatrix"); + GLint matlocf = glGetUniformLocation(GRIBpi_color_tri_shader_program, + "TransformMatrix"); glUniformMatrix4fv(matlocf, 1, GL_FALSE, (const GLfloat *)IM); glUseProgram(0); @@ -1472,8 +1493,8 @@ void pi_ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, Q[3][0] = xoffset; Q[3][1] = yoffset; - GLint matloc = - glGetUniformLocation(GRIBpi_color_tri_shader_program, "TransformMatrix"); + GLint matloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, + "TransformMatrix"); glUniformMatrix4fv(matloc, 1, GL_FALSE, (const GLfloat *)Q); // Perform the actual drawing. @@ -1507,8 +1528,8 @@ void pi_ocpnDC::DrawPolygon(int n, wxPoint points[], wxCoord xoffset, // Restore the per-object transform to Identity Matrix mat4x4 IM; mat4x4_identity(IM); - GLint matlocf = - glGetUniformLocation(GRIBpi_color_tri_shader_program, "TransformMatrix"); + GLint matlocf = glGetUniformLocation(GRIBpi_color_tri_shader_program, + "TransformMatrix"); glUniformMatrix4fv(matlocf, 1, GL_FALSE, (const GLfloat *)IM); glUseProgram(0); @@ -1558,7 +1579,7 @@ typedef union { } info; } GLvertex; -#if 0 //ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 void APIENTRY pi_ocpnDCcombineCallback(GLdouble coords[3], GLdouble *vertex_data[4], GLfloat weight[4], GLdouble **dataOut) { @@ -1598,7 +1619,7 @@ void APIENTRY ocpnDCendCallback() { glEnd(); } // GLSL callbacks -#if 1 //def USE_ANDROID_GLES2 +#if 1 // def USE_ANDROID_GLES2 static std::list odc_combine_work_data; static void pi_odc_combineCallbackD(GLdouble coords[3], @@ -1684,7 +1705,7 @@ void pi_odc_endCallbackD_GLSL(void *data) { } #endif -#endif //#ifdef ocpnUSE_GL +#endif // #ifdef ocpnUSE_GL void pi_ocpnDC::DrawPolygonTessellated(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { @@ -1700,7 +1721,7 @@ void pi_ocpnDC::DrawPolygonTessellated(int n, wxPoint points[], wxCoord xoffset, return; } -#if 1 //def USE_ANDROID_GLES2 +#if 1 // def USE_ANDROID_GLES2 m_tobj = gluNewTess(); s_odc_tess_vertex_idx = 0; @@ -1868,7 +1889,7 @@ void pi_ocpnDC::DrawBitmap(const wxBitmap &bitmap, wxCoord x, wxCoord y, glColor4f(1, 1, 1, 1); GLDrawBlendData(x, y, w, h, GL_RGBA, e); - delete[](e); + delete[] (e); } else { glRasterPos2i(x, y); glPixelZoom(1, -1); /* draw data from top to bottom */ @@ -1899,7 +1920,7 @@ void pi_ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); -#if 0//ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 glPushMatrix(); glTranslatef(x, y, 0); @@ -1917,15 +1938,16 @@ void pi_ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y) { } else { wxScreenDC sdc; sdc.SetFont(m_font); - sdc.GetMultiLineTextExtent(text, &w, &h, NULL, &m_font); /*we need to handle multiline*/ + sdc.GetMultiLineTextExtent(text, &w, &h, NULL, + &m_font); /*we need to handle multiline*/ int ww, hw; - sdc.GetTextExtent("W", &ww, &hw); // metric - w += ww; // RHS padding. + sdc.GetTextExtent("W", &ww, &hw); // metric + w += ww; // RHS padding. w *= OCPN_GetWinDIPScaleFactor(); h *= OCPN_GetWinDIPScaleFactor(); - h *= 2; //TODO //Some trouble with math or text sizing. - // Add "fluff" to text bitmap size. + h *= 2; // TODO //Some trouble with math or text sizing. + // Add "fluff" to text bitmap size. /* create bitmap of appropriate size and select it */ wxBitmap bmp(w, h); @@ -2006,7 +2028,7 @@ void pi_ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y) { float u = (float)w / TextureWidth, v = (float)h / TextureHeight; -#if 0//ndef USE_ANDROID_GLES2 +#if 0 // ndef USE_ANDROID_GLES2 glColor3ub(0, 0, 0); glBegin(GL_QUADS); @@ -2046,8 +2068,10 @@ void pi_ocpnDC::DrawText(const wxString &text, wxCoord x, wxCoord y) { glUseProgram(pi_texture_2D_shader_program); // Get pointers to the attributes in the program. - GLint mPosAttrib = glGetAttribLocation(pi_texture_2D_shader_program, "aPos"); - GLint mUvAttrib = glGetAttribLocation(pi_texture_2D_shader_program, "aUV"); + GLint mPosAttrib = + glGetAttribLocation(pi_texture_2D_shader_program, "aPos"); + GLint mUvAttrib = + glGetAttribLocation(pi_texture_2D_shader_program, "aUV"); // Set up the texture sampler to texture unit 0 GLint texUni = glGetUniformLocation(pi_texture_2D_shader_program, "uTex"); diff --git a/plugins/grib_pi/src/pi_shaders.cpp b/plugins/grib_pi/src/pi_shaders.cpp index 37721d137d..dde669148b 100644 --- a/plugins/grib_pi/src/pi_shaders.cpp +++ b/plugins/grib_pi/src/pi_shaders.cpp @@ -30,18 +30,15 @@ #include #endif - - #ifdef USE_ANDROID_GLES2 -const GLchar* PI_shader_preamble = -"\n"; +const GLchar* PI_shader_preamble = "\n"; #else const GLchar* PI_shader_preamble = -"#version 120\n" -"#define precision\n" -"#define lowp\n" -"#define mediump\n" -"#define highp\n"; + "#version 120\n" + "#define precision\n" + "#define lowp\n" + "#define mediump\n" + "#define highp\n"; #endif // Simple colored triangle shader @@ -212,10 +209,13 @@ bool pi_loadShaders() { // Simple colored triangle shader if (!GRIBpi_color_tri_shader_program) { - auto shaderProgram = PI_GLShaderProgram::Builder() - .addShaderFromSource(color_tri_vertex_shader_source, GL_VERTEX_SHADER) - .addShaderFromSource(color_tri_fragment_shader_source, GL_FRAGMENT_SHADER) - .linkProgram(); + auto shaderProgram = + PI_GLShaderProgram::Builder() + .addShaderFromSource(color_tri_vertex_shader_source, + GL_VERTEX_SHADER) + .addShaderFromSource(color_tri_fragment_shader_source, + GL_FRAGMENT_SHADER) + .linkProgram(); GRIBpi_color_tri_shader_program = shaderProgram.programId(); } @@ -269,10 +269,13 @@ bool pi_loadShaders() { // Array colored triangle shader if (!GRIBpi_colorv_tri_shader_program) { - auto shaderProgram = PI_GLShaderProgram::Builder() - .addShaderFromSource(colorv_tri_vertex_shader_source, GL_VERTEX_SHADER) - .addShaderFromSource(colorv_tri_fragment_shader_source, GL_FRAGMENT_SHADER) - .linkProgram(); + auto shaderProgram = + PI_GLShaderProgram::Builder() + .addShaderFromSource(colorv_tri_vertex_shader_source, + GL_VERTEX_SHADER) + .addShaderFromSource(colorv_tri_fragment_shader_source, + GL_FRAGMENT_SHADER) + .linkProgram(); GRIBpi_colorv_tri_shader_program = shaderProgram.programId(); } @@ -326,10 +329,13 @@ bool pi_loadShaders() { // Simple 2D texture shader if (!pi_texture_2D_shader_program) { - auto shaderProgram = PI_GLShaderProgram::Builder() - .addShaderFromSource(texture_2D_vertex_shader_source, GL_VERTEX_SHADER) - .addShaderFromSource(texture_2D_fragment_shader_source, GL_FRAGMENT_SHADER) - .linkProgram(); + auto shaderProgram = + PI_GLShaderProgram::Builder() + .addShaderFromSource(texture_2D_vertex_shader_source, + GL_VERTEX_SHADER) + .addShaderFromSource(texture_2D_fragment_shader_source, + GL_FRAGMENT_SHADER) + .linkProgram(); pi_texture_2D_shader_program = shaderProgram.programId(); } @@ -428,10 +434,13 @@ bool pi_loadShaders() { // Circle shader if (!pi_circle_filled_shader_program) { - auto shaderProgram = PI_GLShaderProgram::Builder() - .addShaderFromSource(circle_filled_vertex_shader_source, GL_VERTEX_SHADER) - .addShaderFromSource(circle_filled_fragment_shader_source, GL_FRAGMENT_SHADER) - .linkProgram(); + auto shaderProgram = + PI_GLShaderProgram::Builder() + .addShaderFromSource(circle_filled_vertex_shader_source, + GL_VERTEX_SHADER) + .addShaderFromSource(circle_filled_fragment_shader_source, + GL_FRAGMENT_SHADER) + .linkProgram(); pi_circle_filled_shader_program = shaderProgram.programId(); } @@ -551,7 +560,8 @@ void configureShaders(float width, float height) { mat4x4_identity(I); glUseProgram(GRIBpi_color_tri_shader_program); - GLint matloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, "MVMatrix"); + GLint matloc = + glGetUniformLocation(GRIBpi_color_tri_shader_program, "MVMatrix"); glUniformMatrix4fv(matloc, 1, GL_FALSE, (const GLfloat*)vp_transform); GLint transloc = glGetUniformLocation(GRIBpi_color_tri_shader_program, "TransformMatrix"); @@ -586,4 +596,3 @@ void configureShaders(float width, float height) { glUseProgram(0); } - diff --git a/plugins/grib_pi/src/pi_shaders.h b/plugins/grib_pi/src/pi_shaders.h index 81f214670a..32b3ff09b9 100644 --- a/plugins/grib_pi/src/pi_shaders.h +++ b/plugins/grib_pi/src/pi_shaders.h @@ -39,104 +39,102 @@ extern GLint pi_circle_filled_shader_program; bool pi_loadShaders(); void configureShaders(float width, float height); -extern const GLchar* PI_shader_preamble; +extern const GLchar *PI_shader_preamble; enum Consts { INFOLOG_LEN = 512 }; -class PI_GLShaderProgram -{ +class PI_GLShaderProgram { public: + class Builder { + public: + Builder() : linked_(false) { programId_ = glCreateProgram(); } + + Builder &addShaderFromSource(std::string const &shaderSource, + GLenum shaderType) { + char const *shaderCStr = shaderSource.c_str(); + GLuint shaderId = glCreateShader(shaderType); + + GLchar const *files[] = {PI_shader_preamble, shaderCStr}; + GLint lengths[] = {(GLint)strlen(PI_shader_preamble), + (GLint)strlen(shaderCStr)}; + + glShaderSource(shaderId, 2, files, lengths); + // glShaderSource(shaderId, 1, &shaderCStr, nullptr); + + glCompileShader(shaderId); + glGetShaderiv(shaderId, GL_COMPILE_STATUS, &success); + if (!success) { + glGetShaderInfoLog(shaderId, INFOLOG_LEN, NULL, infoLog); + printf("ERROR::SHADER::COMPILATION_FAILED\n%s\n", infoLog); + // ret_val = false; + } + + glAttachShader(programId_, shaderId); + return *this; + } + + // void addShaderFromFile(std::string const &shaderFile, GLenum + // shaderType) { + // std::ifstream fileName(shaderFile); + // std::istreambuf_iterator fileBegin(fileName), fileEnd; + // std::string fileContents(fileBegin, fileEnd); + // return addShaderFromSource(fileContents, shaderType); + // } + + PI_GLShaderProgram linkProgram() { + glLinkProgram(programId_); + glGetProgramiv(programId_, GL_LINK_STATUS, + &linkSuccess); // requesting the status + if (linkSuccess == GL_FALSE) { + glGetProgramInfoLog(programId_, INFOLOG_LEN, NULL, infoLog); + printf("ERROR::SHADER::LINK_FAILED\n%s\n", infoLog); + } + + PI_GLShaderProgram theProgram(programId_); + // deleteAttachedShaders(programId_); + linked_ = true; + return theProgram; + } - class Builder { - public: - Builder() : linked_(false) { - programId_ = glCreateProgram(); - } - - Builder & addShaderFromSource(std::string const &shaderSource, GLenum shaderType) { - char const *shaderCStr = shaderSource.c_str(); - GLuint shaderId = glCreateShader(shaderType); - - GLchar const* files[] = { PI_shader_preamble, shaderCStr }; - GLint lengths[] = { (GLint)strlen(PI_shader_preamble), (GLint)strlen(shaderCStr) }; - - glShaderSource(shaderId, 2, files, lengths); - //glShaderSource(shaderId, 1, &shaderCStr, nullptr); - - glCompileShader(shaderId); - glGetShaderiv(shaderId, GL_COMPILE_STATUS, &success); - if (!success) { - glGetShaderInfoLog(shaderId, INFOLOG_LEN, NULL, infoLog); - printf("ERROR::SHADER::COMPILATION_FAILED\n%s\n", infoLog); - //ret_val = false; - } - - glAttachShader(programId_, shaderId); - return *this; - } - -// void addShaderFromFile(std::string const &shaderFile, GLenum shaderType) { -// std::ifstream fileName(shaderFile); -// std::istreambuf_iterator fileBegin(fileName), fileEnd; -// std::string fileContents(fileBegin, fileEnd); -// return addShaderFromSource(fileContents, shaderType); -// } - - PI_GLShaderProgram linkProgram() { - glLinkProgram(programId_); - glGetProgramiv( programId_, GL_LINK_STATUS, &linkSuccess); //requesting the status - if (linkSuccess == GL_FALSE) { - glGetProgramInfoLog(programId_, INFOLOG_LEN, NULL, infoLog); - printf("ERROR::SHADER::LINK_FAILED\n%s\n", infoLog); - } - - PI_GLShaderProgram theProgram(programId_); - //deleteAttachedShaders(programId_); - linked_ = true; - return theProgram; - } - - ~Builder() { - if(!linked_) { - glDeleteProgram(programId_); - } - } - private: - GLuint programId_; - bool linked_; - GLint success; - GLint linkSuccess; - GLchar infoLog[INFOLOG_LEN]; - }; - - PI_GLShaderProgram() : programId_(0) { } - - PI_GLShaderProgram(PI_GLShaderProgram &&other) { - *this = std::move(other); + ~Builder() { + if (!linked_) { + glDeleteProgram(programId_); + } } - PI_GLShaderProgram &operator=(PI_GLShaderProgram &&other) - { - programId_ = other.programId_; - other.programId_ = 0; + private: + GLuint programId_; + bool linked_; + GLint success; + GLint linkSuccess; + GLchar infoLog[INFOLOG_LEN]; + }; + + PI_GLShaderProgram() : programId_(0) {} - if (other.programId_ != 0) { - glDeleteProgram(other.programId_); - } + PI_GLShaderProgram(PI_GLShaderProgram &&other) { *this = std::move(other); } - return *this; + PI_GLShaderProgram &operator=(PI_GLShaderProgram &&other) { + programId_ = other.programId_; + other.programId_ = 0; + + if (other.programId_ != 0) { + glDeleteProgram(other.programId_); } - ~PI_GLShaderProgram() { } + return *this; + } + + ~PI_GLShaderProgram() {} + + GLuint programId() const { return programId_; } - GLuint programId() const { return programId_; } + PI_GLShaderProgram(PI_GLShaderProgram const &other) = delete; + PI_GLShaderProgram &operator=(PI_GLShaderProgram const &other) = delete; - PI_GLShaderProgram(PI_GLShaderProgram const &other) = delete; - PI_GLShaderProgram &operator=(PI_GLShaderProgram const &other) = delete; private: - PI_GLShaderProgram(GLuint programId) : programId_(programId) { } - GLuint programId_; + PI_GLShaderProgram(GLuint programId) : programId_(programId) {} + GLuint programId_; }; - #endif diff --git a/plugins/grib_pi/src/smapi.cpp b/plugins/grib_pi/src/smapi.cpp index 676c126831..01af18d13e 100644 --- a/plugins/grib_pi/src/smapi.cpp +++ b/plugins/grib_pi/src/smapi.cpp @@ -186,8 +186,8 @@ bool wxMapiSession::Logon(const wxString& sProfileName, flags | MAPI_NEW_SESSION, 0, &m_data->m_hSession); if (nError != SUCCESS_SUCCESS && nError != MAPI_E_USER_ABORT) { // Failed to create a create mapi session, try to acquire a shared mapi - // session wxLogDebug(_T("Failed to logon to MAPI using a new session, trying - // to acquire a shared one\n")); + // session wxLogDebug(_T("Failed to logon to MAPI using a new session, + // trying to acquire a shared one\n")); nError = m_data->m_lpfnMAPILogon(nUIParam, NULL, NULL, 0, 0, &m_data->m_hSession); if (nError == SUCCESS_SUCCESS) { diff --git a/plugins/wmm_pi/po/de_DE.po b/plugins/wmm_pi/po/de_DE.po index 0e5b968a44..6b5a44a1a6 100644 --- a/plugins/wmm_pi/po/de_DE.po +++ b/plugins/wmm_pi/po/de_DE.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de_DE\n" diff --git a/plugins/wmm_pi/po/en_GB.po b/plugins/wmm_pi/po/en_GB.po index 2fbbb80d4f..5ac9d374b5 100644 --- a/plugins/wmm_pi/po/en_GB.po +++ b/plugins/wmm_pi/po/en_GB.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: English, United Kingdom\n" "Language: en_GB\n" diff --git a/plugins/wmm_pi/po/es_ES.po b/plugins/wmm_pi/po/es_ES.po index a8f0ea6bb4..f9a6cc7c34 100644 --- a/plugins/wmm_pi/po/es_ES.po +++ b/plugins/wmm_pi/po/es_ES.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/plugins/wmm_pi/po/fi_FI.po b/plugins/wmm_pi/po/fi_FI.po index 4252e88c65..34c069271c 100644 --- a/plugins/wmm_pi/po/fi_FI.po +++ b/plugins/wmm_pi/po/fi_FI.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Finnish\n" "Language: fi_FI\n" diff --git a/plugins/wmm_pi/po/fr_FR.po b/plugins/wmm_pi/po/fr_FR.po index db267c56dc..14a64d6fba 100644 --- a/plugins/wmm_pi/po/fr_FR.po +++ b/plugins/wmm_pi/po/fr_FR.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/plugins/wmm_pi/po/he_IL.po b/plugins/wmm_pi/po/he_IL.po index 476e71070a..97249d739f 100644 --- a/plugins/wmm_pi/po/he_IL.po +++ b/plugins/wmm_pi/po/he_IL.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-09 01:19\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hebrew\n" "Language: he_IL\n" diff --git a/plugins/wmm_pi/po/nb_NO.po b/plugins/wmm_pi/po/nb_NO.po index 4212455f72..e77ae207ca 100644 --- a/plugins/wmm_pi/po/nb_NO.po +++ b/plugins/wmm_pi/po/nb_NO.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-09 01:20\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" diff --git a/plugins/wmm_pi/po/pt_BR.po b/plugins/wmm_pi/po/pt_BR.po index b06a5dfa75..324a1071a0 100644 --- a/plugins/wmm_pi/po/pt_BR.po +++ b/plugins/wmm_pi/po/pt_BR.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/plugins/wmm_pi/po/ru_RU.po b/plugins/wmm_pi/po/ru_RU.po index 8688f5ec71..c5bb1456f3 100644 --- a/plugins/wmm_pi/po/ru_RU.po +++ b/plugins/wmm_pi/po/ru_RU.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 20:51\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/plugins/wmm_pi/po/sv_SE.po b/plugins/wmm_pi/po/sv_SE.po index 0ca6803730..aa55a452a8 100644 --- a/plugins/wmm_pi/po/sv_SE.po +++ b/plugins/wmm_pi/po/sv_SE.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-04 22:02-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv_SE\n" diff --git a/po/opencpn.pot b/po/opencpn.pot index 1b8a68875e..2e61b6da0c 100644 --- a/po/opencpn.pot +++ b/po/opencpn.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: opencpn 5.9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,8 +17,8 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "" @@ -416,7 +416,7 @@ msgstr "" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "" @@ -478,7 +478,7 @@ msgstr "" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "" @@ -511,11 +511,11 @@ msgstr "" msgid "Left" msgstr "" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "" @@ -568,7 +568,7 @@ msgid "Altitude" msgstr "" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -711,7 +711,7 @@ msgid "Aid to Navigation" msgstr "" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "" @@ -2265,21 +2265,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "" @@ -2451,8 +2451,8 @@ msgid "" msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "" @@ -2498,9 +2498,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "" @@ -2542,7 +2542,7 @@ msgstr "" msgid "Track properties" msgstr "" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2555,12 +2555,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2658,23 +2658,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3076,7 +3076,7 @@ msgstr "" msgid "Undefined (default)" msgstr "" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "" @@ -3089,7 +3089,7 @@ msgid "" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "" @@ -3105,7 +3105,7 @@ msgstr "" msgid "&Jump To" msgstr "" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "" @@ -3217,39 +3217,39 @@ msgstr "" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "" "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN " "session?" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "" @@ -3303,7 +3303,7 @@ msgstr "" msgid "Navigate To Here" msgstr "" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "" @@ -3312,8 +3312,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "" @@ -3322,7 +3322,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3347,7 +3347,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3465,7 +3465,7 @@ msgstr "" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "" @@ -3619,18 +3619,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "" @@ -3638,32 +3638,32 @@ msgstr "" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "" @@ -3683,7 +3683,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "" @@ -3699,8 +3699,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "" @@ -3708,8 +3708,8 @@ msgstr "" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "" @@ -3725,18 +3725,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "" @@ -3781,7 +3781,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3836,8 +3836,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4177,28 +4177,28 @@ msgstr "" msgid "Merge waypoints?" msgstr "" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "" @@ -4206,7 +4206,7 @@ msgstr "" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4222,7 +4222,7 @@ msgstr "" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4270,9 +4270,9 @@ msgstr "" msgid "User Y Offset" msgstr "" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "" @@ -4283,11 +4283,13 @@ msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4323,12 +4325,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4357,7 +4359,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4648,12 +4650,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "" @@ -4662,17 +4664,17 @@ msgstr "" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "" @@ -4704,59 +4706,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4814,7 +4816,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4822,7 +4824,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4852,7 +4854,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4860,6 +4862,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4872,7 +4889,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -5009,7 +5026,7 @@ msgstr "" msgid "Icon" msgstr "" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -5019,7 +5036,7 @@ msgid "Links" msgstr "" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5060,22 +5077,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "" @@ -5165,16 +5182,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "" @@ -5206,35 +5223,35 @@ msgstr "" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5292,8 +5309,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5301,277 +5318,277 @@ msgstr "" msgid "Anchorage created " msgstr "" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "" "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr "" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "" "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any " @@ -5579,105 +5596,105 @@ msgid "" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "" "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "" -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5691,7 +5708,7 @@ msgid "" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "" "\n" "The device selected is not accessible; opencpn will likely not be able\n" @@ -5706,1180 +5723,1175 @@ msgid "" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "" "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid "" " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "" "\n" " - your ship's length must be > 0" msgstr "" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "" "\n" " - your ship's beam must be > 0" msgstr "" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "" "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "" "\n" " - your GPS offset from bow must be within your ship's length" msgstr "" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "" "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "" "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of " @@ -6889,15 +6901,15 @@ msgid "" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "" "compressed %ld charts\n" @@ -6905,71 +6917,71 @@ msgid "" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "" @@ -7052,130 +7064,130 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "" "These settings might destabilize OpenCPN and are by default disabled. To " "despite the dangers enable them manually add a CatalogExpert=1 line in the " "[PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7220,10 +7232,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7341,12 +7349,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7550,15 +7552,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7864,7 +7866,7 @@ msgid "" "in safe mode without plugins and other possibly problematic\n" "features?\n" "



You may consider visiting the list of known issues.

" +"OpenCPN/OpenCPN/wiki/OpenCPN-5.10-known-issues\">list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7981,7 +7983,7 @@ msgstr "" msgid "Tomorrow" msgstr "" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "" @@ -8274,167 +8276,171 @@ msgstr "" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "" "All the settings can be changed at any time in the configuration Toolbox " "accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "" "Additional charts can be obtained using the Chart Downloader integrated in " "the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid "" " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "" "

Welcome to OpenCPN!

You have successfully completed " "the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "" "The connections to the discovered sources of data will be configured " "automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "" "You may now connect additional USB devices or connect to a different network " "and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "" "The connection settings can be changed at any time in the configuration " "Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid "" " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" diff --git a/po/opencpn_ar_SA.po b/po/opencpn_ar_SA.po index 2674a7ab63..a2daa7c063 100644 --- a/po/opencpn_ar_SA.po +++ b/po/opencpn_ar_SA.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Arabic\n" "Language: ar_SA\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "" @@ -414,7 +414,7 @@ msgstr "" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "" @@ -476,7 +476,7 @@ msgstr "" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "" @@ -509,11 +509,11 @@ msgstr "" msgid "Left" msgstr "" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "حول أوبن سى بى ان" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "الخيارات" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "خصائص المسار" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "إلغاء - إلغاء المنطقة كما التي حددتها رس msgid "Undefined (default)" msgstr "غير معروف (الافتراضي)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS الهدف اسم" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "" @@ -3085,7 +3085,7 @@ msgstr "" msgid "&Jump To" msgstr "" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "" @@ -3197,37 +3197,37 @@ msgstr "" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "" @@ -3281,7 +3281,7 @@ msgstr "" msgid "Navigate To Here" msgstr "" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "" @@ -3290,8 +3290,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "" @@ -3300,7 +3300,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3325,7 +3325,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3443,7 +3443,7 @@ msgstr "" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "" @@ -3597,18 +3597,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "" @@ -3616,32 +3616,32 @@ msgstr "" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "" @@ -3661,7 +3661,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "" @@ -3677,8 +3677,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "" @@ -3686,8 +3686,8 @@ msgstr "" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "" @@ -3703,18 +3703,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "" @@ -3759,7 +3759,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3814,8 +3814,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4147,28 +4147,28 @@ msgstr "" msgid "Merge waypoints?" msgstr "دمج نقاط الطريق؟" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "" @@ -4176,7 +4176,7 @@ msgstr "" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4192,7 +4192,7 @@ msgstr "" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4240,9 +4240,9 @@ msgstr "" msgid "User Y Offset" msgstr "" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "" @@ -4253,11 +4253,13 @@ msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4293,12 +4295,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4327,7 +4329,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4616,12 +4618,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "" @@ -4630,17 +4632,17 @@ msgstr "" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "" @@ -4666,59 +4668,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4776,7 +4778,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4784,7 +4786,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4814,7 +4816,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4822,6 +4824,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4834,7 +4851,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -4955,7 +4972,7 @@ msgstr "" msgid "Icon" msgstr "" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4965,7 +4982,7 @@ msgid "Links" msgstr "" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5006,22 +5023,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "" @@ -5110,16 +5127,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "" @@ -5151,35 +5168,35 @@ msgstr "" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5227,8 +5244,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5236,379 +5253,379 @@ msgstr "" msgid "Anchorage created " msgstr "" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr "" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "" -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5619,7 +5636,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5631,1259 +5648,1254 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "المسارات اليومية التلقائية في منتصف الليل" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "حساب سوغ و كوغ من التغييرات الموقف" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "أكد حذف المسارات والمسارات" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "قمع المخططات ناقلات تحجيم على زيادة" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "الحفاظ على نطاق عند تبديل الرسوم البيانية" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "درجات، دقائق، ثانية" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "رمان" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "إظهار صحيح" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "يفترض الاختلاف المغناطيسي" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "أنت (-W، + E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "إظهار المحامل الحقيقية والعناوين" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "إظهار المحامل المغناطيسية والعناوين." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "وم المساعد حساب الاختلاف المغناطيسي" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "أهداف إيس" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "حساب كبا" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "لا (T) كبا تنبيهات إذا كان النطاق المستهدف أكبر من (نمي)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "وضع علامة على الأهداف المفقودة بعد (دقيقة)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "إزالة الأهداف المفقودة بعد (دقيقة)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "إظهار الهدف سهم التنبؤ كوغ، طول (دقيقة)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "عرض المسارات المستهدفة ، والطول (بالدقيقة)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "قمع الأهداف الراسية / الراسية، والسرعة القصوى (كن)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "السماح بتوهين الأهداف الأقل أهمية إذا كان أكثر من ... أهداف" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "إظهار إشعارات المنطقة (من رسائل إيس الثنائية)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "عرض إيس يستهدف الحجم الحقيقي" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "عرض أسماء مع أهداف إيس على نطاق أكبر من 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "يتدحرج" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "تشغيل الصوت على كبا / تكبا تنبيهات وحالات الطوارئ دسك / سارت." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "تمكين تنبيه الهدف إقرار مهلة (دقيقة)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "عرض البوصلة / حالة غس النافذة" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "تمكين إخفاء شريط الأدوات تلقائيا" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "لعب السفن أجراس" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "" @@ -6960,127 +6972,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7125,10 +7137,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7246,12 +7254,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7455,15 +7457,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7766,7 +7768,7 @@ msgstr "" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7882,7 +7884,7 @@ msgstr "" msgid "Tomorrow" msgstr "" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "" @@ -8163,153 +8165,156 @@ msgstr "" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_bg_BG.po b/po/opencpn_bg_BG.po index fb0b1a9f30..3a6ce16de4 100644 --- a/po/opencpn_bg_BG.po +++ b/po/opencpn_bg_BG.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "" @@ -414,7 +414,7 @@ msgstr "Самолет за търсене и спасяване" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "Идентификационен код на морската мобилна комуникационна услуга" @@ -476,7 +476,7 @@ msgstr " (последно известно)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Позиция" @@ -509,11 +509,11 @@ msgstr "Вдясно" msgid "Left" msgstr "Вляво" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Скорост" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Надморска височина" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Помощ за навигиране" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "База" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "км/ч" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "м/с" @@ -2435,8 +2435,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "За програмата OpenCPN" @@ -2482,9 +2482,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Настройки" @@ -2526,7 +2526,7 @@ msgstr "" msgid "Track properties" msgstr "Параметри на маршрута" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2539,12 +2539,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "OpenCPN уебсайт" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN помощната документация не е достъпна локално." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Искате ли да посетите сайта на opencpn.org за повече информация?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "" msgid "Undefined (default)" msgstr "" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS предупреждение" @@ -3085,7 +3085,7 @@ msgstr "" msgid "&Jump To" msgstr "" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS списък на целите" @@ -3197,37 +3197,37 @@ msgstr "" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Запазване на трасето" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Добре" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Спиране на проследяването" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Меню" @@ -3281,7 +3281,7 @@ msgstr "" msgid "Navigate To Here" msgstr "" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "" @@ -3290,8 +3290,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "" @@ -3300,7 +3300,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3325,7 +3325,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3443,7 +3443,7 @@ msgstr "" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Изтриване" @@ -3597,18 +3597,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Режим „Навигация“" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "" @@ -3616,32 +3616,32 @@ msgstr "" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Показване на омрежване" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "" @@ -3661,7 +3661,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Течения" @@ -3677,8 +3677,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "" @@ -3686,8 +3686,8 @@ msgstr "" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "" @@ -3703,18 +3703,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Категория на показ" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Стандарт" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Всичко" @@ -3759,7 +3759,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3814,8 +3814,8 @@ msgstr "Грешка: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4147,28 +4147,28 @@ msgstr "Ако отговорите с \"Не\" ще създадете нови msgid "Merge waypoints?" msgstr "Обединяване на точките?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Фута" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Метри" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Сажени" @@ -4176,7 +4176,7 @@ msgstr "Сажени" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4192,7 +4192,7 @@ msgstr "" msgid "Show all AIS Targets" msgstr "Покажи всички AIS цели" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4240,9 +4240,9 @@ msgstr "Отместване по Х" msgid "User Y Offset" msgstr "Отместване по Y" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "метри" @@ -4253,11 +4253,13 @@ msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4293,12 +4295,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Заглавие" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4327,7 +4329,7 @@ msgid "Less" msgstr "По-малко" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4616,12 +4618,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN — Предупреждение" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "" @@ -4630,17 +4632,17 @@ msgstr "" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Избор на всичко" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Изчистване на всичко" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Добави" @@ -4666,59 +4668,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Общи" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Настройване на комуникационните приоритети..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Конфигуриране на ново свързване" @@ -4776,7 +4778,7 @@ msgid "Install" msgstr "Инсталиране" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Преинсталиране" @@ -4784,7 +4786,7 @@ msgstr "Преинсталиране" msgid "Update" msgstr "Обновяване" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Понижаване на версията" @@ -4814,7 +4816,7 @@ msgid " successfully installed" msgstr " успешно инсталирано" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Инсталирането завърши" @@ -4822,6 +4824,21 @@ msgstr "Инсталирането завърши" msgid "Installation error" msgstr "Грешка при инсталиране" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4834,7 +4851,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -4955,7 +4972,7 @@ msgstr "" msgid "Icon" msgstr "Икона" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4965,7 +4982,7 @@ msgid "Links" msgstr "Връзки" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5006,22 +5023,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Разстояние" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Цвят" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Нищо" @@ -5110,16 +5127,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Постоянно" @@ -5151,35 +5168,35 @@ msgstr "NMEA прозорец" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5227,8 +5244,8 @@ msgstr "Приблизително време: " msgid "Remaining time : " msgstr "Оставащо време: " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5236,380 +5253,380 @@ msgstr "" msgid "Anchorage created " msgstr "" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Време: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Положение: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Изключване на проследяването" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Включване на проследяването" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Увеличаване" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Отдалечаване" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Приливи и отливи" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Смяна на цветовата схема" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "AIS-цели" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Измерване на разстоянието" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Създаване на маршрут" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Предпочитания" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Инструменти" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Прозорец" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Помощ за OpenCPN" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Помощ" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Кораб " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Грешка при печат.\n" "Възможно е принтерът да не е конфигуриран." -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Неназован маршрут)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Проследяване" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "По подразбиране" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Винаги" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Никога" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Игнориране" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Име на кораба" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Последовател" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Нови..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5620,7 +5637,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5632,1259 +5649,1254 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Морски мили" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Километри" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Стил" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Черно" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Тъмночервено" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Тъмнозелено" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Тъмножълто" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Тъмносиньо" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Тъмнолилаво" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Тъмносиньо-зелено" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Светлосиво" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Тъмносиво" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Червено" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Зелено" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Жълто" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Синьо" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Лилаво" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Синьо-зелено" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Бяло" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Писти" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Компютър" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Изчисляване на стойностите" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Минимум секунди между обновяванията" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Маршрути/точки" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Нови маршрути" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Премахване на избраното" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Добавяне..." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Премахване" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Шаблони" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Състояние на шаблона" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Запазени шаблони" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Създаване на конфигуриране..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Изтриване на избраното конфигуриране..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Прилагане на избраното конфигуриране" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Създаване на конфигуриране" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Проблем, прилагайки избраната конфигурация." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Усъвършенстване" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Употреба на видеоускорението за OpenGL" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Настройки на OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "секунди" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Растер" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Вектор" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Физична ширина на екрана" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Автоматично" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Ръчно:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "мм" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Графика" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Опростено" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Граници" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Символно" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Цветове" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 цвята" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 цвята" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Потребителски стандартни предмети" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Нова група…" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Изтриване на група" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Управления" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Плавно панорамиране / мащабиране" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Мащабиране до показалеца" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Дълбочина" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Температура" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Целзий" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Фаренхайт" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Келвин" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Показване на магнетизма" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Тестване" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Име на звуковия файл:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Изберете звуков файл" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Звуци" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Неизвестно устройство :" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Звуково устройство" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Команда за звуковъзпроизвеждане:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Изгубени цели" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Основни настройки" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Език" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Шрифтове" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Избор на шрифт..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Избор на цвят на шрифта..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Възможности на интерфейса" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Включване на интерфейс за сензорни екрани" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Показване на копчета за мащабиране" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Чувстит. мащаб. на колелцето на мишката" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Прилагане" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Свързвания" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Свързване" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Кораби" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Потребителски интерфейс" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Потребител" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Приставки" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "фута" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Въведете име на групата" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Избор на данни за приливи/течения" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Компресия на текстурата" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Компресия на текстурата с кеширане" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Кеширане на компресията на текстурата" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Размер на паметта на текстурата (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Размер: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Изграждане пак на кеша на текстурата" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Изчистване на кеша на текстурата" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Изглаждане на многоъгълника" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Изглаждане на линията" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Софтуер OpenGL (рестарт на OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Настройки на текстурата" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Кеш на текстурата" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Разни" @@ -6961,127 +6973,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Каталог приставки" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Внасяне на приставка..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Настройки..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Изключено" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Успешно обновен каталог" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Засечено несъвместимо внасяне на приставка." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Деен каталог" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Последен каталог" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Последна промяна: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Обновете каталога на приставката." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Деинсталиране" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Включено" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Надграждане до версия " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Инсталиране..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Надграждане до " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Уебсайт" @@ -7126,10 +7138,6 @@ msgstr "Спътници" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7247,12 +7255,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7450,15 +7452,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7761,7 +7763,7 @@ msgstr "" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7877,7 +7879,7 @@ msgstr "днес" msgid "Tomorrow" msgstr "утре" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Подсказки" @@ -8158,153 +8160,156 @@ msgstr "" msgid "Dismiss" msgstr "Отхвърляне" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_ca_ES.po b/po/opencpn_ca_ES.po index 9d861c97ff..a76b77ccaf 100644 --- a/po/opencpn_ca_ES.po +++ b/po/opencpn_ca_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Catalan\n" "Language: ca_ES\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Derrota Sense Nom)" @@ -414,7 +414,7 @@ msgstr "Aeronau SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Últim conegut)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posició" @@ -509,11 +509,11 @@ msgstr "Far" msgid "Left" msgstr "Esquerra" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Velocitat de la Ruta" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitud" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Ajut a la Navegació" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "E.Base" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Quant a l'OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opcions" @@ -2527,7 +2527,7 @@ msgstr "Imprimir la pista seleccionada" msgid "Track properties" msgstr "" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr " Sitio web de OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "Anul·lació - àrea cancelada tal i com diu l'identificador del missatg msgid "Undefined (default)" msgstr "Indefinit" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Alerta AIS" @@ -3085,7 +3085,7 @@ msgstr "&Silenciar Alerta" msgid "&Jump To" msgstr "&Anar a" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Esborrar el Waypoint" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Llista d'Objectes AIS" @@ -3197,38 +3197,38 @@ msgstr "Info d'Objecte" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Enregistrar Ruta" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "La derrota d'aquest objecte ha estat enregistrada.\n" "Vols continuar enregistrant fins a acabar aquesta sessió d'OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Consulta d'Objecte AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "d'Acord" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Atura el seguiment" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3282,7 +3282,7 @@ msgstr "Moure el Vaixell Ací" msgid "Navigate To Here" msgstr "Navegui a aquí" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Mode Rumb Amunt" @@ -3291,8 +3291,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Actualització de Cartes d'OpenCPN" @@ -3301,7 +3301,7 @@ msgid "Chart Up Mode" msgstr "Mode carta amunt" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Canviar a Pantalla Completa" @@ -3326,7 +3326,7 @@ msgstr "Enganxar Track" msgid "CM93 Offset Dialog..." msgstr "Diàleg per la Correcció CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Cartes" @@ -3444,7 +3444,7 @@ msgstr "Copiar com a KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr " [&D] Esborrar" @@ -3598,18 +3598,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Mode de Navegació" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Nord a Dalt" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Rumb Amunt" @@ -3617,32 +3617,32 @@ msgstr "Rumb Amunt" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Mode Proa Amunt" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Opcions en la Presentació de la Carta" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Permetre la superposició Cartografia" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Mostar la Graella" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Mostar-hi els Contorns" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Mostrar les Unitats de Fondària" @@ -3662,7 +3662,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Mostrar-hi els Corrents" @@ -3678,8 +3678,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Etiquetes Boies/Llums" @@ -3687,8 +3687,8 @@ msgstr "Etiquetes Boies/Llums" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Mostra la Descripció dels Fars" @@ -3704,18 +3704,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Nivell de Presentació" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Estàndard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Tots" @@ -3760,7 +3760,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3815,8 +3815,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4148,28 +4148,28 @@ msgstr "Si contestes \"No\", es crearan nous waypoints per aquesta ruta." msgid "Merge waypoints?" msgstr "Reanomenar Waypoints?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Avenç Info, Trajecte/Ruta " -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Peus" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metres" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Braces" @@ -4177,7 +4177,7 @@ msgstr "Braces" msgid "OverZoom" msgstr "SobreAmpliat" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Icona de Marea Estesa" @@ -4193,7 +4193,7 @@ msgstr "Consulta d'objecte AIS" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4241,9 +4241,9 @@ msgstr "Centrat X d'usuari" msgid "User Y Offset" msgstr "Centrat Y d'Usuari" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metres" @@ -4254,11 +4254,13 @@ msgstr "Trajecte Viu" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Lectures a Consola" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Valors a Consola" @@ -4294,12 +4296,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4328,7 +4330,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4617,12 +4619,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Alerta d'OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Info de l'OpenCPN" @@ -4631,17 +4633,17 @@ msgstr "Info de l'OpenCPN" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Selecciona-ho tot" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Desmarca-ho tot" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Afegir" @@ -4667,59 +4669,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "General d'AIS" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4777,7 +4779,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4785,7 +4787,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4815,7 +4817,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4823,6 +4825,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Info Extra d'AIS" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4835,7 +4852,7 @@ msgstr "Esperanto la resolució de la compressió de la carta raster." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distància fins el propi vaixell: %4.0f NMi" @@ -4956,7 +4973,7 @@ msgstr "" msgid "Icon" msgstr "Icona" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -4966,7 +4983,7 @@ msgid "Links" msgstr "Enllaços" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5007,22 +5024,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distància" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "C&olor:" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Cap" @@ -5111,16 +5128,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Persistent" @@ -5152,35 +5169,35 @@ msgstr "Finestra de depuració NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5228,8 +5245,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5237,381 +5254,381 @@ msgstr "" msgid "Anchorage created " msgstr "Àncora creada " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Activar el Seguiment" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Seguiment de la Navegació" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Apropa" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Allunya" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Mostrar la Barra de Cartes" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Mostrar-hi les Marees" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Ajust de la Lluminositat / joc de colors" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Mostrar-hi els Objectes AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Disseny de Rutes" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Deixa un Marcador d'Home a l'Aigua, MOB" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preferències" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Ha hagut un problema d'impressió.\n" "Potser que la seva actual impressora no estigui ben configurada?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Ruta Sense Nom)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Gestor de Rutes i Marques" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Imprimir la Carta" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Espai)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Propietats Esteses de l'MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Seguiment" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Seguiment per defecte" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Sempre seguiment" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Mai track" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorar aquest MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Gestionar aquest MMSI com a balisa SART/PLB(AIS)." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Convertir AIVDM a AIVDO per aquest MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Aquest MMSI és seguidor meu - No fer avís de CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Un Id MMSI generalment és un número de nou dígits. \n" "Si us plau comproveu les entrades i cancel·lar si cal." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "El color de la lletra" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Sempre" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Mai" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Editar les propietats MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Propietats MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Mode de Pista" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorar" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB (Home a l'aigua)" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM-> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Seguidor" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Nou..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Afegir Propietats MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5622,7 +5639,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5634,1264 +5651,1259 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Llargària de la fletxa admonitora COG del vaixell propi (Minuts):" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Estimació de la Longitud del Rumb (NMi.-Milles Nàutiques)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Tipus d'icona de vaixell" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Bitmap a Escala real" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Vector a Escala real" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Eslora total (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Mànega total (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Ajust GPS des de Proa (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Ajust GPS des del centre (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Tamany mínim de pantalla (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Mostrar nombre de cercles" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Distància" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Milles &Nàutiques" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "&Kilómetres" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "E&stil" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Amb símbols" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Punt" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Guió llarg" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Mostrar-hi les Marees" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Guió puntejat" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "El color de la lletra" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Negre" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Vermell fosc" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Verd fosc" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Groc fosc" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Blau fosc" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta fosc" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Cian fosc" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Far" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Gris fosc" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Vermell" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Verd" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Groc" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blau" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cancel·lar" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Blanc" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Derrotes" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Ressaltar Derrotes" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Característiques de la Derrota" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Remolcador" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Mitjà" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Alt" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Radi del cercle d'arribada al Waypoint (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Avançar al següent waypoint de ruta només arribar" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Color dels anells waypoint" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Confirmar l'eliminació de derrotes i rutes" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Fitxers de Cartes" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Directoris Actius de Cartes" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Directori d'Escannejats OpenCPN..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Esborrar la Derrota" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Eliminar" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Actualitzar el Control" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Explorar cartes i actualitzar base de dades" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Forçar la Reconstrucció de la Base de Dades Complerta" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avançat" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Realinear les cartes raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Utilitzar accel·leració gràfica (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "Segons" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Ponderació de l'Escala/Zoom de la Carta" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Amplada de Pantalla Física" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Automàtic" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manual:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Visualització de Cartes" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Mostrar les cartes escanejades desviades amb Nord amunt" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Gràfics" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Visualització Cartes Vectorials" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Estàndards de Marina" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Mostra les Batimetries" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Informació de la Marca" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Boies/llums" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Far amb Sectors" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Textos de Carta" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Incloure missatges en idioma nacional" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Mostra només el Text Important" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Destriar Text (exp.)" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Detalls de Carta" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Reduïr detall a baixa escala" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Estil de Gràfics" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Carta de Paper" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplificat" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Fronteres" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Simples" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Amb símbols" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Colors" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Colors" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Colors" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Aigües Somes" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Fons de Seguretat" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Aigües Profundes" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Mostrar-hi els Corrents" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Directoris Actius de Cartes" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Afegir dades..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Directoris Actius de Cartes" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Directoris Actius de Cartes" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Cartes" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nou Grup..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Esborrar la Ruta" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Controls" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Desplaçament i Zoom Suau" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Centrar-s'hi [&Z]" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Opcions de visualització" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unitats" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Milles terrestres" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Nusos" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Profunditat" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Graus, Minuts decimals" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Graus Decimals" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Graus, Minuts, Segons" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Rumbs" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Declinació magnètica suposada" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Selecció del fitxer de So" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Mostrar-hi els Objectes AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Càlcul de la CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Avisa si la CPA és menor que (MNi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr " ..i si el TCPA és menor que (Minuts):" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Objectes perduts" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Marcar els objectes com a perduts després de (Minuts):" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Treure els objectes perduts després de (Minuts): " -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Pantalla" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Mostrar fletxes COG de l'objecte (Rumb)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Mostrar esteles dels objectes" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Mostrar àrees de missatges (AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Mostrar-hi els Objectes AIS" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Mostrar noms d'objectius AIS amb escala major que 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Aportació d'Informació" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr " \"Nom del Vaixell\" MMSI (ID Trucada/Call Sign)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Classe] Tipus (Estatus)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Alertes de CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Obre Diàleg d'Alerta de CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Fes Sonar les Alertes de CPA/TCPA" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Retardar l'Alerta d'Objecte en Reconeixer-la (minuts) " -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Funcionalitats d'Interfícies Opcionals" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Idioma" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Fonts" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Tria del tipus de lletra..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Tria del tipus de lletra..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Estil de la Barra d'icones i Finestra" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Opcions d'Interfície" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Mostra la Barra d'Estat" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Mostra la Barra de Menús" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Mostrar finestra Estat GPS/Compàs" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Auto ocultar Barra d'eines" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Fer sonar la campana d'a bord" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Permetre Interfície de Pantalla Tàctil" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Factor d'escala de la interfície" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Factor d'escala dels objectes de la carta" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Aplicar" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Cartes" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Opcions en vers les Fonts de Lletra" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Vaixell:" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Interfaç d'usuari" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Connectors" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "peus" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "braces" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Afegir carpeta amb fitxers de cartes" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - la teva eslora ha de ser major que 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - la teva manga ha de ser major que 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - l'ajust del GPS des del mig del vaixell ha d'estar dins de la manga del vaixell" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - l'ajust del GPS des de la proa ha d'estar dins de la eslora del vaixell" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - el tamany mínim de l'icona del vaixell ha de ser entre 1 i 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "La configuració del tamany real del vaixell no és correcta:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Escriure Nom del Grup" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Cartes" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Seleccionar dades de Marea/Corrent" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Compressió de textura" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Compressió de Textures en memòria cau" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Cau compressió de textura" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tamany de memòria de textura (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Mida: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Reconstruir cau de textures" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Netejar cau de textures" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Programari OpenGL (reiniciar OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Utilitzar escombrat accel·lerat (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Configuració de textura" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Memòria cau de textura" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Miscel·lani" @@ -6968,127 +6980,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7133,10 +7145,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Info Extra d'AIS" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Avenç Gràfic, Marees/Corrents" @@ -7254,12 +7262,6 @@ msgstr "De Derrota a Ruta" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7463,15 +7465,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7776,7 +7778,7 @@ msgstr "(Angles de sector són Demores Vertaderes des de la Mar)The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7892,7 +7894,7 @@ msgstr "Avui" msgid "Tomorrow" msgstr "Demà" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Aclaracions" @@ -8174,153 +8176,156 @@ msgstr "Al Waypoint" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_cs_CZ.po b/po/opencpn_cs_CZ.po index f3be03ceb4..ed2f7df1d1 100644 --- a/po/opencpn_cs_CZ.po +++ b/po/opencpn_cs_CZ.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Czech\n" "Language: cs_CZ\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Nepojmenovaná stopa)" @@ -414,7 +414,7 @@ msgstr "SAR letadlo" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Poslední známý)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Pozice" @@ -509,11 +509,11 @@ msgstr "Vpravo" msgid "Left" msgstr "Vlevo" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Rychlost" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Zem. šířka" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Pomůcka pro navigaci" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Základní" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "O OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Nastavení" @@ -2527,7 +2527,7 @@ msgstr "Výběr tisku trasy" msgid "Track properties" msgstr "Vlastnosti trasy" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2643,23 +2643,23 @@ msgstr "Plugin API: " msgid "OpenCPN Website" msgstr "Webová stránka OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN Nápověda není k dispozici lokálně." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Chcete navštívit stránky opencpn.org pro více informací?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3059,7 +3059,7 @@ msgstr "Zrušení - oblast zrušení je identifikována podle Message Linkage ID msgid "Undefined (default)" msgstr "Nedefinovaný (výchozí)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Název AIS cíle" @@ -3070,7 +3070,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS výstraha" @@ -3086,7 +3086,7 @@ msgstr "&Umlčet" msgid "&Jump To" msgstr "&Skok na" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Vytvořit trasový bod" @@ -3109,7 +3109,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Seznam cílů AIS" @@ -3198,38 +3198,38 @@ msgstr "Počet cílů" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Uložit trasu" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Nedávno zaznamenaná stopa tohoto cíle byla uložena.\n" "Chceš pokračovat v ukládání do ukončení OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Detail AIS cíle" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Zastavit záznam" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Nabídka" @@ -3283,7 +3283,7 @@ msgstr "Posunout sem loď" msgid "Navigate To Here" msgstr "Navigovat sem" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Mód kurs nahoru" @@ -3292,8 +3292,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Mód sever nahoru" @@ -3302,7 +3302,7 @@ msgid "Chart Up Mode" msgstr "Mód mapa nahoru" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Přepnout na celou obrazovku" @@ -3327,7 +3327,7 @@ msgstr "Vložit stopu" msgid "CM93 Offset Dialog..." msgstr "Dialog posunu CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Skupiny map" @@ -3445,7 +3445,7 @@ msgstr "Kopírovat jako KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Smazat" @@ -3599,18 +3599,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigační režim" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Sever nahoře" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Kurs nahoru" @@ -3618,32 +3618,32 @@ msgstr "Kurs nahoru" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Mód Pohled dopředu" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Volby zobrazení" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Povolit skládání map" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Zobrazit mřížku" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Zobrazit obrysy mapy" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Zobrazit jednotky hloubky" @@ -3663,7 +3663,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Ukaž proudy" @@ -3679,8 +3679,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Popisky bojí/světel" @@ -3688,8 +3688,8 @@ msgstr "Popisky bojí/světel" msgid "Lights" msgstr "Světla" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Popisy světel" @@ -3705,18 +3705,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Kategorie zobrazení" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standardní" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Vše" @@ -3761,7 +3761,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3816,8 +3816,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4149,28 +4149,28 @@ msgstr "Odpověď 'Ne' vytvoří pro tuto trasu všechny trasové body nově." msgid "Merge waypoints?" msgstr "Sloučit trasové body?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Info o části trasy" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Stopy" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metry" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Fathomy (Sáhy)" @@ -4178,7 +4178,7 @@ msgstr "Fathomy (Sáhy)" msgid "OverZoom" msgstr "Nadměrné přiblížení" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Detailní ikona přílivu" @@ -4194,7 +4194,7 @@ msgstr "Dotaz na cíl AIS" msgid "Show all AIS Targets" msgstr "Zobrazit všechny cíle AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Zeslabit méně důležité cíle AIS" @@ -4242,9 +4242,9 @@ msgstr "Uživatelský posu X" msgid "User Y Offset" msgstr "Uživatelský posu Y" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metry" @@ -4255,11 +4255,13 @@ msgstr "Tento úsek" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Legenda konzole" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Hodnota konzole" @@ -4295,12 +4297,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4329,7 +4331,7 @@ msgid "Less" msgstr "Méně" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4618,12 +4620,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN varování" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN Informace" @@ -4632,17 +4634,17 @@ msgstr "OpenCPN Informace" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Vybrat vše" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Vyčistit vše" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Přidat" @@ -4668,59 +4670,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Obecné" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4778,7 +4780,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4786,7 +4788,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4816,7 +4818,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4824,6 +4826,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS visačka" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4836,7 +4853,7 @@ msgstr "Čekání na ukončení podprocesu komprese rastrových map." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Vzdálenost od lodi: %4.0f NMi" @@ -4957,7 +4974,7 @@ msgstr "" msgid "Icon" msgstr "Ikona" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4967,7 +4984,7 @@ msgid "Links" msgstr "Odkazy" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5008,22 +5025,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Vzdálenost" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Barva:" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Žádný" @@ -5112,16 +5129,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Ukládat trvale" @@ -5153,35 +5170,35 @@ msgstr "NMEA okno ladění" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5229,8 +5246,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5238,381 +5255,381 @@ msgstr "" msgid "Anchorage created " msgstr "Kotviště vytvořeno" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Povolit sledování" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Automaticky následovat" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Zvětšit" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Zmenšit" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Zobrazit pruh map" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Ukaž ENC text" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Ukaž přílivy" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Změň barevné schéma" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Zobrazit AIS cíle" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Vytvořit trasu" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Umístit zde značku MOB" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preference" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Problém s tiskem.\n" "Možná není tvá tiskárna správně nastavena?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Nepojmenovaná trasa)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Vlastní loď" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Správce tras a bodů" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Vytiskni mapu" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Mezerník)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Rozšířené vlastnosti MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Sledování" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Výchozí nastavení" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Vždy sledovat" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Nesledovat nikdy" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignoruj toto MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Zpracuj toto MMSI jako SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Převod AIVDM na AIVDO pro toto MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Toto MMSI mě následujeje - vypnout CPA výstrahy" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "MMSI Id je obvykle devět číslic. \n" "Zkontroluj ho a případně zruš." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Výchozí" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Vždy" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Nikdy" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Upravit vlastnosti MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Vlastnosti MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Režim stop" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorovat" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Jméno lodi" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Sledující" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Nové..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Přidat vlastnosti MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5623,7 +5640,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5635,1180 +5652,1175 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Délka předpovědi COG (min):" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Délka prediktoru směru (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Typ ikony lodě" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Bitová mapa ve skutečném měřítku" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Vektor ve skutečném měřítku" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Celková délka (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Celková šířka (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Offset GPS od přídě (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS offset od středu lodě (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Nejmenší velikost obrazovky (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Zobrazit kruhy vzdálenosti" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Vzdálenost mezi kruhy" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Jednotka vzdálenosti" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Námořní míle" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometry" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Barva kružnic vzdálenosti" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Styl:" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Plný" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Tečkovaná" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Dlouhé šrafy" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Krátké šrafy" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Čerchovaná" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Standardní barva" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Černá" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Tmavě červená" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Tmavě zelená" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Tmavě žlutá" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Tmavě modrá" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Tmavě fialová" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Tmavě azurová" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Světle šedá" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Tmavě šedá" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Červená" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Zelená" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Žlutá" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Modrá" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Fialová" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Azurová" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Bílá" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Stopy" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatické denní stopy o půlnoci" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatické denní stopy v" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Počítač" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Zvýraznit stopy" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Přesnost záznamu stopy" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Nízký" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Střední" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Vysoký" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Vypočítat hodnoty" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Výpočet SOG a COG ze změny pozice" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Min. sekund mezi aktualizacemi" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Nové trasy" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Poloměr kruhu průjezdu bodem (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Na další bod pouze při průjezdu" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Barva kruhů" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Potvrď smazání stop a tras" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Soubory map" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Složky" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Přidat složku..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Odstranit vybrané" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Komprimovat vybrané" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Odebrat" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Aktualizovat ovládací prvek" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Projít mapy a aktualizovat databázi" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Vynutit uplné znovuvytvoření databáze" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Připravit všechny ENC mapy" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Šablony" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Pokočilé" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Srovnat šikmé rastrové mapy" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Použít akcelerovanou grafiku (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Doba průměrování otáčení mapy" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "sekundy" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Vážení Zoom/měřítko mapy" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Rastrové" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektorové" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Fyzická šířka obrazovky" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Ručně:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Zobrazení map" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Zobrazit otočené rasterové mapy jako Sever-Nahoru" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "S nižší hodnotou stejnou úroveň zvětšení ukazuje méně podrobnou mapu.\n" "S vyšší hodnotu, stejná úroveň zvětšení zobrazí podrobnější mapu." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafika" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Zobrazení vektorových map" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Mariner's Standard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Zobrazit hloubky" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Informační mapové objekty" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bóje/světla" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Protažené sektory světel" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Mapové texty" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Národní text na mapách" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Pouze důležitý text" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Uspořádat text" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Detail map" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Snížit detail u malého měřítka" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafický styl" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Papírová mapa" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Zjednodušený" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Hranice" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Obyčejný" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Symbolizovaný" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Barvy" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 barvy" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 barvy" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Mělčina" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Bezpečná hloubka" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Velká hloubka" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Obnovit standardní" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Přílivy a proudy" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktivní sady dat" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Přidat datovou sadu..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Všechny dostupné mapy" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Odstranit mapu" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Všechny mapy" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nová skupina" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Smazat skupinu" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Zachovat měřítko při změně mapy" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Ovládací prvky" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Plynulé tažení a přibližování" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom na kurzor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Parametry zobrazení" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Nastavení stavového řádku" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Aktuální ETA ke kurzoru." -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Výchozí rychlost lodi " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Jednotky" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Statutární míle" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Uzly" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Hloubka" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Stupně, desetinné minuty" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Desetinné stupně" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Stupně, minuty, sekundy" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Náměry" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Zobrazit skutečný" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Předpokládaná magnetická variace" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "stupňů (-Z, +V)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Zobrazit skutečné náměry a směry" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Zobrazit magnetické náměry a směry" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Magnetická variace vypočtená WMM pluginem" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "Ruční nastaveni magnetické variace\n" "Musíš vypnout WMM plugin" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Vybrat zvukový soubor" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS cíle" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Výpočet CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Žádná upozornění (T)CPA, pokud vzdálenost k cíli je větší než (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Varuj, pokud CPA je méně než (nm)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...a TCPA je méně než (minut)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Ztracené cíle" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Označit cíle za ztracené po (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Odstranit ztracené cíle po (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Zobrazení" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Ukázat šipky COG cílů v délce (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Ukázat stopy cílů v délce (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Potlačit zakotvené cíle, rychlost max (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Povolit útlum méně důležitých cílů, je-li více než... cílů" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Ukázat oblastní zprávy (z binárních AIS zpráv)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Zobrazit skutečnou velikost AIS cílů" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Zobrazit jména u AIS cílů v měřítku větším než 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Vysačka" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Jméno lodi\" MMSI (Volací znak)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Třída] Typ (Stav)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA/TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA výstrahy" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Zobrazit dialog výstrah CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Hrát zvuk pří výstraze CPA/TCPA" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Povolit vypršení potvrzení upozornění na cíl (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Obecné nastavení" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Jazyk" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Písma" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Vybrat font..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Vybrat font..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Nástrojová lišta a styl okna" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Možnosti rozhraní" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Zobrazit stavovou řádku" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Zobrazit menu" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Zobrazit okno kompas/GPS stav" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Povolit automatické skrývání panelu nástrojů" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Hraj lodní zvony" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Povolit rozhraní dotykové obrazovky" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Povolit škálovatelné grafické rozhraní" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Měřítko uživatelského rozhraní" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Měřítko mapových objektů" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Faktor zvětšení lodí" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Aplikovat" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Mapy" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Připojení" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Lodě" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Uživatelské rozhraní" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Zásuvné moduly" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Uživatelská magnetická variace" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "stopy" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "sáhy" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Přidej složku s mapovými soubory" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - délka lodě musí být > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - šířka lodě musí být > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - tvůj GPS offset od středu lodě musí být v šířce lodě" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - tvůj GPS offset od příděmusí být mensí než délka lodě" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - minimální velikost ikony lodě musí být mezi 1 a 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Nastavené skutečné velikosti vlastní lodi není korektní:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6818,15 +6830,15 @@ msgstr "Komprese změní soubory map na disku.\n" "Komprimované mapy se mohou na některých systémech načítat a zobrazovat trochu pomaleji.\n" "Je možno je kdykoli dekomprimovat zpět programy unxz nebo 7-zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN komprese map" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Nenalezeny žádné mapy pro kompresi." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6835,71 +6847,71 @@ msgstr "komprimováno %ld map\n" "z %.1fMB na %.1fMB\n" "ušetřeno %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Zadej název skupiny" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Nová skupina map" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Vyber data přílivu/proudu" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Komprese textur" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Komprese textur s ukládáním do mezipaměti" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Komprese textur, ukládání do mezipaměti" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Velikost paměti pro textury (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Velikost: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Znovu vytvořit mezipaměť textur" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Vymazat mezipaměť textur" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Vyhlazovat polygony" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Vyhlazovat čáry" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (restartuj OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Použít akcelerovanou grafiku (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Nastavení textur" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Uložené textury" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Různé" @@ -6981,127 +6993,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7146,10 +7158,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS visačka" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "PrekryvnyGrafPrilivProudu" @@ -7267,12 +7275,6 @@ msgstr "Trasa ze stopy" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7473,15 +7475,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7786,7 +7788,7 @@ msgstr "(Úhly sektorů jsou skutečné náměry z moře)The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7902,7 +7904,7 @@ msgstr "Dnes" msgid "Tomorrow" msgstr "Zítra" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "ToolTipy" @@ -8184,153 +8186,156 @@ msgstr "Posunout trasový bod" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_da_DK.po b/po/opencpn_da_DK.po index b779708ba8..57afdaf08d 100644 --- a/po/opencpn_da_DK.po +++ b/po/opencpn_da_DK.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Danish\n" "Language: da_DK\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(unavngivet spor)" @@ -414,7 +414,7 @@ msgstr "SAR-luftfartøj" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Sidst kendte)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Position" @@ -509,11 +509,11 @@ msgstr "Højre" msgid "Left" msgstr "Venstre" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Fart" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Højde" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Hjælp til Navigation" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Basis" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/t" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "Waypoints vil blive omdøbt til at afspejle den naturlige orden, navnene "Vil du omdøbe waypoints?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Om OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Overskriv Garmin enhed rute nummer 1?" msgid "OpenCPN Message" msgstr "OpenCPN Besked" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Valgmuligheder" @@ -2543,7 +2543,7 @@ msgstr "Udskriv valgte rute" msgid "Track properties" msgstr "Egenskaber for spor" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2658,23 +2658,23 @@ msgstr "Plugin API: " msgid "OpenCPN Website" msgstr "OpenCPN webside" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN-hjælpedokumentation er ikke tilgængelig lokalt." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Vil du besøge webstedet opencpn.org for mere information?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3074,7 +3074,7 @@ msgstr "Annullering - Annuller område som identificeret af Message Linkage ID" msgid "Undefined (default)" msgstr "Udefineret (standard)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS-mål navn" @@ -3088,7 +3088,7 @@ msgstr "\n" "En Vedvarende sporoptagelse vil derfor blive genstartet for dette mål.\n\n" "Ønsker du i stedet at stoppe vedvarende sporing for dette mål?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS-alarm" @@ -3104,7 +3104,7 @@ msgstr "Stop lydalarm" msgid "&Jump To" msgstr "&Hop til" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Opret waypoint" @@ -3127,7 +3127,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS fartøjsliste" @@ -3216,38 +3216,38 @@ msgstr "Antal objekter" msgid "Undock Target List" msgstr "Fjern Målliste" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Optag spor" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Den nyligt lagrede spor af dette mål er blevet registreret. \n" "Vil du fortsætte optagelsen indtil OpenCPN afsluttes?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AISforespørgsel på fartøj" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Stop sporing" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3301,7 +3301,7 @@ msgstr "Flyt fartøj hertil" msgid "Navigate To Here" msgstr "Navigér hertil" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Kurs-op tilstand" @@ -3310,8 +3310,8 @@ msgid "Heading Up Mode" msgstr "Nord Op Tilstand" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Nord-op tilstand" @@ -3320,7 +3320,7 @@ msgid "Chart Up Mode" msgstr "Kort-op tilstand" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Åbn/luk fuld skærm" @@ -3345,7 +3345,7 @@ msgstr "Indsæt spor" msgid "CM93 Offset Dialog..." msgstr "CM93 Offset dialogboks..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Kortgrupper" @@ -3463,7 +3463,7 @@ msgstr "Kopiér som KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Slet" @@ -3617,18 +3617,18 @@ msgstr "Send spor til OpenCPN Peer" msgid "Chart Panel Options" msgstr "Kortpanel Indstillinger" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigationstilstand" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Nord op" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Kurs op" @@ -3636,32 +3636,32 @@ msgstr "Kurs op" msgid "Heading Up" msgstr "Kurs op" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "'Se forud '-tilstand" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Indstillinger for kortvisning" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Quiltning af kort" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Vis gradnet" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Vis kortomrids" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Vis enhed for havdybde" @@ -3681,7 +3681,7 @@ msgstr "Tider og strømme" msgid "Show Tide stations" msgstr "Vis Tide-stationer" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Vis strømforhold" @@ -3697,8 +3697,8 @@ msgstr "Vis tekst" msgid "Show depths" msgstr "Vis dybder" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Bøjer/fyr-tekster" @@ -3706,8 +3706,8 @@ msgstr "Bøjer/fyr-tekster" msgid "Lights" msgstr "Lys" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Vis fyrkarakterer" @@ -3723,18 +3723,18 @@ msgstr "Vis synlige sektorlyskilder" msgid "Show chart data quality" msgstr "Vis kortdatakvalitet" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Visningskategori" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Alle" @@ -3779,7 +3779,7 @@ msgstr "Brug som aktivt katalog" msgid "Latest available catalog:" msgstr "Seneste tilgængelige katalog:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Kan ikke downloade data fra url" @@ -3834,8 +3834,8 @@ msgstr "Mislykkedes: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4167,28 +4167,28 @@ msgstr "Svar 'Nej' hvis du til oprette nye waypoints for denne rute." msgid "Merge waypoints?" msgstr "Sammenflet waypoints?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile kræver at OpenGL er aktiveret" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Fod" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Meter" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Favne" @@ -4196,7 +4196,7 @@ msgstr "Favne" msgid "OverZoom" msgstr "Zoomfaktor overskredet" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "ExtendedTideIcon" @@ -4212,7 +4212,7 @@ msgstr "Forespørg på AIS-objekt" msgid "Show all AIS Targets" msgstr "Vis alle AIS-mål" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Formild mindre kritiske AIS-mål" @@ -4260,9 +4260,9 @@ msgstr "Bruger X-offset" msgid "User Y Offset" msgstr "Bruger Y-offset" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "meter" @@ -4273,11 +4273,13 @@ msgstr "Dette ben" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Ledetekst på konsol" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Tekst på konsol, værdi" @@ -4313,12 +4315,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Titel" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4347,7 +4349,7 @@ msgid "Less" msgstr "Mindre" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Rediger Valgt Forbindelse" @@ -4636,12 +4638,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN advarsel" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN Info" @@ -4650,17 +4652,17 @@ msgstr "OpenCPN Info" msgid "Sentence Filter" msgstr "Sætningsfilter" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "V" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Blank alle" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Tilføj" @@ -4691,59 +4693,59 @@ msgstr "En NMEA sætning er generelt 3 tegn lang (såsom RMC, GGA osv.)\n" msgid "REGEX syntax error: \n" msgstr "REGEX syntaksfejl: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "AIS Generelt" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filtrer NMEA Kursus og hastighed data" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Filter periode (sek)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Vis NMEA-fejlsøgningsvindue" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Format uploads for Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Brug Garmin GRMN (Host) tilstand til uploads" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Juster kommunikationsprioriteter..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Dataforbindelser" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Fjern forbindelse" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Konfigurer ny forbindelse" @@ -4801,7 +4803,7 @@ msgid "Install" msgstr "Installer" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Installere igen" @@ -4809,7 +4811,7 @@ msgstr "Installere igen" msgid "Update" msgstr "Opdater" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Nedgrader" @@ -4839,7 +4841,7 @@ msgid " successfully installed" msgstr " installeret" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Installation gennemført" @@ -4847,6 +4849,21 @@ msgstr "Installation gennemført" msgid "Installation error" msgstr "Installationsfejl" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Mærker" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS advarsel" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "GridText" @@ -4859,7 +4876,7 @@ msgstr "Venter på afslutning av rasterkortkomprimering." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN Komprimeret Cache Opdatering" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Afstand fra eget skib: %4.0f sm" @@ -4992,7 +5009,7 @@ msgstr "Dette waypoint er en del af et lag og kan ikke redigeres" msgid "Icon" msgstr "Ikon" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -5002,7 +5019,7 @@ msgid "Links" msgstr "Links" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5043,22 +5060,22 @@ msgstr "Afstandscirkler" msgid "Number" msgstr "Tal" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Afstand" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Farve" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Ingen" @@ -5148,16 +5165,16 @@ msgstr "Vis kun i skala" msgid "Tide Station not found" msgstr "Tidestation ikke fundet" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Angiv skala" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Kortskala" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Vedvarende" @@ -5189,35 +5206,35 @@ msgstr "NMEA fejlsøgningsvindue" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Brugerinterface kunne ikke startes. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN kan ikke starte. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "De nødvendige konfigurationsfiler blev ikke fundet. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Se logfilen her " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " for detaljer." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " --[Portable(-p) udførelse fra " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Henter initielle kortfoldere fra registreringsdatabasen" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN initialiseret efter %ld ms." @@ -5268,8 +5285,8 @@ msgstr "Forventet tid : " msgid "Remaining time : " msgstr "Resterende tid: " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN kortopdatering" @@ -5277,277 +5294,277 @@ msgstr "OpenCPN kortopdatering" msgid "Anchorage created " msgstr "Ankerplads udsat " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Vis værktøjslinje" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Skjul værktøjslinie" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "MOB (mand over bord)" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " ved " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " til " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1,0 sømil i retning af beholden kurs" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Midlertidig MOB-rute" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Formodet 1 sømil punkt" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Tidspunkt: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Position: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Deaktiver sporing" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Aktiver sporing" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Centrer position automatisk" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Nord Op Tilstand" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Zoom ind" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Zoom ud" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Større skala" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Mindre skala" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Afslut OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Naviger" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Vis kortlinie" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Vis ENC tekst " -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Vis ENC Lys" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Vis ENC dybder" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Vis ENC ankringsinfo" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Vis ENC Datakvalitet" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Vis Navobjects" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Vis tidevand" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Farveopsætning" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Vis" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Vis AIS-objekter" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Skjul AIS-mål som er til ankers" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Vis spor for AIS-mål" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Vis CPA advarsler" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "CPA lydalarmer" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Vis CPA Advarsler" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Opmål afstand" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Administration af ruter && mærker..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Opret rute" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Udsæt mærke ved fartøj" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Udsæt mærke ved markør" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Udsæt MOB-mærke" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Præferencer" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Værktøjer" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Vindue" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN hjælp" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Hjælp" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Genstart OpenCPN for at aktivere nyt sprog eller præsentation." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Fartøj " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Roteret tilstand" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Der opstod et problem under udskrift.\n" "Er printeren opsat korrekt?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(unavngivet rute)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS MAND OVER BORD" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr " Eget fartøj" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Midlertidig AISMOB rute" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Eget fartøj" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Ejerskibsposition: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " MOB Position: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS MAN OVERBOARD UPDATE" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Rute og mærke administration" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Udskriv kort" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-mellemrum)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN Forbered ENC " -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC Fuldført." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5555,105 +5572,105 @@ msgstr "Opret en privat konfigurationsskabelon baseret på aktuelle indstillinge "Denne skabelon vil blive gemt og kan vælges til videre brug når som helst.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI udvidede egenskaber" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Sporing" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Standardsporing" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Spor, altid" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Spor, aldrig" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorer denne MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Håndter denne MMSI som SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Konverter AIVDM til AIVDO for denne MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Denne MMSI følger mig - Ingen CPA advarsel" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Et MMSI-Id er generelt et nummer på ni cifre. \n" "Check dine indtastninger og Annuller om nødvendigt." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Standard" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Altid" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Aldrig" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Rediger MMSI egenskaber" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI egenskaber" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Sporingstilstand" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorér" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Skibets navn" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Følger" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Ny..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Tilføj MMSI egenskaber" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5671,7 +5688,7 @@ msgstr "Den valgte enhed er ikke tilgængelig; opencpn vil sandsynligvis ikke ku " KERNEL==\"ttyS*\" MODE=\"0666\"\n\n" "For mere info, se filen LřX_DEVICES. d i distributionsdokumentet.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5691,1180 +5708,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\" MODE=\"0666\"\n\n" "For mere info, se filen LřX_DEVICES. d i distributionsdokumentet.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Længde af kursindikatorpil (minutter)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Kursforudsigelse længde (sømil)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Ikontype for skib" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Rigtig skala, bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Rigtig skala, vektor" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Længde overalt (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Bredde overalt (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS Offset fra stævn (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS Offset fra midtskibs (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Mindste skærmstørrelse (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Vis afstandsringe" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Afstand mellem ringe" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Enhed for distancer" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Sømil" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometer" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Række Ring Farve" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Vis retning til aktivt rutepunkt" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Typografi" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Optrukken" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Punkt" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Lang streg" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Kort streg" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Prik-streg" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Standardfarve" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Sort" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Mørkerød" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Mørkegrøn" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Mørk gul" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Mørkeblå" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Mørk Magenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Mørk Cyan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Lys grå" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Mørk grå" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Rød" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Grøn" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Gul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blå" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cyan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Hvid" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Spor" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatisk daglig spor ved midnat" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatisk daglig spor kl." -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Computer" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Fremhæv spor" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Fremhæv Farve" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Præcision af spor" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Lav" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Medium" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Høj" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Beregn værdier" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Beregn SOG og COG ud fra positionsændringer" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Min. sekunder mellem opdateringer" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rout/Point" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Ny Rute" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Waypoint standard-ikon" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Radius af ankomstcirkel for waypoints (sømil)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Gå til næste rutepunkt kun ved ankomst" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Tilsidesæt indstillingerne for kortskala-baseret synlighed og vis altid" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Waypoint afstandsring-farver" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Generelle indstillinger" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Bekræft sletning af spor og ruter" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Kortfiler" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Foldere" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Tilføj folder..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Slet valgte" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Komprimer Valgte" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Tilføj.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Fjern" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Komprimér" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Opdatering" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Skanner kort og opdater database" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Genindl" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Forbered alle ENC kort" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "[ændret]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Skabeloner" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Skabelon Status" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Sidst Anvendt Skabelon Titel:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Beholde Skabeloner" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Opret Indstilling..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Slet Valgte Indstilling..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Anvend Valgt Konfiguration" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Opret Konfiguration" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Problem med at anvende valgte konfiguration." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avanceret" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "De-skew Raster Charts" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Brug accelereret grafik (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Opengl Indstillinger" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Kartrotation. Gennemsnit tid" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "sekunder" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Kort zoomniveau/vægtning" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vector" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 detaljeringsgrad" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Fysisk skærmbredde" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manuel:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Kortvisning" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr " Vis projektionsforskudte raster kort som 'Nord op'" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Med en lavere værdi viser det samme zoomniveau et mindre detaljeret kort. \n" "Med en højere værdi, det samme zoomniveau viser et mere detaljeret kort." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafik" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Visning af vektorkort" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Maritim standard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Dybder" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Kortinformation" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bøjer/fyr" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Udvidede fyrvinkler" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Korttekster" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "National tekst på kort" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Vis kun vigtig tekst" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Ryd op/gør tekst luftig" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Kortdetalje" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Reducerede detaljer ved lille skala" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafik måde" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Papirkort" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplificeret" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Gr" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Enkelt" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Symboler" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Farver" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 farver" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 farver" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Lavvandet" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Sikker dybde" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Stor dybde" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Bruger Standard Objekter" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Genindstille til STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Vis str" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktivt datasæt" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Tilføj datasæt..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Alle tilgængelig kort" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Fjern kort" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Alle kort" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Ny gruppe..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Slet gruppe" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Fasthold skael ved skift til andet kort" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Kontroller" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Flydende panorering og zoom" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom til markør" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Displayegenskaber" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Status Bar Mulighed" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Levende ETA på markøren" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Standard Bådhastighed " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Canvas Layout" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Status Bar" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Enheder" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Internationale mil" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Knob" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Dybde" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatur" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Positionsformat" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Grader, Decimalminutter" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Decimalgrader" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Grader, Minutter, Sekunder" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Pejlinger" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Vis sand" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Vis magnetisk" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Formodet misvisning" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "grader (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Vis rigtig pejlinger og kurser" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Vis magnetiske lejer og kurser." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM Plugin beregnet magnetisk variation" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " For at indstille den magnetiske variation manuelt,\n" " skal du deaktivere WMM plugin." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Test" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Navn på lydfil:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "V" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Lyd" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Anker Alarm" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Afspil lyd ved Anchor Alarm." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Vælg Anker AlarmLyd" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Afspil lyd ved AIS Alert." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Vælg AIS Alarmlyd" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART Alert" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Afspil lyd på AIS SART Alert." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Vælg AIS SART Alarmlyd" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC Alarm" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Afspil lyd ved DSC notifikation." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Vælg DSC notifikationslyd" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Ukendt enhed" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Inputenhed :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Lydenhed" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Lydafspilnings kommando:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS objekter" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Fremskrivning til korteste afstand(CPA) og tid til korteste afstand (TCPA) fra fart" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Ingen (T)CPA adviserer, hvis afstand er større end (NM)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Advarsel hvis korteste afstand (CPA) er mindre end (sømil)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr ".. og tid til korteste afstand (TCPA) er mindre end (minutter)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Fart" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Marker fartøjer ude af syne efter (minutter)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Fjern fartøjer ude af syne efter (minutter)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Vis" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Vis pil for fartøjers beholdne kurs" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Synkroniser AIS pillængde med eget skibs COG prædiktor" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Vis spor for fartøjers (minutter)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Skjul opankrede/fortøjede fartøjer, fartgrænse (knob)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Tegn AIS realtime forudsigelse, målhastighed min (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Tillad dæmpning af mindre kritiske mål, hvis mere end ... mål" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Vis områdemeddelelser (fra AIS binære beskeder)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Vis AIS fartøjer i rigtig skala" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Vis navne på AIS-mål med skala større end 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Brug WPL positionsbeskeder. Handling når modtaget:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS positionsrapport" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Opret mærke" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Rollover" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Aktiver rute/AIS info blok" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Fartøjsnavn\" MMSI (kaldesignal)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Klasse] Type (Status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "Beholden kurs og fart" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA advarsler" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Vis CPA/TCPA advarselsdialog" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Afspil lydsignal ved CPA/TCPA advarsler." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Skjul advarsler for opankrede/fortøjede fartøjer" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Aktiver Target Alert Acknowledge timeout (minutter)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Generelle indstillinger" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Sprog" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Skrifttyper" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Vælg skrifttype..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Vælg skriftfarve..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Eksempler" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Værktøjslinjen og vinduesudformning" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Interface Options" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Vis statuslinje" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Vis menulinje" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Vis kompas/GPS Statusvindue" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Skjul værktøjslinjen automatisk" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr " Ring med skibsklokker" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Aktiver betjening med touch-skærm" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Aktivér skaleret grafikgrænseflade" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Vis Zoom-knapper" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Brug Indlands-ECDIS V2" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Indlands-ECDIS-håndbog" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Brugergrænseflade skalelingsfaktor" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Kortobjekt skalelingsfaktor" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Skibsskala faktor" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC dybfaktor" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC Tekstskala" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Mushjul zoom følsomhed" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Anvend" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Kort" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Forbindelser" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Forbind" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Skibe" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Brugergrænseflade" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Bruger" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Tilføjelser" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Bruger indstillede magnetisk variation" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "fod" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "favne" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Tilføj en folder der indeholder kortfiler" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - skibets længde skal være > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - skibets bredde skal være > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - din GPS forskydning fra midtskibs skal være inden for dit skib bredde" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - din GPS forskydning fra stævnen skal være inden for skibets længde" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - minimum skibs-ikonstørrelse skal være mellem 1 og 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Indstillinger for eget skibs reelle størrelse er ikke korrekt:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Indlands-ECDIS-håndbogen er ikke tilgængelig lokalt." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Ønsker du at besøge iECDIS Manual hjemmeside for mere information?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6874,86 +6886,86 @@ msgstr "Kompression vil ændre kortfiler på disken.\n" "Komprimerede kort kan tage lidt længere tid at indlæse og vise på nogle systemer.\n" "De kan dekomprimeres igen ved hjælp af unxz eller 7 zip-programmer." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Komprimer kort" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Ingen kort fundet til komprimering." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Navngiv gruppe" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Ny kortgruppe" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Vælg data med tidevand/strøm" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Tekstur kompression" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Tekstur kompression med Caching" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Tekstur kompression cachelagring" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tekstur hukommelsesstørrelse (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Størelse: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Genopbyg tekstur-cache" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Ryd tekstur-cache" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Polygon Udglatning" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Linjeudglatning" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (genstart OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Brug accelereret panorering" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Tekstur- Indstillinger" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Tekstur- Cache" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Diverse" @@ -7035,127 +7047,127 @@ msgstr "Tjek venligst systemloggen for mere info." msgid " successfully installed from cache" msgstr " installeret fra cache" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Disse indstillinger kan destabilisere OpenCPN og er som standard deaktiveret. Til trods for farerne kan du aktivere dem manuelt tilføje en CatalogExpert=1 linje i [PlugIns] sektionen i konfigurationsfilen." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Plugin Katalog" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Opdatere Plugin-katalogen" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importér plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Indstillinger..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Deaktiveret" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Opdater Plugin Katalog: master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "Opdatering af OpenCPN katalog" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Kunne ikke kopiere katalogfil" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Kan ikke kopiere katalogfil til cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Katalog opdatering gennemført" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Vælg tarball- fil" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN Plugin- Importfejl" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Ikke kompatibelt PlugIn fundet." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Fejl ved udpakning af importplugin tarball." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktiv Katalog" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Sidste Katalog" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Seneste ændring" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Opdatere Plugin-katalogen." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Afinstaller" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Aktiveret" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Opgradér til version " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Installer..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Opdater til" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Webside:" @@ -7200,10 +7212,6 @@ msgstr "Satellitter" msgid "OpenCPN Server Message" msgstr "OpenCPN Server Besked" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS advarsel" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TideCurrentGraphRollover" @@ -7321,12 +7329,6 @@ msgstr "Rute fra spor" msgid "Send to &Peer" msgstr "Send til &Peer" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Mærker" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7530,15 +7532,15 @@ msgstr "men nuværende kortskala er" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Derfor vil det nye waypoint ikke være synligt på dette zoomniveau." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Waypoint(s) overført." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Fejl ved Waypointudlæsning. Garmin GPS ikke forbundet" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Fejl ved Waypointudlæsning. Kontroller logfiler..." @@ -7843,11 +7845,11 @@ msgstr " (sektorvinkler er retvisende pejlinger fra søsiden)The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

Det sidste opencpn løb synes at være mislykkedes. Vil du køre\n" "i fejlsikret tilstand uden plugins og andre muligvis problematiske\n" "funktioner?\n" -"



Du kan overveje at besøge listen over kendte spørgsmål.

" +"



Du kan overveje at besøge listen over kendte spørgsmål.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7962,7 +7964,7 @@ msgstr "I dag" msgid "Tomorrow" msgstr "I morgen" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Værktøjstips" @@ -8252,153 +8254,156 @@ msgstr "Flyt Waypoint" msgid "Dismiss" msgstr "Afvis" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_de_DE.po b/po/opencpn_de_DE.po index 72afc356dd..65708e6c97 100644 --- a/po/opencpn_de_DE.po +++ b/po/opencpn_de_DE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de_DE\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(unbenannter Track)" @@ -414,7 +414,7 @@ msgstr "SAR Fluggerät" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (zuletzt bekannt)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Position" @@ -509,11 +509,11 @@ msgstr "Rechts" msgid "Left" msgstr "Links" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Geschwindigkeit" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Höhe" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Windgeschwindigkeit" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Navigationshilfe" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Basis" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2451,8 +2451,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "Die Wegpunkte werden in natürlicher Reihenfolge umbenannt, in der Form '001', '002' usw.." #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Über OpenCPN" @@ -2498,9 +2498,9 @@ msgstr "Garmin Geräte Route Nummer 1 überschreiben?" msgid "OpenCPN Message" msgstr "OpenCPN Nachricht" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Optionen" @@ -2542,7 +2542,7 @@ msgstr "Gewählten Track drucken" msgid "Track properties" msgstr "Track Eigenschaften" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "OpenCPN Grundeinstellungen" @@ -2555,12 +2555,12 @@ msgstr "OpenCPN Grundeinstellungen" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2658,23 +2658,23 @@ msgstr "Plugin-API: " msgid "OpenCPN Website" msgstr "OpenCPN Website" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Die OpenCPN Hilfe Dokumentation ist nicht lokal verfügbar." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Möchten Sie die opencpn.org Webseite für weitere Informationen besuchen?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3074,7 +3074,7 @@ msgstr "Löschung - Bereich identifiziert von verknüpfter Nachrichten-ID" msgid "Undefined (default)" msgstr "Undefiniert (Standard)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS Zielname" @@ -3088,7 +3088,7 @@ msgstr "\n" "Das Tracken wird daher für dieses Ziel neu gestartet.\n\n" "Wollen Sie das \"Immer tracken\" für dieses Ziel beenden?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS-Alarm" @@ -3104,7 +3104,7 @@ msgstr "&Stiller Alarm" msgid "&Jump To" msgstr "Wechsle zu" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Wegpunkt erzeugen" @@ -3127,7 +3127,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Liste AIS-Ziele" @@ -3216,38 +3216,38 @@ msgstr "Anzahl Ziele" msgid "Undock Target List" msgstr "AIS Zielliste abdocken" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Track Aufzeichnen" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Der erfasste Track dieses Ziels ist aufgezeichnet worden.\n" "Soll die Aufzeichnung bis zum Ende der laufenden OpenCPN Sitzung weiter laufen?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS-Zielabfrage" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Aufzeichnung anhalten" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menü" @@ -3301,7 +3301,7 @@ msgstr "Bootsposition hierhin verschieben" msgid "Navigate To Here" msgstr "Navigiere hierhin" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Kurs-Voraus Modus" @@ -3310,8 +3310,8 @@ msgid "Heading Up Mode" msgstr "Steuerkurs Oben Modus" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Genordeter Modus" @@ -3320,7 +3320,7 @@ msgid "Chart Up Mode" msgstr "Karte Oben Modus" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Umschalten auf Vollbild" @@ -3345,7 +3345,7 @@ msgstr "Track einfügen" msgid "CM93 Offset Dialog..." msgstr "CM93 Offset Dialog..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Karten-Gruppen" @@ -3463,7 +3463,7 @@ msgstr "Kopiere als KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Löschen" @@ -3617,18 +3617,18 @@ msgstr "Track an OpenCPN Gegenstelle senden" msgid "Chart Panel Options" msgstr "Kartenblatt Optionen" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigationsmodus" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Norden oben" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Kurs oben" @@ -3636,32 +3636,32 @@ msgstr "Kurs oben" msgid "Heading Up" msgstr "Steuerkurs (HDG) oben" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Kurs-Voraus Modus" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Anzeige-Optionen" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "\"Patchwork\" Kartenanzeige aktivieren" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Gitter zeigen" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Kartenumrisse anzeigen" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Tiefeneinheit (oben rechts) anzeigen" @@ -3681,7 +3681,7 @@ msgstr "Tiden + Strömungen" msgid "Show Tide stations" msgstr "Pegelstation anzeigen" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Gezeitenströme anzeigen" @@ -3697,8 +3697,8 @@ msgstr "Text anzeigen" msgid "Show depths" msgstr "Lotungen anzeigen" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Bojen/Feuer Kennungen" @@ -3706,8 +3706,8 @@ msgstr "Bojen/Feuer Kennungen" msgid "Lights" msgstr "Leucht-Feuer" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Leuchtfeuer-Kennungen" @@ -3723,18 +3723,18 @@ msgstr "Sichtbare Sektorenlichter anzeigen" msgid "Show chart data quality" msgstr "Qualität der Kartendaten anzeigen " -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Anzeigekategorie" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Alle" @@ -3779,7 +3779,7 @@ msgstr "Als aktiven Katalog verwenden" msgid "Latest available catalog:" msgstr "Neuester verfügbarer Katalog:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Daten von url (Adresse) können nicht heruntergeladen werden" @@ -3834,8 +3834,8 @@ msgstr "Fehler: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4167,28 +4167,28 @@ msgstr "Antwort 'Nein' erzeugt alle Wegpunkte neu für diese Route." msgid "Merge waypoints?" msgstr "Wegpunkte verbinden?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Kurzinfo Route/Routenabschnitt" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile benötigt ein aktiviertes OpenGL" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Fuß" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Meter" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Faden" @@ -4196,7 +4196,7 @@ msgstr "Faden" msgid "OverZoom" msgstr "Übervergrößerung" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Beschriftung Gezeitenstand Anzeige" @@ -4212,7 +4212,7 @@ msgstr "AIS-Zielabfrage" msgid "Show all AIS Targets" msgstr "Zeige alle AIS-Ziele" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Weniger kritische AIS-Ziele optisch dämpfen" @@ -4260,9 +4260,9 @@ msgstr "Benutzer X Offset" msgid "User Y Offset" msgstr "Benutzer Y Offset" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "Meter" @@ -4273,11 +4273,13 @@ msgstr "Abschn." #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Consolen Legende" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Consolen Wert" @@ -4313,12 +4315,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Titel" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4347,7 +4349,7 @@ msgid "Less" msgstr "Weniger" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Ausgewählte Verbindung bearbeiten" @@ -4636,12 +4638,12 @@ msgstr "Wenn Sie diese Eingabe aktivieren, wenden Sie bitte einen Filter auf bei msgid "Or consider using a different data port for one of them" msgstr "Oder erwägen Sie, einen anderen Datenport für einen der beiden zu verwenden" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN Warnung" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN Info" @@ -4650,17 +4652,17 @@ msgstr "OpenCPN Info" msgid "Sentence Filter" msgstr "Sequenz-Filter" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Alle auswählen" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Alle abwählen" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Hinzu" @@ -4691,59 +4693,59 @@ msgstr "Eine NMEA Nachricht ist in der Regel 3 Zeichen lang (wie RMC, GGA etc..) msgid "REGEX syntax error: \n" msgstr "REGEX Syntaxfehler: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Allgemein" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "NMEA Kurs- und Geschwindigkeitsdaten filtern" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Filterperiode (s)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Zeige NMEA-Datenfluss" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Upload-Format für Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Verwende Garmin GRMN (Host) Modus für Uploads" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "Verwende magn. Peilung in Ausgangs-Sequenz APB" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "NMEA0183 Talker-ID" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Kommunikationsprioritäten anpassen..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "NMEA0183 Talker-ID" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Daten-Verbindungen" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "Verbindung hinzufügen..." -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "Verbindung bearbeiten..." -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Verbindung löschen" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Neue Verbindung konfigurieren" @@ -4801,7 +4803,7 @@ msgid "Install" msgstr "Installieren" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Erneut installieren" @@ -4809,7 +4811,7 @@ msgstr "Erneut installieren" msgid "Update" msgstr "Aktualisieren" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Auf Vorversion zurück" @@ -4839,7 +4841,7 @@ msgid " successfully installed" msgstr " erfolgreich installiert" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Installation beendet" @@ -4847,6 +4849,21 @@ msgstr "Installation beendet" msgid "Installation error" msgstr "Fehler bei der Installation" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Marken" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS Kurzübersicht" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "Kartentexte" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "Text Gitter" @@ -4859,7 +4876,7 @@ msgstr "Warten auf Beendigung des Rasterkomprimierungsprozesses." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN Update Komprimierter Cache" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Entfernung von Ownship: %4.0f NMi" @@ -4992,7 +5009,7 @@ msgstr "Dieser WP ist Teil eines Layer und kann nicht editiert werden" msgid "Icon" msgstr "Symbol" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -5002,7 +5019,7 @@ msgid "Links" msgstr "Verknüpfungen" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5043,22 +5060,22 @@ msgstr "Bereichsradien" msgid "Number" msgstr "Anzahl" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Entfernung" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Farbe" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Kein" @@ -5148,16 +5165,16 @@ msgstr "Nur anzeigen bei Maßstab" msgid "Tide Station not found" msgstr "Gezeitenstation nicht gefunden" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Maßstab setzen" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Kartenmassstab" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Dauerhaft" @@ -5189,35 +5206,35 @@ msgstr "NMEA-Debug-Fenster" msgid "Cannot load route or waypoint file: " msgstr "Kann Route oder Wegpunktdatei nicht laden: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Fehler Initialisierung Oberfläche." -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN kann nicht starten" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Erforderliche Einstellungsdateien nicht gefunden." -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Siehe Log-Datei unter " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " für Details." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Portabel(-p) ausgeführt von " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Rufe die ursprünglichen Kartenverzeichnisse aus der Windows Registrierung ab" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN in %ld ms initialisiert." @@ -5272,8 +5289,8 @@ msgstr "Geschätzte Gesamtzeit:" msgid "Remaining time : " msgstr "Verbleibende Zeit : " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN Karten-Aktualisierung" @@ -5281,277 +5298,277 @@ msgstr "OpenCPN Karten-Aktualisierung" msgid "Anchorage created " msgstr "Ankerplatz erzeugt" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Zeige Werkzeugleiste" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Werkzeugleiste ausblenden" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "MANN ÜBER BORD" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " bei " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " an " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1,0 Sm entlang COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Temporäre MOB Route" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Angenommener 1 Meilen-Punkt" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Zeit: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Position: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Tracking deaktivieren" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Tracking aktivieren" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Schiff autom. zentriert" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Steuerkurs Oben" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Hineinzoomen" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Herauszoomen" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Karte mit größerem Maßstab" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Karte mit kleinerem Maßstab" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "OpenCPN beenden" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "& Navigieren" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Zeige die Karten Leiste" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "ENC-Text anzeigen" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Leuchtfeuer der Seekarte anzeigen" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Tiefenangaben der Seekarte anzeigen" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Ankerinformationen der Seekarte anzeigen" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "ENC-Datenqualität anzeigen" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Navobjects anzeigen" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Tiden-Referenzorte anzeigen" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Farbschema wechseln" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "A&nzeige" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "AIS-Ziele anzeigen" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Ausblenden liegender AIS-Ziele" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Track von AIS Zielen zeigen" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "AIS CPA Dialog zeigen" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Akustischer CPA Alarm" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "CPA Warnungen zeigen" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Distanz messen" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Route && Mark-Manager..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Route erstellen" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Setze Marke an Bootposition" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Setze marke an Zeigerposition" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "MüB Markierung setzen" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Einstellungen" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Werkzeuge" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Fenster" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN Hilfe" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Hilfe" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Bitte starten Sie OpenCPN neu zur Aktivierung der Sprach- oder Stil-Änderung." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Schiff " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Rotierter Modus" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Beim Drucken ist ein Fehler aufgetreten.\n" "Vielleicht ist der Drucker nicht richtig konfiguriert?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(unbenannte Route)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS-MANN ÜBER BORD" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Eigenes Schiff" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Temporäre AISMOB Route" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Aktuelles eigenes Schiff" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Eigene Position: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " Mann ü.B.-Position: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS-MANN ÜBER BORD AKTUALISIEREN" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Routen & Waypoint Manager" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Karte drucken" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Leertaste)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN ENC vorbereiten" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC vollständig." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5559,105 +5576,105 @@ msgstr "Erstellen Sie eine private Konfigurationsvorlage basierend auf aktuellen "Diese Vorlage wird gespeichert und kann jederzeit für weitere Verwendung ausgewählt werden.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI Erweiterte Eigenschaften" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Tracking" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Standard Tracking" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Immer Trocken" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Nie Tracken" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Diese MMSI ignorieren" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Diese MMSI als SART/PLB(AIS) MOB Ziel." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Für diese MMSI AIVDM in AIVDO wandeln" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Diese MMSI ist mein Begleiter/Follower - Kein CPA Alarm" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Eine MMSI besteht in der Regel aus neun Ziffern. \n" "Bitte überprüfen Sie Ihre Eingaben - ggf. Abbrechen." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Normal" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Immer" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Nie" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "MMSI Eigenschaften bearbeiten" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI-Eigenschaften" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Track-Modus" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorieren" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Schiffsname" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Follower" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Neu..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "MMSI Eigenschaften hinzufügen" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5675,7 +5692,7 @@ msgstr "Auf das ausgewählte Gerät kann nicht zugegriffen werden; OpenCPN wird " KERNEL==\"ttyS *\",MODE=\"0666\"\n\n" " für weitere Informationen siehe die Datei LINUX_DEVICES.md in den Distro-Docs.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5695,1180 +5712,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" " Für weitere Informationen siehe die Datei LINUX_DEVICES.md in der Distro.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Voraus-Anzeige KüG-Pfeil (in Minuten)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Länge des Kursvektors (NM)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Boot-Symbol Type" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Maßgerechte Bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Maßgerechter Vektor" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Länge über alles (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Breite über alles (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS Abweichung vom Bug (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS Abweichung von Mittschiffs (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Min. Bildschirm (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Range Ringe anzeigen" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Abstand zwischen Ringen" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Entfernung-Einheit" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Seemeilen" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometer" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "Minuten (Zeit)" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Range Ring Farbe" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Peilung zum aktiven Wegpunkt anzeigen" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Stil" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Voll" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Punkt" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Langer Strich" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Kurzer Strich" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Punkt Strich" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Standardfarbe" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Schwarz" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Rot (dunkel)" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Grün (dunkel)" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Gelb (dunkel)" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Blau (dunkel)" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta (dunkel)" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Cyan (dunkel)" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Grau (hell)" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Grau (dunkel)" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Rot" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Grün" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Gelb" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blau" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cyan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Weiß" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Tracks" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatische tägliche Tracks um Mitternacht" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatische tägliche Tracks um" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Computer" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Tracks markieren" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Highlightfarbe" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Tracking-Genauigkeit" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Niedrig" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Mittel" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Hoch" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Werte berechnen" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "SOG und COG aus Positionsänderungen berechnen" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Mindestzeit ( Sekunden) zwischen Updates" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Routen/Wegpunkte" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Neue Route" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Aktive Route" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Nachhaltige Aktive Route, beim Start automatisch aktivieren" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Wegpunkt Standardsymbol" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Wegpunkt Ankunftsradius (sm)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Nächsten Waypoint erst nach Ankunft ansteuern" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "Neue Wegmarke" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "Standardsymbol Wegmarke" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "Zeige Wegmarke nur bei einem Maßstab größer als 1:" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Ignoriere die Einstellungen für die Maßstab-basierte Sichtbarkeit und zeige immer" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "Range rings Wegmarke" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Frabe Waypoint Radien" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Allgemeines Verhalten" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "Alle Wegmarken sperren, außer wenn ein Wegmarken-Dialog angezeigt wird" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Bestätigung f. Löschen Tracks und Routen" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Karten-Dateien" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Verzeichnisse" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Verzeichnis hinzu..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Auswahl löschen" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Ausw. komprimieren" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Hinzufügen.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Entfernen" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Komprimieren" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Karten migrieren.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Aktualisierungseinstellung" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Scanne Karten und erneuere Datenbank" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Gesamte Datenbank neu aufbauen" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Alle ENC Karten vorbereiten" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Geändert]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Vorlagen" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Vorlagenstatus" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Zuletzt verwendete Vorlage:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Gespeicherte Vorlagen" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Vorlage erstellen..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Ausgewählte Vorlage löschen..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Ausgewählte Vorlage anwenden" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Vorlage erstellen" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Fehler bei der Anwendung der gewähltenVorlage." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Erweitert" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Geneigte Rasterkarten ausrichten" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Verwende beschleunigte Grafik (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL-Einstellungen" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Zeitinterval zum Glätten der Kartenrotation" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "Sekunden" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Wichtung Karten Zoom/Skalierung" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektor" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 Detaillevel" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Physische Bildschirmbreite" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Benutzer:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Kartenanzeige" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Schiefe/gedrehte Raster-Karten genordet anzeigen" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Mit einem niedrigeren Wert zeigt eine gleiche Zoomstufe eine weniger detaillierte Karte. \n" " mit einem höheren Wert zeigt eine gleiche Zoomstufe eine detaillierte Karte." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafik" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Kartenleiste" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Einzelinformationen auf Kartenleiste anzeigen" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vektor Karten Display" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Benutzerdef. Auswahl" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Tiefenangaben" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Karten-Informations Objekte" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bojen/Lichter" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Erweiterte Sektorenfeuer" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Karten Texte" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Nationaler Text auf Karte" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Nur wichtigen Text anzeigen" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Text \"aufräumen\" (exp.)" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Karten Detail" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Reduziertes Detail bei kleinem Maßstab" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "Zusätzliche Detailreduzierung bei kleinem Maßstab" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafik Stile" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Papierkarte" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Vereinfacht" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Kartengrenzen" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Schlicht" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Symbolisch" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Farben" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2-farbig" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4-farbig" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Flachwassergrenze" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Sicherheitstiefe" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Tiefwassergrenze" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Objekte im Benutzer-Standard" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Auf STANDARD zurücksetzen" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Tiden + Strömungen" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktive Datensätze" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Datensatz hinzu..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Alle verfügbaren Karten" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Entferne Karte" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Alle Karten" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Neue Gruppe..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Gruppe löschen" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Maßstab bei Kartenwechsel beibehalten" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Steuerelemente" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Weiches Schwenken/Zoomen" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom zum Cursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Anzeigefunktionen" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Statusleisten Option" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Zeige ETA an Cursorposition" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Standard-Boot-Geschwindigkeit " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Bildschirm-Layout" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Statusleiste" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Einheiten" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Landmeilen" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Knoten" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Tiefe" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatur" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Grad, Dezimalminuten" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Dezimalgrad" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Grad, Minuten, Sekunden" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Peilungen" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "\"Wahr\" anzeigen" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Magnetisch Anzeigen" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Angenommene magnetische Missweisung" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Windgeschwindigkeit" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Zeige wahre Peilungen und Kurse" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Zeige magn. Peilungen und Kurse." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM-Plugin berechnet magnetische Missweisung" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Um die magnetische Missweisung manuell einzustellen \n" " müssen Sie den WMM-Plugin deaktivieren." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Testen" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Name der Audio-Datei:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Warnton-Datei auswählen" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Töne" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Ankeralarm" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Ton bei Anker Alarm abspielen." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Ankeralarm Ton auswählen" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Ton bei AIS Alarm abspielen." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "AIS Alarm Ton auswählen" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART Alarm" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Ton bei SART Alarm abspielen" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "SART Alarm Ton auswählen" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC Alarm" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Ton bei SART Alarm abspielen" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "DSC Alarmton auswählen" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Einstellungen Alarmtöne" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Unbekanntes Gerät:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Eingabegerät :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Audio-Gerät" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Audio-Wiedergabe-Befehl:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS-Ziele" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA-Berechnung" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Keine (T) CPA Warnungen Zielbereich ist größer als (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Warnung, wenn CPA geringer ist als (sm)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...und TCPA geringer ist als (Minuten)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Verlorene Ziele" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Ziele als verloren markieren nach (Minuten)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Verlorene Ziele entfernen nach (Minuten)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Anzeige" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Zeige KüG-Pfeil für Ziel, Länge (Minuten)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "AIS- und Eigene- Kursvektoanzeige synchronisieren" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Zeige Tracks für Ziele, Länge (Minuten)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Unterdrücken von ankernden/liegenden Zielen, V. max (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "AIS-Echtzeit-Vorhersage zeigen, Min. Geschwindigkeit des Ziels (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Erlaube die Dämpfung der Anzeige weniger kritischer Ziele wenn mehr als ... Ziele" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Zeige Gebietsnachrichten (von AIS Binär-Nachrichten)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Zeige reale Größe AIS-Ziele" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Zeige Namen mit AIS-Zielen bei Maßstab > 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "WPL-Positionsnachrichten verwenden. Aktion bei Empfang:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS Positionsbericht" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Marker erstellen" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Kurzübersicht" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Routen/AIS-Info-Block aktivieren" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Schiffsname\" MMSI (Rufzeichen)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Klasse] Typ (Status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "Geschwindigkeit über Grund, Kurs über Grund" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "Ort bei größter Näherung, Zeitpunkt der größten Näherung" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA-Alarme" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "CPA/TCPA-Alarmfenster anzeigen" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Warnton bei CPA-/TCPA- und DSC/SART-Alarmen abspielen" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "AIS Alarmton testen" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Alarm für festgemachte/vor Anker liegende Ziele unterdrücken" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Aktiviere max. Zeitdauer für Ziel-Alarmquittierung (Minuten)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Allgemeine Optionen" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Sprache" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Schriften" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Schrift auswählen..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Schriftfarbe auswählen..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Beispiel" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Symbolleiste und Fenster-Stil" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Schnittstellen Optionen" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Statusleiste anzeigen" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Menüleiste anzeigen" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Kompass/GPS-Status-Fenster anzeigen" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Automatisches Ausblenden der Werkzeugleiste aktivieren" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Schiffsglocke läuten" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Touchscreen Interface aktivieren" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Skalierende Grafikoberfläche aktivieren" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Anzeigen Zoom-Tasten" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Inland ECDIS anwenden" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Inland ECDIS Handbuch" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Skalierungsfaktor Benutzer Oberfläche" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Skalierungsfaktor Karten Objekte" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Skalierungsfaktor Schiffe" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "Grössenfaktor ENC Lotungen" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC-Textmaßstab" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Empfindlichkeit Zoom via Mausrad" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Anwenden" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Seekarten" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Verbindungen" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Verbinden" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr " Schiffe" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Oberfläche" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Benutzer" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Plugins" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Benutzerdefinierte magnetische Missweisung" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "Fuß" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "Faden" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Verzeichnis mit Karten hinzu" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - die Bootslänge muss > 0 sein" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - die Bootsbreite muss > 0 sein" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - die GPS Abweichung von Mittschiffs muss innerhalb der Bootsbreite sein" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - die GPS Abweichung vom Bug muss innerhalb der Bootslänge sein" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - die minimale Bootssymbol-Größe muss zwischen 1 und 100 mm sein" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Einstellungen für eigene Bootsgröße sind falsch:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Das Inland ECDIS Handbuch ist nicht online verfügbar." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Möchten Sie die iECDIS Handbuch Website für weitere Informationen besuchen?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6878,15 +6890,15 @@ msgstr "Komprimieren verändert die Karten auf der Festplatte.\n" "Das Laden und Anzeigen von komprimierten Karten kann sich auf manchen Systemen leicht verzögern.\n" "Zum Dekomprimieren verwenden Sie Programme wie 7z oder unxz." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Karten komprimieren" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Keine Karten zum Komprimieren vorhanden." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6895,71 +6907,71 @@ msgstr "%ld Karten komprimiert\n" "von %.1fMB auf %.1fMB\n" "gespeichert %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Gruppen-Name eingeben" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Neue Karten-Gruppe" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Wähle Tiden-/Strom-Daten" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Texture Kompression" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Texture Kompression mit Caching" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Texture Kompression Caching" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Gres texture Speicher (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Größe: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Texture Cache wiederherstellen" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Texture Cache löschen" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Polygon glätten" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Linie glätten" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (OpenCPN neu starten)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Verwende beschleunigte Grafik (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Textur-Einstellungen" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Texture Cache" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Sonstiges" @@ -7041,127 +7053,127 @@ msgstr "Bitte überprüfen Sie das Systemlog für weitere Informationen." msgid " successfully installed from cache" msgstr " erfolgreich aus dem Cache installiert" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Diese Einstellungen können OpenCPN instabil machen und sind standardmässig inaktiv. Um sie dennoch zu aktivieren, füegen Sie die Zeile CatalogExpert=1 im [PlugIns] Abschnitt der OpenCPN Konfigurationsdatei ein." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Plugin-Katalog" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Plugin-Katalog aktualisieren" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Plugin importieren..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Einstellungen..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Deaktiviert" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Plugin-Katalog aktualisieren: Master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN Katalog Aktualisierung" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Katalogdatei konnte nicht kopiert werden" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Katalogdatei kann nicht in den Cache kopiert werden" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Katalogaktualisierung erfolgreich" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Tarball Datei auswählen" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Fehler beim Entpacken von Metadaten aus Tarball." -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN Fehler beim Plugin Import" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Inkompatible Import-Plugin erkannt." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Fehler beim Entpacken des Import-Plugin Tarball." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Erweiterung" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "Erfolgreich importiert" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktiver Katalog" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Letzter Katalog" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Letzte Änderung:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Bitte Plugin Katalog aktualisieren." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Deinstalliere" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Erweiterung deinstallieren" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Deinstallation" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Aktiviert" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Aktualisieren Sie auf Version" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Installiere..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Update auf" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Webseite" @@ -7206,10 +7218,6 @@ msgstr "Satelliten" msgid "OpenCPN Server Message" msgstr "OpenCPN Server-Nachricht" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS Kurzübersicht" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Kurzinfo Gezeiten- und Strömungskurve" @@ -7327,12 +7335,6 @@ msgstr "Route aus Track" msgid "Send to &Peer" msgstr "An &Gegenstelle senden" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Marken" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "Alle Wegpunkte anzeigen" @@ -7536,15 +7538,15 @@ msgstr "aber ist der aktuelle Kartenmassstab ist" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Der neue Wegpunkt wird daher auf dem aktuellen Zoom-Level nicht sichtbar sein." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Wegpunkt(e) übertragen." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Fehler beim Hochladen der Wegpunkte. Garmin GPS nicht angeschlossen." -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Fehler beim Hochladen der Wegpunkte. Bitte prüfen Sie die Log-Dateien..." @@ -7849,10 +7851,10 @@ msgstr "(Sektorwinkel sind Wahre Richtungen von seewärts)< msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "Der letzte Lauf von OpenCPN scheint fehlgeschlagen zu sein. Möchten Sie im sicheren Modus Neustarten\n" ", d.h. ohne Plug-ins oder andere möglicherweise kritische Optionen?\n" -"



Eine Liste mit bekannten Problemen finden Sie hier: .

" +"



Eine Liste mit bekannten Problemen finden Sie hier: .

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7968,7 +7970,7 @@ msgstr "Heute" msgid "Tomorrow" msgstr "Morgen" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Tool Tipps" @@ -8269,153 +8271,156 @@ msgstr "Verschiebe Wegpunkt" msgid "Dismiss" msgstr "Verwerfen" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "Wählen Sie die Einheiten und Datenformate aus, die Sie verwenden möchten." -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Alle Einstellungen können Sie jederzeit in der Konfigurations-Toolbox geändert werden, indem Sie auf den " -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "Icon in der Hauptwerkzeugleiste klicken." -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "Wenn Sie bereits Karten auf Ihrem System haben, können Sie diese hier hinzufügen." -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "Zusätzliche Karten können über den in der Anwendung integrierten Chart Downloader beziehen." -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "Um auf den Kartendownloader zuzugreifen, klicken Sie auf den" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "Icon in der Symbolleiste und navigieren Sie zu Karten -> Karten Downloader Reiter." -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "

Willkommen bei OpenCPN!

Sie haben die initiale Konfiguration erfolgreich abgeschlossen. Sie können nun mit der Anwendung beginnen.

" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "NMEA0183: UDP port %d" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "NMEA2000: UDP port %d" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "NMEA0183: %s TCP Port %d" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "NMEA2000: %s TCP Port %d" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "GPSd: %s TCP Port %d" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." -msgstr "Signal K Server suchen..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." +msgstr "Suche nach Quellen für Navigationsdaten, dies kann einen Augenblick dauern..." -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "Scanne USB-Geräte..." -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "Suche nach UDP Datenströme..." -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "Suche TCP-Server..." -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "Signal K Server suchen..." + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "Suche nach CAN-Schnittstellen..." -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "GPSD-Server suchen..." -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "SignalK: %s (%s Port %d)" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "Das System wurde nach Quellen für Navigationsdaten gescannt." -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "Die Verbindungen zu den entdeckten Datenquellen werden automatisch konfiguriert. Sie können die Auswahl derjenigen abwählen, die Sie ignorieren möchten." -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "Sie können nun zusätzliche USB-Geräte anschließen oder sich mit einem anderen Netzwerk verbinden. Danach auf die Schaltfläche \"Neue Suche\" drücken, um die Liste zu aktualisieren." -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Alle Einstellungen können Sie jederzeit in der Options-Toolbox geändert werden, indem Sie auf den " -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "Icon klicken. Im Optionsfenster gehen Sie zum Reiter \"Verbindungen\"." -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "Verzeichnis mit Karten auswählen" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "Einheiten und Formate" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "Grad, Dezimalminuten (DD MM.MM)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "Dezimalgrade (DD.DDDD)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "Grad, Minuten, Sekunden (DD MM SS)" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "Zeige wahre Peilungen und Kurse" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "Zeige magn. Peilungen und Kurse" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "Erkannte Quellen für Navigationsdaten:" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "Neue Suche..." -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "Vorhandene Karten hinzufügen" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "Kartenverzeichnis hinzufügen..." - diff --git a/po/opencpn_el_GR.po b/po/opencpn_el_GR.po index d6dd032f8f..15acefbb88 100644 --- a/po/opencpn_el_GR.po +++ b/po/opencpn_el_GR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Ανώνυμο ίχνος)" @@ -414,7 +414,7 @@ msgstr "Αεροσκάφος διάσωσης" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (τελευταία γνωστή)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Θέση" @@ -509,11 +509,11 @@ msgstr "Δεξιά" msgid "Left" msgstr "Αριστερά" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Ταχύτητα" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Υψόμετρο" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Ταχύτητα ανέμου" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Βοήθημα ναυσιπλοΐας" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Βασική" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "μ.α.ώ." #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2451,8 +2451,8 @@ msgstr "Τα σημεία πορείας θα μετονομαστούν, ώστ "Θέλετε να τα μετονομάσετε;" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Για το OpenCPN" @@ -2498,9 +2498,9 @@ msgstr "Αντικατάσταση διαδρομής 1 συσκευής Garmin? msgid "OpenCPN Message" msgstr "Μήνυμα OpenCPN" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Επιλογές" @@ -2542,7 +2542,7 @@ msgstr "Εκτύπωση επιλογής διαδρομής" msgid "Track properties" msgstr "Ιδιότητες ίχνους" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "Αρχική Ρύθμιση OpenCPN" @@ -2555,12 +2555,12 @@ msgstr "Αρχική Ρύθμιση OpenCPN" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2658,23 +2658,23 @@ msgstr "API προσθέτου" msgid "OpenCPN Website" msgstr "Ιστοσελίδα του OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Δεν υπάρχουν επεξηγήσεις για το OpenCPN τοπικά." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Θέλετε να πάτε στην ιστοσελίδα opencpn.org για περισσότερες πληροφορίες;" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3074,7 +3074,7 @@ msgstr "Ακύρωση - ακυρώνεται ο προσδιορισμός τη msgid "Undefined (default)" msgstr "Ακαθόριστη (default) " -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Όνομα στόχου AIS" @@ -3088,7 +3088,7 @@ msgstr "\n" "Δηλαδή, η καταγραφή του ίχνους θα ξαναρχίσει για αυτόν τον στόχο.\n\n" "Μήπως θέλετε να σταματήσετε την Επίμονη παρακολούθηση για αυτόν τον στόχο?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Συναγερμός AIS" @@ -3104,7 +3104,7 @@ msgstr "&Σίγαση συναγερμού" msgid "&Jump To" msgstr "&Πήγαινε σε" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Δημιουργία σημείου πορείας" @@ -3127,7 +3127,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Κατάλογος στόχων AIS" @@ -3216,38 +3216,38 @@ msgstr "Αριθμός στόχων" msgid "Undock Target List" msgstr "Αποδέσμευση καταλόγου στόχων" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Καταγραφή ίχνους" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Το πρόσφατο ίχνος αυτού του στόχου έχει καταγραφεί.\n" " Να συνεχιστεί η καταγραφή μέχρι το τέλος της τρέχουσας συνεδρίας;" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS.Πληρ.Στόχου" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Εντάξει" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Διακοπή παρακολούθησης" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Μενού" @@ -3301,7 +3301,7 @@ msgstr "Φέρε το πλοίο εδώ" msgid "Navigate To Here" msgstr "Πλεύση μέχρι εδώ" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "«Πορεία προς τα πάνω»" @@ -3310,8 +3310,8 @@ msgid "Heading Up Mode" msgstr "Κατεύθυνση προς τα πάνω" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "«Βορράς προς τα πάνω»" @@ -3320,7 +3320,7 @@ msgid "Chart Up Mode" msgstr "Λειτουργία «Χάρτης προς τα πάνω»" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Αλλαγή σε/από fullscreen" @@ -3345,7 +3345,7 @@ msgstr "Επικόλληση ίχνους" msgid "CM93 Offset Dialog..." msgstr "Διάλογος αντιστάθμισης χάρτη CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Ομάδες χαρτών" @@ -3463,7 +3463,7 @@ msgstr "Αντιγραφή ως KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Διαγραφή" @@ -3617,18 +3617,18 @@ msgstr "Αποστολή ´ιχνους στο OpenCPN Peer" msgid "Chart Panel Options" msgstr "Επιλογές εμφάνισης χάρτη" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Λειτουργία Πλοήγησης" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "«Βορράς ⇈»" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "«Πορεία ⇈»" @@ -3636,32 +3636,32 @@ msgstr "«Πορεία ⇈»" msgid "Heading Up" msgstr "«Κατεύθυνση ⇈»" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Προεπισκόπηση πορείας" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Επιλογές παρουσίασης" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Συρραφή χαρτών" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Εμφάνιση καννάβου" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Εμφάνιση των ορίων των χαρτών" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Εμφάνιση βαθυμετρικών μονάδων" @@ -3681,7 +3681,7 @@ msgstr "Παλίρροια και ρεύματα" msgid "Show Tide stations" msgstr "Εμφάνιση σταθμών παλίρροιας" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Εμφάνιση ρευμάτων" @@ -3697,8 +3697,8 @@ msgstr "Εμφάνιση κειμένου" msgid "Show depths" msgstr "Εμφάνιση βαθών" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Ετικέτες σημαντήρα/φάρου" @@ -3706,8 +3706,8 @@ msgstr "Ετικέτες σημαντήρα/φάρου" msgid "Lights" msgstr "Φάροι" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Περιγραφές φάρων" @@ -3723,18 +3723,18 @@ msgstr "Εμφάνιση ορατών τομέων στα φανάρια" msgid "Show chart data quality" msgstr "Εμφάνιση ποιότητας δεδομένων χάρτη" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Κατηγορία παρουσίασης" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Κανονική" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Όλα" @@ -3779,7 +3779,7 @@ msgstr "Χρήση ως ενεργός κατάλογος" msgid "Latest available catalog:" msgstr "Τελευταίος διαθέσιμος κατάλογος:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Δεν μπορούν να κατέβουν τα δεδομένα από το URL" @@ -3834,8 +3834,8 @@ msgstr "Αποτυχία: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Αρνητική απάντηση θα δημιουργήσει καιν msgid "Merge waypoints?" msgstr "Συγχώνευση σημείων πορείας;" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Πληροφορίες σκέλους σε Rollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "Τα MBTiles χρειάζονται το OpenGL" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "πόδια" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "μέτρα" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "οργιές" @@ -4197,7 +4197,7 @@ msgstr "οργιές" msgid "OverZoom" msgstr "Υπερμεγέθυνση" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Εικονίδιο παλίρροιας" @@ -4213,7 +4213,7 @@ msgstr "Πληροφορίες για τον στόχο AIS" msgid "Show all AIS Targets" msgstr "Εμφάνιση όλων των στόχων AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Μετρίαση λιγότερο κρισίμων στόχων AIS" @@ -4261,9 +4261,9 @@ msgstr "Αντιστάθμιση Χ άξονα από χρήστη" msgid "User Y Offset" msgstr "Αντιστάθμιση Υ άξονα από χρήστη" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "μέτρα" @@ -4274,11 +4274,13 @@ msgstr "Αυτό το σκέλος" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Υπόμνημα κονσόλας" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Τιμή κονσόλας" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Τίτλος" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Λιγότερα" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Επεξεργασία επιλεγμένης σύνδεσης" @@ -4637,12 +4639,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Προσοχή" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Πληροφορίες για το OpenCPN" @@ -4651,17 +4653,17 @@ msgstr "Πληροφορίες για το OpenCPN" msgid "Sentence Filter" msgstr "Φίλτρο δεδομένων" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Επιλογή όλων" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Εκκαθάριση όλων" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Προσθήκη" @@ -4692,59 +4694,59 @@ msgstr "Μια πρόταση NMEA έχει γενικά 3 χαρακτήρες msgid "REGEX syntax error: \n" msgstr "Σφάλμα σύνταξης REGEX: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Γενικά" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Φίλτρο για δεδομένα πορείας και ταχύτητας ΝΜΕΑ" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Περίοδος φίλτρου (s)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Παράθυρο ροής δεδομένων NMEA" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Φορμάρισμα δεδομένων για Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Χρήση μεθόδου Garmin GRMN (Host) για εξαγωγή δεδομένων" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Ρύθμιση προτεραιοτήτων επικοινωνίας..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Σνδέσεις δεδομένων" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Αφαίρεση σύνδεσης" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Ρϋθμιση νέας σύνδεσης" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Εγκατάσταση" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Επανεγκατάσταση" @@ -4810,7 +4812,7 @@ msgstr "Επανεγκατάσταση" msgid "Update" msgstr "Ενημέρωση" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Υποβάθμιση" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr "Επιτυχής εγκατάσταση" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Η εγκατάσταση ολοκληρώθηκε" @@ -4848,6 +4850,21 @@ msgstr "Η εγκατάσταση ολοκληρώθηκε" msgid "Installation error" msgstr "Σφάλμα Εγκατάστασης." +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Σημεία" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Το Rollover ποντικιού δείχνει:" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "Κείμενο Πλέγματος" @@ -4860,7 +4877,7 @@ msgstr "Αναμονή για τέλος της συμπίεσης του χάρ msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN: ανανέωση του συμπιεσμένου Cache" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Απόσταση από ίδιον πλοίο: %4.0f ν.μ." @@ -4993,7 +5010,7 @@ msgstr "Αυτό το σημείο π. είναι μέρος ενός ταξιδ msgid "Icon" msgstr "Εικονίδιο" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Συνδυασμός!" @@ -5003,7 +5020,7 @@ msgid "Links" msgstr "Σύνδεσμοι" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5044,22 +5061,22 @@ msgstr "Δακτύλιοι απόστασης" msgid "Number" msgstr "Αριθμός" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Απόσταση" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Χρώμα: " -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Καμία" @@ -5149,16 +5166,16 @@ msgstr "Εμφάνιση μόνο σε κλίμακα" msgid "Tide Station not found" msgstr "Δεν βρέθηκε ο σταθμός παλίρροιας" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Ορισμός κλίμακας" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Κλίμακα" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Παραμένον" @@ -5190,35 +5207,35 @@ msgstr "Παράθυρο εντοπισμού σφαλμάτων NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Δεν μπόρεσε να εκκινήσει η διεπιφάνεια χρήστη. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "Το OpenCPN δεν μπορεί να ξεκινήσει. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Δεν βρέθηκαν τα απαραίτητα αρχεία διαμόρφωσης. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Δες το log σε " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " για λεπτομέρειες." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Φορητό(-p) εκτελείται από " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Ανάκτηση αρχικού καταλόγου χαρτών από το μητρώο των Windows" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "Το OpenCPN άρχισε σε %ld ms." @@ -5273,8 +5290,8 @@ msgstr "Εκτιμώμενος χρόνος: " msgid "Remaining time : " msgstr "Απομένων χρόνος: " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "Ανανέωση του χάρτη" @@ -5282,277 +5299,277 @@ msgstr "Ανανέωση του χάρτη" msgid "Anchorage created " msgstr "Δημιουργήθηκε αγκυροβόλιο" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Λωρίδα εργαλείων" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Απόκρυψη λωρίδας εργαλείων" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "ΑΝΘΡΩΠΟΣ ΣΤΗ ΘΑΛΑΣΣΑ" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " σε " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " σε " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 ν.μ. κατά μήκος της COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Προσωρινή διαδρομή για MOB" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Υποτιθετικό σημείο 1 ν.μ." -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Χρόνος: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Θέση: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Απενεργοποίηση ίχνους" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Ενεργοποίηση ίχνους" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Αυτόματη παρακολούθηση" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Πορεία προς τα πάνω" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Μεγέθυνση" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Σμίκρυνση" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Χάρτης μεγαλύτερης κλίμακας" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Χάρτης μικρότερης κλίμακας" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Έξοδος από το OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Πλεύση" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Εμφάνιση της λωρίδας πληροφοριών χάρτη" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Εμφάνιση κειμένου ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Εμφάνιση φάρων ENC" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Εμφάνιση βυθομετρήσεων ENC" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Εμφάνιση πληροφοριών αγκυροβολίας ENC" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Εμφάνιση ποιότητα δεδομένων ENC" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Εμφάνιση αντ. ναυσιπλοΐας" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Εμφάνιση παλίρροιας" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Αλλαγή χρωμάτων" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Εμφάνιση" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Εμφάνιση στόχων AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Απόκρυψη AIS αγκυροβολημένων στόχων" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Δείξε ίχνη στόχων AIS" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Διάλογος για συναγερμούς CPA" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "'Ηχητικοί συναγερμοί CPA" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Προβολή προειδοποιήσεων CPA" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Μέτρηση απόστασης" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Ρυθμίσεις διαδρομών && σημείων..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Δημιουργία διαδρομής" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Σημείο στη θέση του πλοίου" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Σημείο στη θέση του δρομέα" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Ρίξε σημάδι «Άνθρωπος στη Θάλασσα» (MOB)" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Προτιμήσεις" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Εργαλεία" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Παράθυρο" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Βοήθεια για το OpenCPN" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Βοήθεια" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Επανεκκινείστε το OpenCPN για να ενεργοποιήσετε τις αλλαγές στη γλώσσα ή στο στιλ." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Πλοίο " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Περιστροφή εικόνας" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Πρόβλημα με την εκτύπωση.\n" "Ελέγξτε τις ρυθμίσεις του ενεργού εκτυπωτή!" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Ανώνυμη διαδρομή)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS: ΑΝΘΡΩΠΟΣ ΣΤΗ ΘΑΛΑΣΣΑ" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Ίδιον πλοίο" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Προσωρινή διαδρομή AIS MOB" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Θέση ιδίου πλοίου" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "Θέση ίδιου πλοίου:" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " Θέση MOB: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS: ΑΝΑΝΕΩΣΗ του \"ΑΝΘΡΩΠΟΣ ΣΤΗ ΘΑΛΑΣΣΑ\"" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Διαχείριση διαδρομών και σημείων πορείας" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Εκτύπωση χάρτη" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "Προετοιμασία OpenCPN ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "Το ENC ολοκληρώθηκε." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5560,105 +5577,105 @@ msgstr "Δημιουργήστε τo δικής σας πρότυπο επιλο "Το πρότυπο θα αποθηκευθεί για περαιτέρω χρήση ανά πάσα στιγμή.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Ιδιότητες MMSI (εκτεταμένες)" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Καταγραφή του ίχνους" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Προεπιλεγμένη παρακολούθηση" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Μόνιμο καταγραφή ίχνους" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Όχι ίχνος" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Αγνόησε αυτό το MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Αυτό το MMSI θεωρείται SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Μετατροπή AIVDM σε AIVDO για αυτό το MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Αυτό το MMSI με ακολουθεί - Όχι συναγερμός CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Ένας αριθμός MMSI έχει συνήθως εννέα ψηφία.\n" " Έλεγξε τις καταχωρήσεις και ακυρώστε τις αν είναι απαραίτητο." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Προεπιλεγμένο" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Πάντα" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Ποτέ" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Επεξεργασία ιδιοτήτων MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Ιδιότητες MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Είδος ίχνους" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Αγνόησε" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "Άνθρωπος στη Θάλασσα (MOB)" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Όνομα πλοίου" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Ακόλουθος" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Νέο..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Προσθήκη ιδιοτήτων MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5676,7 +5693,7 @@ msgstr "Η συσκευή που επιλέξατε δεν είναι προσβ " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" " Για περισσότερες πληροφορίες, ανατρέξτε στο αρχείο LINUX_DEVICES.md στα docs της διανομής.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5696,1180 +5713,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" " Για περισσότερες πληροφορίες, ανατρέξτε στο αρχείο LINUX_DEVICES.md στα docs της διανομής.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA (δίκτυο δεδομ. πλοίου)" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Μήκος πρόγνωσης πραγμ. πορείας (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Μήκος πρόγνωσης πορείας (heading, ν.μ.)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Τύπος εικονιδίου πλοίου" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Bitmap σε πραγματική κλίμακα" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Διανυσματικό σε πραγματική κλίμακα" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Ολικό μήκος (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Ολικό πλάτος (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Αντιστάθμιση θέσης κεραίας GPS από την πλώρη (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Αντιστάθμιση θέσης κεραίας GPS από το μέσον του πλοίου" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Ελάχιστο μέγεθος στην οθόνη (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Εμφάνιση δακτυλίων ραντάρ" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Απόσταση ανάμεσα στους δακτύλιους" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Μονάδα απόστασης" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Ναυτικά μίλια" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Χιλιόμετρα" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Χρώμα δακτυλίων απόστασης" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Κατεύθυνση προς ενεργό Σημείο Πορείας" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Στιλ" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Συμπαγής" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Διάστικτη" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Με μακριές παύλες" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Με κοντές παύλες" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Τελεία-παύλα" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Προεπιλεγμένο χρώμα" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Μαύρο" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Σκούρο κόκκινο" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Σκούρο πράσινο" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Σκούρο κίτρινο" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Σκούρο μπλε" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Σκούρο μαζέντα" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Σκούρο κυανό" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Ανοιχτό γκρι" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Σκούρο γκρι" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Κόκκινο" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Πράσινο" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Κίτρινο" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Μπλε" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Μαζέντα" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Κυανό" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Άσπρο" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Ίχνη πορείας " -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Αυτόματα καθημερινά ίχνη τα μεσάνυχτα" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Αυτόματα καθημερινά ίχνη στις" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Υπολογιστής" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Φωτισμένα ίχνη πορείας" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Χρώμα Τονισμού" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Ακρίβεια καταγραφής" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Χαμηλή" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Μεσαία" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Υψηλή" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Υπολογισμός" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Υπολογισμός SOG και COG από τις αλλαγές της θέσης" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Ελάχιστος χρόνος μεταξύ ανανεώσεων (s)" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Διαδρομές/σημεία" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Νέες διαδρομές" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Προεπ. εικονίδιο σημείου διαδρομής" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Ακτίνα προσέγγισης σημείου πορείας (ν.μ.)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Προχώρησε σε επόμενο σημείο διαδρομής μόνο με την άφιξη" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Μόνιμη παρουσίαση" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Χρώματα των δακτυλίων γύρω από τα σημεία" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Επιλογές ελέγχου" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Επιβεβαίωση για διαγραφή ιχνών και διαδρομών" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Αρχεία χαρτών" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Φάκελοι" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Προσθήκη φακέλου..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Αφαίρεση επιλεγμένων" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Συμπίεση επιλογής" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Προσθήκη.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Διαγραφή" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Συμπίεση" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Μετεγκατάσταση χαρτών.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Έλεγχος ανανέωσης" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Σκάναρε τους χάρτες και ανανέωσε τη βάση δεδομένων " -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Ανακατασκευή ολόκληρης της βάσης δεδομένων" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Προετοιμασία όλων των χαρτών ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Πρότυπα" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Κατάσταση προτύπου" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Τίτλος προηγούμενου προτύπου:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Αποθηκευμένα πρότυπα" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Δημιουργήστε Config..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Διαγραφή επιλεγμένης Config..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Εφαρμογή επιλεγμένων ρυθμίσεων" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Δημιουργήστε Config" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Πρόβλημα με την εφαρμογή των επιλεγμένων ρυθμίσεων." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Για προχωρημένους" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Ίσιωσε τους χάρτες raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Χρήση γραφικών OpenGL" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Επιλογές OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Μέσος χρόνος για την περιστροφή του χάρτη" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "δευτερόλεπτα" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Κλίμακα λεπτομέρειας χάρτη" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Ράστερ" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Διανυσματικός" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "Επίπεδο λεπτομέρειας στον χάρτη CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Πλάτος φυσικής οθόνης" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Αυτόματα" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Μη αυτόματα:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Εμφάνιση χάρτη" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Δείξε τους παραμορφωμένους raster χάρτες με τον «Βορρά Πάνω»" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Με χαμηλότερη τιμή, στο ίδιο επίπεδο μεγέθυνσης ο χάρτης δείχνει λιγότερες λεπτομέρειες.\n" "Με υψηλότερη τιμή, στο ίδιο επίπεδο μεγέθυνσης ο χάρτης δείχνει περισσότερες λεπτομέρειες." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Γραφικά" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Επιλογές εμφάνισης χάρτη" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Στάνταρ ναυτικών" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Βυθομετρήσεις" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Αντικείμενα πληροφοριών χάρτη" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Σημαντήρες/Φάροι" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Επέκταση τομέων φάρου" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Κείμενα στον χάρτη" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Κείμενο στον χάρτη στην τοπική γλώσσα" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Μονο σημαντικό κείμενο" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Αραιωμένο κείμενο" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Λεπτομέρεια χάρτη" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Μειωμένη λεπτομέρεια σε μικρή κλίμακα" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Στιλ γραφικών" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Σαν τυπωμένοι χάρτες" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Απλοποιημένοι" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Όρια" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Απλά" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Με σύμβολα" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Χρώματα" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2-χρωμοι" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4-χρωμοι" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Αβαθή" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Ασφαλές βάθος" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Βαθιά" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Αντικείμενα User Standard" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Επαναφορά στο στάνταρτ" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Παλίρροια && ρεύματα" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Ενεργές βάσεις δεδομένων" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Προσθήκη βάσης δεδομένων..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Όλοι οι διαθέσιμοι χάρτες" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Αφαίρεση χάρτη" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Όλοι οι χάρτες" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Νέα ομάδα..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Διαγραφή ομάδας" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Διατήρηση της κλίμακας όταν αλλάζουν οι χάρτες" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Ρυθμίσεις" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Ομαλό Panning/Zooming" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Μεγέθυνση γύρω από τον δρομέα" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Χαρακτηριστικά παρουσίασης" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Επιλογή λωρίδας κατάστασης" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Ζωντανή ΕΩΑ στον κέρσορα" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Προεπιλεγμένη ταχύτητα σκάφους " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Διάταξη καμβά" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Γραμμή κατάστασης" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Μονάδες" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Εγγλέζικα μίλια" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "κόμβοι" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Μ.α.ώ." -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Βάθος" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr " Θερμοκρασία" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Κελσίου" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Φαρεναϊτ" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Γεωγ. πλάτος/μήκος" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Μοίρες, λεπτά με δεκαδικά" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Μοίρες με δεκαδικά" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Μοίρες, λεπτά, δεύτερα" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Διόπτευση" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Πραγματικό" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Mαγνητική" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Θετή μαγνητική απόκλιση" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "μοίρες (-Δ, +Α)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Πραγματικές κατευθύνσεις και διοπτεύσεις" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Κατευθύνσεις και διοπτεύσεις μαγνητικής πυξίδας." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Μαγνητική απόκλιση υπολογισμένη από το πρόσθετο WMM" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Για να ρυθμίσετε τη μαγνητική απόκλιση με μη αυτόματο τρόπο,\n" " πρέπει να απενεργοποιήσετε το plugin WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Τεστ" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Όνομα αρχείου ήχου:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Επιλογή αρχείου ήχου" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Ήχοι" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Συναγερμός αγκυροβολίου" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Ηχητικό σήμα σε συναγερμό αγκυροβολίου" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Επιλογή ήχου συναγερμού αγκυροβολίας" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Ηχητικό σήμα σε συναγερμό AIS" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Επιλογή ήχου συναγερμού AIS" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "Συναγερμός AIS" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Ηχητικό σήμα σε συναγερμό AIS-SART" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Επιλογή ήχου συναγερμού AIS-SART" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "Συναγερμός DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Ηχητικό σήμα σε συναγερμό DSC" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Επιλογή ήχου για ειδοποίηση DSC" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Άγνωστη συσκευή :" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Συσκευή εισαγωγής:" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Συσκευή ήχου" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Εντολή ενεργοποίησης ήχου:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Στόχοι AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Υπολογισμός σημείου πλησιέστερης προσέγγισης (CPA)" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Όχι συναγερμό (T)CPA αν η απόσταση από τον στόχο είναι πάνω από (ν.μ.)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Ειδοποίηση αν το CPA είναι μικρότερο από (ν.μ.)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...και ο χρόνος για CPA είναι λιγότερος από (min)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Χαμένοι στόχοι" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Θεώρησε τους στόχους ως χαμένους μετά από (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Αφαίρεσε τους χαμένους στόχους μετά από (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Παρουσίαση" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Βέλος πρόγνωσης πορείας COG του στόχου, μήκος (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Συγχρονίστε το μήκος βέλους AIS με τον εκτίμηση του COG του πλοίου" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Εμφάνιση ίχνους στόχων, μήκος (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Όχι αγκυροβολημένα πλοία, max ταχύτητα (κόμβοι)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Παρουσίαση τρέχουσας πρόγνωσης AIS, ταχύτητα στόχου min (κ.)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Μείωση των λιγότερο κρίσιμων στόχων εάν είναι περισσότεροι από ... στόχους" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Εμφάνιση τοπικών ανακοινώσεων (από μηνύματα AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Εμφάνιση στόχων AIS σε πραγματικό μέγεθος" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Ονόματα των στόχων AIS σε κλίματα μεγαλυτερη από 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Χρήση μηνυμάτων θέσης WPL. Ενέργεια όταν ληφθεί:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Αναφορά θέσης APRS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Δημιουργία σημείου" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Το Rollover ποντικιού δείχνει:" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Ενεργοποίηση πληροφοριών διαδρομής/AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Όνομα πλοιου\" MMSI (ΔΔΣ)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Κατηγορία] Τύπος (Κατάσταση)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "Ταχύτητα, πορεία (SOG COG)" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "Σημείο/Χρόνος πλησ. προσέγγισης (CPA/TCPA)" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Συναγερμοί CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Διάλογος για συναγερμούς CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Ηχητικό σήμα για συναγερμούς CPA/TCPA και σήματα κινδύνου DSC/SART" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Όχι συναγερμος για αγκυροβολημένους στόχους" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Μέγιστος χρόνος για σίγαση του συναγερμού (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Γενικές επιλογές" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Γλώσσα" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Γραμματοσειρές" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Επιλογή γραμματοσειράς..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Επιλογή χρώματος γραμμάτων..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Δείγμα" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Στιλ του παράθυρου και της λωρίδας εργαλείων" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Επιλογές διεπαφής" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Εμφάνιση της λωρίδας πληροφοριών κατάστασης" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Εμφάνιση της λωρίδας του μενού" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Παράθυρο κατάστασης πυξίδας/GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Επίτρεψε αυτόματη απόκρυψη της λωρίδας των εργαλείων" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Χτύπα το καμπανάκι του πλοίου" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Επιφάνεια αφής" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Ρυθμιζόμενα γραφικά διεπιφάνειας" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Κουμπιά για zoom" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Χρήση Inland ECDIS V2" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Εγχειρίδιο Inland ECDIS" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Κλίμακα διεπιφάνειας χρήστη" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Κλίμακα αντικειμένων χάρτη" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Συντελεστή κλίμακας πλοίο" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "Μέγεθος βυθομετρήσεων σε χάρτες" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "Κλίμακα Κειμένου ENC" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Ευαισθησία ζουμ ρόδας ποντικιού" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Εφαρμογή" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Χάρτες" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Συνδέσεις" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Σύνδεση" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Πλοία" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Διεπιφάνεια χρήστη" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Χρήστης" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Πρόσθετα" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Μαγνητική απόκλιση από τον χρήστη" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "πόδια" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "οργιές" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Πρόσθεσε έναν φάκελο με αρχεία χαρτών" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - το μήκος του πλοίου σας πρέπει να είναι > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - το πλάτος του πλοίου σας πρέπει να είναι > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " -η απόσταση του GPS από τον άξονα του σκάφους πρέπει να είναι εντός του πλάτους του" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " -η απόσταση του GPS από την πλώρη πρέπει να είναι εντός του μήκους του σκάφους" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - το ελάχιστο μήκος του εικονιδίου πρέπει να είναι μεταξύ 1 και 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Οι διαστάσεις του ιδίου πλοίου δεν είναι σωστές:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Το Εγχειρίδιο ECDIS εσωτερικής ναυσιπλοΐας δεν διατίθεται τοπικά." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Θέλετε να πάτε στην ιστοσελίδα του εγχειριδίου του iECDIS για περισσότερες πληροφορίες;" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6879,15 +6891,15 @@ msgstr "Η συμπίεση θα αλλάξει τα αρχεία των χαρ "Συμπιεσμένοι χάρτες μπορεί να χρειαστούν λίγο περισσότερο χρόνο για να φορτώσουν και εμφανιστούν σε ορισμένα συστήματα.\n" "Μπορούν να αποσυμπιεστούν ξανά χρησιμοποιώντας το unxz ή το 7zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Συμπίεση χαρτών" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Δεν βρέθηκαν χάρτες για συμπίεση." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6896,71 +6908,71 @@ msgstr "συμπιέσθηκαν %ld χάρτες\n" " απο %.1fMB σε %.1fMB\n" "εξοικονομήθηκαν %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Όνομα ομάδας: " -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Νέα ομάδα χαρτών" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Επιλογή δεδομένων παλίρροιας/ρευμάτων" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Συμπίεση υφής" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Συμπίεση υφής με απομνημόνευση" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Απομνημόνευση συμπίεσης υφής" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Μέγεθος μνήμης για την υφη (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Μέγεθος: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Ανακατασκευή της μνήμης υφής" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Εκκαθάριση της μνήμης της υφής" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Πολύγωνο εξομάλυνσης" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Απάλυνση γραμμών" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "OpenGL λογισμικό (επανεκκίνηση του OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Γρήγορο panning" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Ρυθμίσεις υφής" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Cache υφής" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Διάφορα" @@ -7042,127 +7054,127 @@ msgstr "Παρακαλούμε ελέγξτε το αρχείο log για πε msgid " successfully installed from cache" msgstr " εγκαταστάθηκε επιτυχώς από τη μνήμη cache" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Αυτές οι ρυθμίσεις ενδέχεται να αποσταθεροποιήσουν το OpenCPN και είναι εξ ορισμού απενεργοποιημένες. Για να τους ενεργοποιήσετε προσθέστε τη γραμμή «CatalogExpert=1» στην ενότητα «PlugIns» στο αρχείο ρυθμίσεων." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Κατάλογος προσθέτων" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Ανανέωση καταλόγου προσθέτων" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Εισαγωγή προσθέτου..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Ρυθμίσεις..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Ανενεργό" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Ανανέωση κύριου καταλόγου προσθέτων" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "Ανανέωση του καταλόγου του OpenCPN" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Αδυναμία αντιγραφής αρχείου καταλόγου" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Αδυναμία αντιγραφής αρχείου καταλόγου στο cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Ο κατάλογος ενημερώθηκε επιτυχώς" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Επιλογή αρχείου tarball" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Σφάλμα στην εισαγωγή του προσθέτου του OpenCPN" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Μη συμβατό πρόσθετο." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Σφάλμα στην εισαγωγή του tarball" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Ενεργός κατάλογος" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Προηγούμενος κατάλογος" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Τελευταία Αλλαγή:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Ανανεώστε τον κατάλογο προσθέτων." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Απεγκατάσταση" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Ενεργοποιήθηκε" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Αναβάθμισε στην έκδοση " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Εγκατάσταση..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Ενημέρωση στο " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Ιστότοπος" @@ -7207,10 +7219,6 @@ msgstr "Δορυφόροι" msgid "OpenCPN Server Message" msgstr "Μήνυμα Διακομιστή OpenCPN" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Το Rollover ποντικιού δείχνει:" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "ΔιάγραμμαΠαλίρροιαςRollover" @@ -7328,12 +7336,6 @@ msgstr "Διαδρομή από ίχνος" msgid "Send to &Peer" msgstr "Αποστολή στο &peer" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Σημεία" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7534,15 +7536,15 @@ msgstr "αλλά η τρέχουσα κλίμακα είναι" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Γι' αυτό το νέο σημείο δεν θα είναι ορατό σε αυτή την κλίμακα." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Τα σημεία εστάλησαν." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Σφάλμα στο ανέβασμα. Το GPS Garmin δεν είναι συνδεδεμένο" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Σφάλμα στο ανέβασμα. Δες τα log αρχεία..." @@ -7847,10 +7849,10 @@ msgstr "(Οι γωνίες των τομέων είναι αληθ msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

Η τελευταία εκτέλεση του Opencpn φαίνεται ότι απέτυχε. Θέλετε να το τρέξετε σε SAFE MODE χωρίς πρόσθετα και άλλες πιθανά προβληματικές υπηρεσίες; \n" "\n" -"



Μπορείτε να επισκευθείτε την λίστα γνωστών προβλημάτων.

" +"



Μπορείτε να επισκευθείτε την λίστα γνωστών προβλημάτων.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7966,7 +7968,7 @@ msgstr "Σήμερα" msgid "Tomorrow" msgstr "Αύριο" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Συμβουλές" @@ -8258,153 +8260,156 @@ msgstr "Μετακίνηση σημείου πορείας" msgid "Dismiss" msgstr "Τέλος" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_en_GB.po b/po/opencpn_en_GB.po index 1dfc4d7f0f..4a426fc360 100644 --- a/po/opencpn_en_GB.po +++ b/po/opencpn_en_GB.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: English, United Kingdom\n" "Language: en_GB\n" @@ -17,14 +17,14 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Unnamed Track)" #: model/include/model/track.h:136 msgid "(Unknown Date)" -msgstr "" +msgstr "(Unknown Date)" #: model/src/ais_decoder.cpp:934 msgid "Vessel, type unknown" @@ -414,7 +414,7 @@ msgstr "SAR Aircraft" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Last Known)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Position" @@ -509,11 +509,11 @@ msgstr "Right" msgid "Left" msgstr "Left" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Speed" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitude" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Wind speed" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Aid to Navigation" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -2263,44 +2263,44 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" #: model/src/navutil_base.cpp:657 msgid "H " -msgstr "" +msgstr "H " #: model/src/navutil_base.cpp:658 msgid "M" -msgstr "" +msgstr "M" #: model/src/navutil_base.cpp:660 msgid "M " -msgstr "" +msgstr "M " #: model/src/navutil_base.cpp:661 msgid "S" -msgstr "" +msgstr "S" #: model/src/navutil_base.cpp:672 gui/src/RoutePropDlgImpl.cpp:355 #: gui/src/RoutePropDlgImpl.cpp:360 msgid "N/A" -msgstr "" +msgstr "N/A" #: model/src/plugin_blacklist.cpp:62 #, c-format @@ -2344,11 +2344,11 @@ msgstr "Plugin library %s can not be loaded" #: model/src/plugin_loader.cpp:168 msgid " [Imported]" -msgstr "" +msgstr " [Imported]" #: model/src/plugin_loader.cpp:170 msgid " [Orphan]" -msgstr "" +msgstr " [Orphan]" #: model/src/plugin_loader.cpp:1454 msgid "\n" @@ -2374,7 +2374,7 @@ msgstr " PlugIn Version detected: " #: model/src/rest_server.cpp:368 msgid "No error" -msgstr "" +msgstr "No error" #: model/src/rest_server.cpp:370 msgid "Server Generic Error" @@ -2394,27 +2394,27 @@ msgstr "Peer internal error (insert)" #: model/src/rest_server.cpp:378 msgid "Peer requests new pincode" -msgstr "" +msgstr "Peer requests new pincode" #: model/src/rest_server.cpp:380 msgid "XML parse error" -msgstr "" +msgstr "XML parse error" #: model/src/rest_server.cpp:382 msgid "Unspecified error" -msgstr "" +msgstr "Unspecified error" #: model/src/rest_server.cpp:518 msgid "wants to send you new data." -msgstr "" +msgstr "wants to send you new data." #: model/src/rest_server.cpp:519 msgid "Please enter the following PIN number on " -msgstr "" +msgstr "Please enter the following PIN number on " #: model/src/rest_server.cpp:520 msgid "to pair with this device" -msgstr "" +msgstr "to pair with this device" #: model/src/rest_server.cpp:646 msgid "The received route already exists on this system.\n" @@ -2425,7 +2425,7 @@ msgstr "The received route already exists on this system.\n" #: model/src/rest_server.cpp:647 model/src/rest_server.cpp:689 #: model/src/rest_server.cpp:730 msgid "Always replace objects?" -msgstr "" +msgstr "Always replace objects?" #: model/src/rest_server.cpp:688 msgid "The received track already exists on this system.\n" @@ -2452,8 +2452,8 @@ msgstr "Waypoints will be renamed to reflect the natural order, the names will b "Do you want to rename the waypoints?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "About OpenCPN" @@ -2493,15 +2493,15 @@ msgstr "Waypoint Properties" #: gui/include/gui/n0183_ctx_factory.h:37 msgid "Overwrite Garmin device route number 1?" -msgstr "" +msgstr "Overwrite Garmin device route number 1?" #: gui/include/gui/n0183_ctx_factory.h:38 msgid "OpenCPN Message" -msgstr "" +msgstr "OpenCPN Message" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Options" @@ -2543,9 +2543,9 @@ msgstr "Print Track Selection" msgid "Track properties" msgstr "Track properties" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" -msgstr "" +msgstr "OpenCPN Initial Configuration" #: gui/src/about.cpp:224 gui/src/about.cpp:268 gui/src/about.cpp:402 #: gui/src/about.cpp:520 gui/src/AISTargetListDialog.cpp:325 @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "Plugin API: " msgid "OpenCPN Website" msgstr "OpenCPN Website" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN Help documentation is not available locally." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Would you like to visit the opencpn.org website for more information?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Cancellation - cancel area as identified by Message Linkage ID" msgid "Undefined (default)" msgstr "Anchorage Area: Vessel transfer operations" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS Target Name" @@ -3089,7 +3089,7 @@ msgstr "\n" "A Persistent track recording will therefore be restarted for this target.\n\n" "Do you instead want to stop Persistent Tracking for this target?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS Alert" @@ -3105,7 +3105,7 @@ msgstr "&Silence Alert" msgid "&Jump To" msgstr "&Jump To" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Create Waypoint" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS target list" @@ -3217,38 +3217,38 @@ msgstr "Target Count" msgid "Undock Target List" msgstr "Undock Target List" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Record Track" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AISTargetQuery" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Stop Tracking" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3302,7 +3302,7 @@ msgstr "Move Boat Here" msgid "Navigate To Here" msgstr "Navigate To Here" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Course Up Mode" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Heading Up Mode" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "North Up Mode" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Chart Up Mode" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Toggle Full Screen" @@ -3346,7 +3346,7 @@ msgstr "Paste Track" msgid "CM93 Offset Dialog..." msgstr "CM93 Offset Dialogue..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Chart Groups" @@ -3459,130 +3459,130 @@ msgstr "Split around Leg" #: gui/src/canvasMenu.cpp:757 gui/src/canvasMenu.cpp:811 #: gui/src/canvasMenu.cpp:866 gui/src/canvasMenu.cpp:917 msgid "Copy as KML" -msgstr "" +msgstr "Copy as KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" -msgstr "" +msgstr "Delete" #: gui/src/canvasMenu.cpp:759 msgid "Reverse..." -msgstr "" +msgstr "Reverse..." #: gui/src/canvasMenu.cpp:763 msgid "Hide Waypoint Names" -msgstr "" +msgstr "Hide Waypoint Names" #: gui/src/canvasMenu.cpp:766 msgid "Show Waypoint Names" -msgstr "" +msgstr "Show Waypoint Names" #: gui/src/canvasMenu.cpp:769 msgid "Resequence Waypoints..." -msgstr "" +msgstr "Resequence Waypoints..." #: gui/src/canvasMenu.cpp:783 gui/src/canvasMenu.cpp:883 msgid "Send to new GPS" -msgstr "" +msgstr "Send to new GPS" #: gui/src/canvasMenu.cpp:804 msgid "Layer Track" -msgstr "" +msgstr "Layer Track" #: gui/src/canvasMenu.cpp:808 gui/src/chcanv.cpp:3955 msgid "Track" -msgstr "" +msgstr "Track" #: gui/src/canvasMenu.cpp:825 msgid "Unnamed Waypoint" -msgstr "" +msgstr "Unnamed Waypoint" #: gui/src/canvasMenu.cpp:833 gui/src/canvasMenu.cpp:906 msgid "Layer Waypoint" -msgstr "" +msgstr "Layer Waypoint" #: gui/src/canvasMenu.cpp:840 msgid "Waypoint" -msgstr "" +msgstr "Waypoint" #: gui/src/canvasMenu.cpp:858 msgid "Remove from Route" -msgstr "" +msgstr "Remove from Route" #: gui/src/canvasMenu.cpp:863 msgid "Split Route at Waypoint" -msgstr "" +msgstr "Split Route at Waypoint" #: gui/src/canvasMenu.cpp:898 msgid "Unnamed Mark" -msgstr "" +msgstr "Unnamed Mark" #: gui/src/canvasMenu.cpp:910 msgid "Mark" -msgstr "" +msgstr "Mark" #: gui/src/canvasMenu.cpp:915 msgid "Navigate To This" -msgstr "" +msgstr "Navigate To This" #: gui/src/canvasMenu.cpp:940 msgid "Clear Anchor Watch" -msgstr "" +msgstr "Clear Anchor Watch" #: gui/src/canvasMenu.cpp:951 msgid "Set Anchor Watch" -msgstr "" +msgstr "Set Anchor Watch" #: gui/src/canvasMenu.cpp:992 msgid "Main Menu" -msgstr "" +msgstr "Main Menu" #: gui/src/canvasMenu.cpp:1005 msgid "Show Tide Information" -msgstr "" +msgstr "Show Tide Information" #: gui/src/canvasMenu.cpp:1011 msgid "Show Current Information" -msgstr "" +msgstr "Show Current Information" #: gui/src/canvasMenu.cpp:1193 msgid "Temporary GOTO Route" -msgstr "" +msgstr "Temporary GOTO Route" #: gui/src/canvasMenu.cpp:1194 gui/src/canvasMenu.cpp:1265 #: gui/src/routemanagerdialog.cpp:2815 msgid "Here" -msgstr "" +msgstr "Here" #: gui/src/canvasMenu.cpp:1196 msgid "There" -msgstr "" +msgstr "There" #: gui/src/canvasMenu.cpp:1261 gui/src/routemanagerdialog.cpp:2438 #: gui/src/routemanagerdialog.cpp:2811 msgid "(Unnamed Waypoint)" -msgstr "" +msgstr "(Unnamed Waypoint)" #: gui/src/canvasMenu.cpp:1262 gui/src/routemanagerdialog.cpp:2812 msgid "Go to " -msgstr "" +msgstr "Go to " #: gui/src/canvasMenu.cpp:1496 gui/src/canvasMenu.cpp:1530 #: gui/src/routemanagerdialog.cpp:1535 msgid "Rename Waypoints?" -msgstr "" +msgstr "Rename Waypoints?" #: gui/src/canvasMenu.cpp:1547 msgid "Are you sure you want to delete this route?" -msgstr "" +msgstr "Are you sure you want to delete this route?" #: gui/src/canvasMenu.cpp:1548 msgid "OpenCPN Route Delete" -msgstr "" +msgstr "OpenCPN Route Delete" #: gui/src/canvasMenu.cpp:1679 gui/src/RoutePropDlgImpl.cpp:1047 #: gui/src/TrackPropDlg.cpp:1318 @@ -3596,247 +3596,247 @@ msgstr "" #: gui/src/canvasMenu.cpp:1766 msgid "Send Waypoint to OpenCPN Peer" -msgstr "" +msgstr "Send Waypoint to OpenCPN Peer" #: gui/src/canvasMenu.cpp:1817 msgid "Send Route to OpenCPN Peer" -msgstr "" +msgstr "Send Route to OpenCPN Peer" #: gui/src/canvasMenu.cpp:1907 msgid "Are you sure you want to delete this track?" -msgstr "" +msgstr "Are you sure you want to delete this track?" #: gui/src/canvasMenu.cpp:1908 gui/src/routeman_gui.cpp:263 msgid "OpenCPN Track Delete" -msgstr "" +msgstr "OpenCPN Track Delete" #: gui/src/canvasMenu.cpp:1956 msgid "Send Track to OpenCPN Peer" -msgstr "" +msgstr "Send Track to OpenCPN Peer" #: gui/src/CanvasOptions.cpp:111 msgid "Chart Panel Options" -msgstr "" +msgstr "Chart Panel Options" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" -msgstr "" +msgstr "Navigation Mode" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "North Up" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" -msgstr "" +msgstr "Course Up" #: gui/src/CanvasOptions.cpp:160 msgid "Heading Up" msgstr "Heading Up" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Look Ahead Mode" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" -msgstr "" +msgstr "Display Options" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" -msgstr "" +msgstr "Enable Chart Quilting" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" -msgstr "" +msgstr "Show Grid" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" -msgstr "" +msgstr "Show Chart Outlines" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" -msgstr "" +msgstr "Show Depth Units" #: gui/src/CanvasOptions.cpp:218 msgid "Show AIS targets" -msgstr "" +msgstr "Show AIS targets" #: gui/src/CanvasOptions.cpp:225 msgid "Minimize less critical targets" -msgstr "" +msgstr "Minimise less critical targets" #: gui/src/CanvasOptions.cpp:236 msgid "Tides and Currents" -msgstr "" +msgstr "Tides and Currents" #: gui/src/CanvasOptions.cpp:241 msgid "Show Tide stations" -msgstr "" +msgstr "Show Tide stations" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" -msgstr "" +msgstr "Show Currents" #: gui/src/CanvasOptions.cpp:259 msgid "Vector Charts" -msgstr "" +msgstr "Vector Charts" #: gui/src/CanvasOptions.cpp:263 msgid "Show text" -msgstr "" +msgstr "Show text" #: gui/src/CanvasOptions.cpp:270 msgid "Show depths" -msgstr "" +msgstr "Show depths" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" -msgstr "" +msgstr "Buoy/Light Labels" #: gui/src/CanvasOptions.cpp:284 msgid "Lights" -msgstr "" +msgstr "Lights" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" -msgstr "" +msgstr "Light Descriptions" #: gui/src/CanvasOptions.cpp:298 msgid "Anchoring Info" -msgstr "" +msgstr "Anchoring Info" #: gui/src/CanvasOptions.cpp:306 msgid "Show visible sector lights" -msgstr "" +msgstr "Show visible sector lights" #: gui/src/CanvasOptions.cpp:314 msgid "Show chart data quality" -msgstr "" +msgstr "Show chart data quality" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" -msgstr "" +msgstr "Display Category" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" -msgstr "" +msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" -msgstr "" +msgstr "All" #: gui/src/CanvasOptions.cpp:327 msgid "User Standard" -msgstr "" +msgstr "User Standard" #: gui/src/catalog_mgr.cpp:92 msgid "Manage Plugin Catalog" -msgstr "" +msgstr "Manage Plugin Catalogue" #: gui/src/catalog_mgr.cpp:102 msgid "Ultra advanced" -msgstr "" +msgstr "Ultra advanced" #: gui/src/catalog_mgr.cpp:129 gui/src/cat_settings.cpp:228 #: gui/src/download_mgr.cpp:378 msgid "Done" -msgstr "" +msgstr "Done" #: gui/src/catalog_mgr.cpp:190 msgid "Catalog URL status: " -msgstr "" +msgstr "Catalogue URL status: " #: gui/src/catalog_mgr.cpp:193 msgid "Error" -msgstr "" +msgstr "Error" #: gui/src/catalog_mgr.cpp:222 msgid "Current active plugin catalog" -msgstr "" +msgstr "Current active plugin catalogue" #: gui/src/catalog_mgr.cpp:229 msgid "Default catalog" -msgstr "" +msgstr "Default catalogue" #: gui/src/catalog_mgr.cpp:232 gui/src/catalog_mgr.cpp:242 msgid "Use as active catalog" -msgstr "" +msgstr "Use as active catalogue" #: gui/src/catalog_mgr.cpp:239 msgid "Latest available catalog:" -msgstr "" +msgstr "Latest available catalogue:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" -msgstr "" +msgstr "Cannot download data from URL" #: gui/src/catalog_mgr.cpp:296 msgid "Cannot parse downloaded data" -msgstr "" +msgstr "Cannot parse downloaded data" #: gui/src/catalog_mgr.cpp:299 msgid "Catalog update problem" -msgstr "" +msgstr "Catalogue update problem" #: gui/src/catalog_mgr.cpp:345 msgid "Use default location" -msgstr "" +msgstr "Use default location" #: gui/src/catalog_mgr.cpp:350 msgid "Save" -msgstr "" +msgstr "Save" #: gui/src/catalog_mgr.cpp:384 msgid "Catalog channel: " -msgstr "" +msgstr "Catalogue channel: " #: gui/src/catalog_mgr.cpp:418 msgid "Custom catalog URL: " -msgstr "" +msgstr "Custom catalogue URL: " #: gui/src/catalog_mgr.cpp:467 gui/src/catalog_mgr.cpp:565 msgid "Check latest release..." -msgstr "" +msgstr "Check latest release..." #: gui/src/catalog_mgr.cpp:497 msgid "Catalog updated" -msgstr "" +msgstr "Catalogue updated" #: gui/src/catalog_mgr.cpp:561 msgid "Server is reachable..." -msgstr "" +msgstr "Server is reachable..." #: gui/src/catalog_mgr.cpp:563 msgid "Check channel..." -msgstr "" +msgstr "Check channel..." #: gui/src/catalog_mgr.cpp:571 msgid "Custom URL" -msgstr "" +msgstr "Custom URL" #: gui/src/catalog_mgr.cpp:589 msgid "Fail: " -msgstr "" +msgstr "Fail: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -3848,394 +3848,394 @@ msgstr "Cancel" #: gui/src/catalog_mgr.cpp:630 gui/src/catalog_mgr.cpp:655 msgid "Catalog Manager" -msgstr "" +msgstr "Catalogue Manager" #: gui/src/cat_settings.cpp:91 msgid "Select new flavour" -msgstr "" +msgstr "Select new flavour" #: gui/src/cat_settings.cpp:92 msgid "Default setting" -msgstr "" +msgstr "Default setting" #: gui/src/cat_settings.cpp:162 msgid "Active catalog" -msgstr "" +msgstr "Active catalogue" #: gui/src/cat_settings.cpp:164 msgid "Select plugin catalog" -msgstr "" +msgstr "Select plugin catalogue" #: gui/src/cat_settings.cpp:176 msgid "Compatibility" -msgstr "" +msgstr "Compatibility" #: gui/src/cat_settings.cpp:178 msgid "Active setting:" -msgstr "" +msgstr "Active setting:" #: gui/src/cat_settings.cpp:190 msgid "Cache" -msgstr "" +msgstr "Cache" #: gui/src/cat_settings.cpp:199 msgid "Clear cache" -msgstr "" +msgstr "Clear cache" #: gui/src/cat_settings.cpp:216 #, c-format msgid "Size: %d MB in %d files" -msgstr "" +msgstr "Size: %d MB in %d files" #: gui/src/cat_settings.cpp:236 msgid "Plugin Catalog Settings" -msgstr "" +msgstr "Plugin Catalogue Settings" #: gui/src/chartdbs.cpp:1321 msgid " ChartFile: " -msgstr "" +msgstr " ChartFile: " #: gui/src/chartdbs.cpp:1339 msgid " Name: " -msgstr "" +msgstr " Name: " #: gui/src/chartdbs.cpp:1363 gui/src/chartdbs.cpp:1365 gui/src/chcanv.cpp:5419 #: gui/src/chcanv.cpp:5422 gui/src/chcanv.cpp:5426 gui/src/chcanv.cpp:5429 #: gui/src/chcanv.cpp:5432 gui/src/chcanv.cpp:5458 #: gui/src/routemanagerdialog.cpp:750 msgid "Scale" -msgstr "" +msgstr "Scale" #: gui/src/chartdbs.cpp:1374 msgid " ID: " -msgstr "" +msgstr " ID: " #: gui/src/chartdbs.cpp:1382 msgid " Depth Units: " -msgstr "" +msgstr " Depth Units: " #: gui/src/chartdbs.cpp:1390 msgid " Soundings: " -msgstr "" +msgstr " Soundings: " #: gui/src/chartdbs.cpp:1398 msgid " Datum: " -msgstr "" +msgstr " Datum: " #: gui/src/chartdbs.cpp:1406 msgid " Projection: " -msgstr "" +msgstr " Projection: " #: gui/src/chartdbs.cpp:1410 msgid "Mercator" -msgstr "" +msgstr "Mercator" #: gui/src/chartdbs.cpp:1412 msgid "Transverse Mercator" -msgstr "" +msgstr "Transverse Mercator" #: gui/src/chartdbs.cpp:1414 msgid "Polyconic" -msgstr "" +msgstr "Polyconic" #: gui/src/chartdbs.cpp:1416 msgid "Web Mercator (EPSG:3857)" -msgstr "" +msgstr "Web Mercator (EPSG:3857)" #: gui/src/chartdbs.cpp:1424 msgid " Source Edition: " -msgstr "" +msgstr " Source Edition: " #: gui/src/chartdbs.cpp:1434 msgid " Updated: " -msgstr "" +msgstr " Updated: " #: gui/src/chartdbs.cpp:1668 msgid "OpenCPN Chart Scan...." -msgstr "" +msgstr "OpenCPN Chart Scan...." #: gui/src/chartdbs.cpp:1708 msgid "OpenCPN Directory Scan...." -msgstr "" +msgstr "OpenCPN Directory Scan...." #: gui/src/chartdbs.cpp:2063 msgid "OpenCPN Chart Add...." -msgstr "" +msgstr "OpenCPN Chart Add...." #: gui/src/chcanv.cpp:1364 gui/src/chcanv.cpp:1379 msgid "Group \"" -msgstr "" +msgstr "Group \"" #: gui/src/chcanv.cpp:1369 msgid "\" is empty." -msgstr "" +msgstr "\" is empty." #: gui/src/chcanv.cpp:1371 gui/src/chcanv.cpp:1386 msgid "OpenCPN Group Notice" -msgstr "" +msgstr "OpenCPN Group Notice" #: gui/src/chcanv.cpp:1384 msgid "\" is empty, switching to \"All Active Charts\" group." -msgstr "" +msgstr "\" is empty, switching to \"All Active Charts\" group." #: gui/src/chcanv.cpp:3782 gui/src/chcanv.cpp:10758 msgid "Layer Route: " -msgstr "" +msgstr "Layer Route: " #: gui/src/chcanv.cpp:3785 gui/src/chcanv.cpp:3960 msgid "(unnamed)" -msgstr "" +msgstr "(unnamed)" #: gui/src/chcanv.cpp:3789 msgid "Total Length: " -msgstr "" +msgstr "Total Length: " #: gui/src/chcanv.cpp:3791 msgid "Leg: from " -msgstr "" +msgstr "Leg: from " #: gui/src/chcanv.cpp:3791 msgid " to " -msgstr "" +msgstr " to " #: gui/src/chcanv.cpp:3841 msgid "From Ship To" -msgstr "" +msgstr "From Ship To" #: gui/src/chcanv.cpp:3863 gui/src/concanv.cpp:388 msgid "%Dd %H:%M" -msgstr "" +msgstr "%Dd %H:%M" #: gui/src/chcanv.cpp:3864 msgid "%H:%M" -msgstr "" +msgstr "%H:%M" #: gui/src/chcanv.cpp:3957 msgid "Layer Track: " -msgstr "" +msgstr "Layer Track: " #: gui/src/chcanv.cpp:3964 msgid "Total Track: " -msgstr "" +msgstr "Total Track: " #: gui/src/chcanv.cpp:3981 msgid "Segment Created: " -msgstr "" +msgstr "Segment Created: " #: gui/src/chcanv.cpp:5449 gui/src/ocpn_frame.cpp:2116 #: gui/src/ocpn_frame.cpp:2139 gui/src/OCPNPlatform.cpp:1722 msgid "StatusBar" -msgstr "" +msgstr "StatusBar" #: gui/src/chcanv.cpp:6599 msgid "ON" -msgstr "" +msgstr "ON" #: gui/src/chcanv.cpp:6602 msgid "OFF" -msgstr "" +msgstr "OFF" #: gui/src/chcanv.cpp:6610 msgid "CPA Alarm is switched" -msgstr "" +msgstr "CPA Alarm is switched" #: gui/src/chcanv.cpp:6778 msgid "Composite of " -msgstr "" +msgstr "Composite of " #: gui/src/chcanv.cpp:6783 msgid "charts" -msgstr "" +msgstr "charts" #: gui/src/chcanv.cpp:6785 msgid "chart" -msgstr "" +msgstr "chart" #: gui/src/chcanv.cpp:6789 msgid "Chart scale" -msgstr "" +msgstr "Chart scale" #: gui/src/chcanv.cpp:6796 msgid "Zoom in for more information" -msgstr "" +msgstr "Zoom in for more information" #: gui/src/chcanv.cpp:7857 gui/src/chcanv.cpp:8430 msgid "Use nearby waypoint?" -msgstr "" +msgstr "Use nearby waypoint?" #: gui/src/chcanv.cpp:7857 gui/src/chcanv.cpp:7895 gui/src/chcanv.cpp:7916 #: gui/src/chcanv.cpp:7978 gui/src/chcanv.cpp:8430 gui/src/chcanv.cpp:8468 #: gui/src/chcanv.cpp:8488 gui/src/chcanv.cpp:8546 gui/src/chcanv.cpp:8940 #: gui/src/chcanv.cpp:8958 gui/src/chcanv.cpp:9200 gui/src/chcanv.cpp:9218 msgid "OpenCPN Route Create" -msgstr "" +msgstr "OpenCPN Route Create" #: gui/src/chcanv.cpp:7887 gui/src/chcanv.cpp:8460 msgid "Insert first part of this route in the new route?" -msgstr "" +msgstr "Insert first part of this route in the new route?" #: gui/src/chcanv.cpp:7891 gui/src/chcanv.cpp:8464 msgid "Insert this route in the new route?" -msgstr "" +msgstr "Insert this route in the new route?" #: gui/src/chcanv.cpp:7906 gui/src/chcanv.cpp:8479 msgid "Append last part of this route to the new route?" -msgstr "" +msgstr "Append last part of this route to the new route?" #: gui/src/chcanv.cpp:7909 gui/src/chcanv.cpp:8482 msgid "Append this route to the new route?" -msgstr "" +msgstr "Append this route to the new route?" #: gui/src/chcanv.cpp:7968 gui/src/chcanv.cpp:8538 msgid "For this leg the Great Circle route is " -msgstr "" +msgstr "For this leg the Great Circle route is " #: gui/src/chcanv.cpp:7970 gui/src/chcanv.cpp:8540 msgid " shorter than rhumbline.\n\n" -msgstr "" +msgstr " shorter than rhumbline.\n\n" #: gui/src/chcanv.cpp:7971 gui/src/chcanv.cpp:8541 msgid "Would you like include the Great Circle routing points for this leg?" -msgstr "" +msgstr "Would you like include the Great Circle routing points for this leg?" #: gui/src/chcanv.cpp:8906 gui/src/chcanv.cpp:9167 msgid "Replace this RoutePoint by the nearby Waypoint?" -msgstr "" +msgstr "Replace this RoutePoint by the nearby Waypoint?" #: gui/src/chcanv.cpp:8908 gui/src/chcanv.cpp:9169 msgid "OpenCPN RoutePoint change" -msgstr "" +msgstr "OpenCPN RoutePoint change" #: gui/src/chcanv.cpp:8933 gui/src/chcanv.cpp:9193 msgid "Last part of route to be appended to dragged route?" -msgstr "" +msgstr "Last part of route to be appended to dragged route?" #: gui/src/chcanv.cpp:8937 gui/src/chcanv.cpp:9197 msgid "Full route to be appended to dragged route?" -msgstr "" +msgstr "Full route to be appended to dragged route?" #: gui/src/chcanv.cpp:8951 gui/src/chcanv.cpp:9211 msgid "First part of route to be inserted into dragged route?" -msgstr "" +msgstr "First part of route to be inserted into dragged route?" #: gui/src/chcanv.cpp:8955 gui/src/chcanv.cpp:9215 msgid "Full route to be inserted into dragged route?" -msgstr "" +msgstr "Full route to be inserted into dragged route?" #: gui/src/chcanv.cpp:8971 gui/src/chcanv.cpp:9231 msgid "Do you really want to delete and replace this WayPoint" -msgstr "" +msgstr "Do you really want to delete and replace this WayPoint" #: gui/src/chcanv.cpp:8973 gui/src/chcanv.cpp:9233 msgid "which has been created manually?" -msgstr "" +msgstr "which has been created manually?" #: gui/src/chcanv.cpp:9745 gui/src/chcanv.cpp:9755 #: gui/src/S57QueryDialog.cpp:104 gui/src/S57QueryDialog.cpp:281 msgid "ObjectQuery" -msgstr "" +msgstr "ObjectQuery" #: gui/src/chcanv.cpp:9910 gui/src/routemanagerdialog.cpp:2687 msgid "Mark Properties" -msgstr "" +msgstr "Mark Properties" #: gui/src/chcanv.cpp:9916 gui/src/routemanagerdialog.cpp:2693 #: gui/src/RoutePropDlgImpl.cpp:518 msgid "Layer" -msgstr "" +msgstr "Layer" #: gui/src/chcanv.cpp:10002 msgid "There is an existing waypoint at the same location as the one you are pasting. Would you like to merge the pasted data with it?\n\n" -msgstr "" +msgstr "There is an existing waypoint at the same location as the one you are pasting. Would you like to merge the pasted data with it?\n\n" #: gui/src/chcanv.cpp:10004 msgid "Answering 'No' will create a new waypoint at the same location." -msgstr "" +msgstr "Answering 'No' will create a new waypoint at the same location." #: gui/src/chcanv.cpp:10005 msgid "Merge waypoint?" -msgstr "" +msgstr "Merge waypoint?" #: gui/src/chcanv.cpp:10070 msgid "There are existing waypoints at the same location as some of the ones you are pasting. Would you like to just merge the pasted data into them?\n\n" -msgstr "" +msgstr "There are existing waypoints at the same location as some of the ones you are pasting. Would you like to just merge the pasted data into them?\n\n" #: gui/src/chcanv.cpp:10073 msgid "Answering 'No' will create all new waypoints for this route." -msgstr "" +msgstr "Answering 'No' will create all new waypoints for this route." #: gui/src/chcanv.cpp:10074 msgid "Merge waypoints?" -msgstr "" +msgstr "Merge waypoints?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" -msgstr "" +msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" -msgstr "" +msgstr "MBTile requires OpenGL to be enabled" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" -msgstr "" +msgstr "Feet" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metres" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" -msgstr "" +msgstr "Fathoms" #: gui/src/chcanv.cpp:12019 msgid "OverZoom" -msgstr "" +msgstr "OverZoom" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" -msgstr "" +msgstr "ExtendedTideIcon" #: gui/src/chcanv.cpp:12719 gui/src/chcanv.cpp:12720 msgid "CurrentValue" -msgstr "" +msgstr "CurrentValue" #: gui/src/chcanv.cpp:12953 gui/src/ocpn_frame.cpp:1071 msgid "AIS Target Query" -msgstr "" +msgstr "AIS Target Query" #: gui/src/chcanv.cpp:13201 msgid "Show all AIS Targets" -msgstr "" +msgstr "Show all AIS Targets" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" -msgstr "" +msgstr "Attenuate less critical AIS targets" #: gui/src/chcanv.cpp:13203 msgid "Hide AIS Targets" -msgstr "" +msgstr "Hide AIS Targets" #: gui/src/chcanv.cpp:13819 msgid "Show This Chart" -msgstr "" +msgstr "Show This Chart" #: gui/src/chcanv.cpp:13824 msgid "Hide This Chart" -msgstr "" +msgstr "Hide This Chart" #: gui/src/cm93.cpp:6236 msgid "OpenCPN CM93 Cell Offset Adjustments" -msgstr "" +msgstr "OpenCPN CM93 Cell Offset Adjustments" #: gui/src/cm93.cpp:6265 msgid "Cell" -msgstr "" +msgstr "Cell" #: gui/src/cm93.cpp:6268 msgid "M_COVR ID" @@ -4243,7 +4243,7 @@ msgstr "" #: gui/src/cm93.cpp:6272 msgid "Cell Scale" -msgstr "" +msgstr "Cell Scale" #: gui/src/cm93.cpp:6276 msgid "wgsox" @@ -4255,425 +4255,428 @@ msgstr "" #: gui/src/cm93.cpp:6284 gui/src/cm93.cpp:6298 msgid "User X Offset" -msgstr "" +msgstr "User X Offset" #: gui/src/cm93.cpp:6288 gui/src/cm93.cpp:6312 msgid "User Y Offset" -msgstr "" +msgstr "User Y Offset" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metres" #: gui/src/concanv.cpp:99 gui/src/concanv.cpp:144 gui/src/concanv.cpp:159 #: gui/src/concanv.cpp:198 gui/src/concanv.cpp:206 msgid "This Leg" -msgstr "" +msgstr "This Leg" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" -msgstr "" +msgstr "Console Legend" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" -msgstr "" +msgstr "Console Value" #: gui/src/concanv.cpp:209 msgid "Full Route" -msgstr "" +msgstr "Full Route" #: gui/src/concanv.cpp:211 msgid "Show Highway" -msgstr "" +msgstr "Show Highway" #: gui/src/concanv.cpp:331 msgid "XTE L" -msgstr "" +msgstr "XTE L" #: gui/src/concanv.cpp:333 msgid "XTE R" -msgstr "" +msgstr "XTE R" #: gui/src/concanv.cpp:347 gui/src/concanv.cpp:412 msgid "TTG @VMG" -msgstr "" +msgstr "TTG @VMG" #: gui/src/concanv.cpp:349 gui/src/concanv.cpp:415 msgid "TTG @SOG" -msgstr "" +msgstr "TTG @SOG" #: gui/src/concanv.cpp:413 msgid "ETA @VMG" -msgstr "" +msgstr "ETA @VMG" #: gui/src/concanv.cpp:416 msgid "ETA @SOG" -msgstr "" +msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" -msgstr "" +msgstr "Title" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" -msgstr "" +msgstr "Description" #: gui/src/ConfigMgr.cpp:536 msgid "Recovery Template" -msgstr "" +msgstr "Recovery Template" #: gui/src/ConfigMgr.cpp:538 msgid "Apply this template to return to a known safe configuration" -msgstr "" +msgstr "Apply this template to return to a known safe configuration" #: gui/src/connection_edit.cpp:187 msgid "Connection Edit" -msgstr "" +msgstr "Connection Edit" #: gui/src/connection_edit.cpp:202 gui/src/download_mgr.cpp:311 #: gui/src/update_mgr.cpp:306 msgid "More" -msgstr "" +msgstr "More" #: gui/src/connection_edit.cpp:205 gui/src/download_mgr.cpp:314 #: gui/src/update_mgr.cpp:309 msgid "Less" -msgstr "" +msgstr "Less" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" -msgstr "" +msgstr "Edit Selected Connection" #: gui/src/connection_edit.cpp:292 gui/src/conn_params_panel.cpp:442 msgid "Built-in GPS" -msgstr "" +msgstr "Built-in GPS" #: gui/src/connection_edit.cpp:301 msgid "Built-in Bluetooth SPP" -msgstr "" +msgstr "Built-in Bluetooth SPP" #: gui/src/connection_edit.cpp:305 gui/src/connection_edit.cpp:901 msgid "BT Scan" -msgstr "" +msgstr "BT Scan" #: gui/src/connection_edit.cpp:315 msgid "Bluetooth Data Sources" -msgstr "" +msgstr "Bluetooth Data Sources" #: gui/src/connection_edit.cpp:342 msgid "Network Protocol" -msgstr "" +msgstr "Network Protocol" #: gui/src/connection_edit.cpp:380 msgid "Data Protocol" -msgstr "" +msgstr "Data Protocol" #: gui/src/connection_edit.cpp:386 gui/src/connection_edit.cpp:511 msgid "NMEA 0183" -msgstr "" +msgstr "NMEA 0183" #: gui/src/connection_edit.cpp:386 gui/src/connection_edit.cpp:511 msgid "NMEA 2000" -msgstr "" +msgstr "NMEA 2000" #: gui/src/connection_edit.cpp:401 msgid "Address" -msgstr "" +msgstr "Address" #: gui/src/connection_edit.cpp:418 msgid "DataPort" -msgstr "" +msgstr "DataPort" #: gui/src/connection_edit.cpp:437 msgid "socketCAN Source" -msgstr "" +msgstr "socketCAN Source" #: gui/src/connection_edit.cpp:466 msgid "Data port" -msgstr "" +msgstr "Data port" #: gui/src/connection_edit.cpp:481 gui/src/conn_params_panel.cpp:213 msgid "Baudrate" -msgstr "" +msgstr "Baudrate" #: gui/src/connection_edit.cpp:489 msgid "150" -msgstr "" +msgstr "150" #: gui/src/connection_edit.cpp:489 msgid "300" -msgstr "" +msgstr "300" #: gui/src/connection_edit.cpp:489 msgid "600" -msgstr "" +msgstr "600" #: gui/src/connection_edit.cpp:489 msgid "1200" -msgstr "" +msgstr "1200" #: gui/src/connection_edit.cpp:489 msgid "2400" -msgstr "" +msgstr "2400" #: gui/src/connection_edit.cpp:490 msgid "4800" -msgstr "" +msgstr "4800" #: gui/src/connection_edit.cpp:490 msgid "9600" -msgstr "" +msgstr "9600" #: gui/src/connection_edit.cpp:490 msgid "19200" -msgstr "" +msgstr "19200" #: gui/src/connection_edit.cpp:490 msgid "38400" -msgstr "" +msgstr "38400" #: gui/src/connection_edit.cpp:490 msgid "57600" -msgstr "" +msgstr "57600" #: gui/src/connection_edit.cpp:491 msgid "115200" -msgstr "" +msgstr "115200" #: gui/src/connection_edit.cpp:491 msgid "230400" -msgstr "" +msgstr "230400" #: gui/src/connection_edit.cpp:491 msgid "460800" -msgstr "" +msgstr "460800" #: gui/src/connection_edit.cpp:491 msgid "921600" -msgstr "" +msgstr "921600" #: gui/src/connection_edit.cpp:506 gui/src/conn_params_panel.cpp:201 #: gui/src/conn_params_panel.cpp:293 msgid "Protocol" -msgstr "" +msgstr "Protocol" #: gui/src/connection_edit.cpp:532 gui/src/connection_edit.cpp:547 msgid "User Comment" -msgstr "" +msgstr "User Comment" #: gui/src/connection_edit.cpp:560 msgid "List position" -msgstr "" +msgstr "List position" #: gui/src/connection_edit.cpp:565 msgid "0" -msgstr "" +msgstr "0" #: gui/src/connection_edit.cpp:565 msgid "1" -msgstr "" +msgstr "1" #: gui/src/connection_edit.cpp:565 msgid "2" -msgstr "" +msgstr "2" #: gui/src/connection_edit.cpp:565 msgid "3" -msgstr "" +msgstr "3" #: gui/src/connection_edit.cpp:565 msgid "4" -msgstr "" +msgstr "4" #: gui/src/connection_edit.cpp:566 msgid "5" -msgstr "" +msgstr "5" #: gui/src/connection_edit.cpp:566 msgid "6" -msgstr "" +msgstr "6" #: gui/src/connection_edit.cpp:566 msgid "7" -msgstr "" +msgstr "7" #: gui/src/connection_edit.cpp:566 msgid "8" -msgstr "" +msgstr "8" #: gui/src/connection_edit.cpp:566 msgid "9" -msgstr "" +msgstr "9" #: gui/src/connection_edit.cpp:588 msgid "Receive Input on this Port" -msgstr "" +msgstr "Receive Input on this Port" #: gui/src/connection_edit.cpp:595 msgid "Output on this port" -msgstr "" +msgstr "Output on this port" #: gui/src/connection_edit.cpp:596 msgid "as autopilot or NMEA repeater" -msgstr "" +msgstr "as autopilot or NMEA repeater" #: gui/src/connection_edit.cpp:603 msgid "Auth Token" -msgstr "" +msgstr "Auth Token" #: gui/src/connection_edit.cpp:617 msgid "Control checksum" -msgstr "" +msgstr "Control checksum" #: gui/src/connection_edit.cpp:621 msgid "If checked, only the sentences with a valid checksum are passed through" -msgstr "" +msgstr "If checked, only the sentences with a valid checksum are passed through" #: gui/src/connection_edit.cpp:627 msgid "Use Garmin (GRMN) mode for input" -msgstr "" +msgstr "Use Garmin (GRMN) mode for input" #: gui/src/connection_edit.cpp:637 msgid " UDP Multicast" -msgstr "" +msgstr " UDP Multicast" #: gui/src/connection_edit.cpp:646 msgid "APB bearing precision" -msgstr "" +msgstr "APB bearing precision" #: gui/src/connection_edit.cpp:652 msgid "x" -msgstr "" +msgstr "x" #: gui/src/connection_edit.cpp:652 msgid "x.x" -msgstr "" +msgstr "x.x" #: gui/src/connection_edit.cpp:652 msgid "x.xx" -msgstr "" +msgstr "x.xx" #: gui/src/connection_edit.cpp:653 msgid "x.xxx" -msgstr "" +msgstr "x.xxx" #: gui/src/connection_edit.cpp:653 msgid "x.xxxx" -msgstr "" +msgstr "x.xxxx" #: gui/src/connection_edit.cpp:667 msgid "Automatic server discovery" -msgstr "" +msgstr "Automatic server discovery" #: gui/src/connection_edit.cpp:671 msgid "If checked, signal K server will be discovered automatically" -msgstr "" +msgstr "If checked, Signal K server will be discovered automatically" #: gui/src/connection_edit.cpp:677 msgid "Discover now..." -msgstr "" +msgstr "Discover now..." #: gui/src/connection_edit.cpp:688 msgid "Input filtering" -msgstr "" +msgstr "Input filtering" #: gui/src/connection_edit.cpp:697 gui/src/connection_edit.cpp:2459 msgid "Accept only sentences" -msgstr "" +msgstr "Accept only sentences" #: gui/src/connection_edit.cpp:702 gui/src/connection_edit.cpp:2460 msgid "Ignore sentences" -msgstr "" +msgstr "Ignore sentences" #: gui/src/connection_edit.cpp:725 msgid "Output filtering" -msgstr "" +msgstr "Output filtering" #: gui/src/connection_edit.cpp:733 gui/src/connection_edit.cpp:2457 msgid "Transmit sentences" -msgstr "" +msgstr "Transmit sentences" #: gui/src/connection_edit.cpp:737 gui/src/connection_edit.cpp:2457 msgid "Drop sentences" -msgstr "" +msgstr "Drop sentences" #: gui/src/connection_edit.cpp:847 msgid "Stop Scan" -msgstr "" +msgstr "Stop Scan" #: gui/src/connection_edit.cpp:1629 msgid "Signal K server available." -msgstr "" +msgstr "Signal K server available." #: gui/src/connection_edit.cpp:1631 msgid "Signal K server not found." -msgstr "" +msgstr "Signal K server not found." #: gui/src/connection_edit.cpp:1748 msgid "There is an enabled UDP input connection that uses the same data port." -msgstr "" +msgstr "There is an enabled UDP input connection that uses the same data port." #: gui/src/connection_edit.cpp:1751 msgid "Please apply a filter on both connections to avoid a feedback loop." -msgstr "" +msgstr "Please apply a filter on both connections to avoid a feedback loop." #: gui/src/connection_edit.cpp:1756 msgid "There is a disabled UDP Input connection that uses the same Dataport." -msgstr "" +msgstr "There is a disabled UDP Input connection that uses the same Dataport." #: gui/src/connection_edit.cpp:1760 msgid "If you enable that input please apply a filter on both connections to avoid a feedback loop." -msgstr "" +msgstr "If you enable that input please apply a filter on both connections to avoid a feedback loop." #: gui/src/connection_edit.cpp:1764 msgid "Or consider using a different data port for one of them" -msgstr "" +msgstr "Or consider using a different data port for one of them" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN Warning" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN info" #: gui/src/connection_edit.cpp:2395 msgid "Sentence Filter" -msgstr "" +msgstr "Sentence Filter" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" -msgstr "" +msgstr "Select All" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" -msgstr "" +msgstr "Clear All" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" -msgstr "" +msgstr "Add" #: gui/src/connection_edit.cpp:2525 msgid "Enter the NMEA sentence (2, 3 or 5 characters)\n" " or a valid REGEX expression (6 characters or longer)" -msgstr "" +msgstr "Enter the NMEA sentence (2, 3 or 5 characters)\n" +" or a valid REGEX expression (6 characters or longer)" #: gui/src/connection_edit.cpp:2527 msgid "Enter the NMEA sentence" -msgstr "" +msgstr "Enter the NMEA sentence" #: gui/src/connection_edit.cpp:2546 msgid "An NMEA sentence is generally 3 characters long (like RMC, GGA etc.)\n" @@ -4681,80 +4684,84 @@ msgid "An NMEA sentence is generally 3 characters long (like RMC, GGA etc.)\n" " The whole sentences then looks like GPGGA or AITXT.\n" " You may filter out all the sentences with certain TALKER prefix (like GP, AI etc.).\n" " The filter also accepts Regular Expressions (REGEX) with 6 or more characters. \n\n" -msgstr "" +msgstr "An NMEA sentence is generally 3 characters long (like RMC, GGA etc.)\n" +" It can also have a two letter prefix identifying the source, or TALKER, of the message.\n" +" The whole sentences then looks like GPGGA or AITXT.\n" +" You may filter out all the sentences with certain TALKER prefix (like GP, AI etc.).\n" +" The filter also accepts Regular Expressions (REGEX) with 6 or more characters. \n\n" #: gui/src/connection_edit.cpp:2563 msgid "REGEX syntax error: \n" -msgstr "" +msgstr "REGEX syntax error: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" -msgstr "" +msgstr "General" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" -msgstr "" +msgstr "Filter NMEA Course and Speed data" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" -msgstr "" +msgstr "Filter period (sec)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" -msgstr "" +msgstr "Show NMEA Debug Window" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" -msgstr "" +msgstr "Format uploads for Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" -msgstr "" +msgstr "Use Garmin GRMN (Host) mode for uploads" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" -msgstr "" +msgstr "Use magnetic bearings in output sentence APB" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." -msgstr "" +msgstr "Adjust communication priorities..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "NMEA0183 Talker ID" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" -msgstr "" +msgstr "Data Connections" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." -msgstr "" +msgstr "Add Connection..." -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." -msgstr "" +msgstr "Edit Connection..." -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" -msgstr "" +msgstr "Remove Connection" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" -msgstr "" +msgstr "Configure new connection" #: gui/src/conn_params_panel.cpp:163 msgid "Enable" -msgstr "" +msgstr "Enable" #: gui/src/conn_params_panel.cpp:195 gui/src/conn_params_panel.cpp:287 #: gui/src/conn_params_panel.cpp:417 gui/src/conn_params_panel.cpp:520 msgid "Direction" -msgstr "" +msgstr "Direction" #: gui/src/conn_params_panel.cpp:207 msgid "Serial Port" -msgstr "" +msgstr "Serial Port" #: gui/src/conn_params_panel.cpp:260 gui/src/conn_params_panel.cpp:391 #: gui/src/conn_params_panel.cpp:495 gui/src/conn_params_panel.cpp:598 @@ -4762,448 +4769,476 @@ msgstr "" #: gui/src/conn_params_panel.cpp:771 gui/src/conn_params_panel.cpp:773 #: gui/src/conn_params_panel.cpp:777 gui/src/conn_params_panel.cpp:781 msgid "Comment: " -msgstr "" +msgstr "Comment: " #: gui/src/conn_params_panel.cpp:299 msgid "Network Address" -msgstr "" +msgstr "Network Address" #: gui/src/conn_params_panel.cpp:305 msgid "Network Port" -msgstr "" +msgstr "Network Port" #: gui/src/conn_params_panel.cpp:545 msgid "Built-in Bluetooth" -msgstr "" +msgstr "Built-in Bluetooth" #: gui/src/conn_params_panel.cpp:620 msgid "Driver" -msgstr "" +msgstr "Driver" #: gui/src/DetailSlider.cpp:88 msgid "CM93 Detail Level" -msgstr "" +msgstr "CM93 Detail Level" #: gui/src/DetailSlider.cpp:92 msgid "Rasterchart Zoom/Scale Weighting" -msgstr "" +msgstr "Rasterchart Zoom/Scale Weighting" #: gui/src/DetailSlider.cpp:96 msgid "Vectorchart Zoom/Scale Weighting" -msgstr "" +msgstr "Vectorchart Zoom/Scale Weighting" #: gui/src/download_mgr.cpp:207 gui/src/update_mgr.cpp:208 msgid "Install" -msgstr "" +msgstr "Install" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" -msgstr "" +msgstr "Reinstall" #: gui/src/download_mgr.cpp:266 gui/src/update_mgr.cpp:242 msgid "Update" -msgstr "" +msgstr "Update" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" -msgstr "" +msgstr "Downgrade" #: gui/src/download_mgr.cpp:387 msgid "Update plugin catalog" -msgstr "" +msgstr "Update plugin catalogue" #: gui/src/download_mgr.cpp:400 msgid "Advanced catalog update..." -msgstr "" +msgstr "Advanced catalogue update..." #: gui/src/download_mgr.cpp:479 gui/src/update_mgr.cpp:469 msgid "Plugin Manager" -msgstr "" +msgstr "Plugin Manager" #: gui/src/download_mgr.cpp:513 msgid "Downloading " -msgstr "" +msgstr "Downloading " #: gui/src/download_mgr.cpp:516 msgid "Downloading" -msgstr "" +msgstr "Downloading" #: gui/src/download_mgr.cpp:572 msgid " successfully installed" -msgstr "" +msgstr " successfully installed" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" -msgstr "" +msgstr "Installation complete" #: gui/src/download_mgr.cpp:589 gui/src/pluginmanager.cpp:1113 msgid "Installation error" -msgstr "" +msgstr "Installation error" + +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Marks" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AISRollover" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "ChartTexts" #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" -msgstr "" +msgstr "GridText" #: gui/src/glChartCanvas.cpp:4528 msgid "Waiting for raster chart compression thread exit." -msgstr "" +msgstr "Waiting for raster chart compression thread exit." #: gui/src/glTextureManager.cpp:1468 msgid "OpenCPN Compressed Cache Update" -msgstr "" +msgstr "OpenCPN Compressed Cache Update" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" -msgstr "" +msgstr "Distance from Ownship: %4.0f NMi" #: gui/src/GoToPositionDialog.cpp:120 gui/src/MarkInfo.cpp:404 #: gui/src/RoutePropDlg.cpp:373 gui/src/TrackPropDlg.cpp:307 msgid "Latitude" -msgstr "" +msgstr "Latitude" #: gui/src/GoToPositionDialog.cpp:132 gui/src/MarkInfo.cpp:415 #: gui/src/RoutePropDlg.cpp:377 gui/src/TrackPropDlg.cpp:308 msgid "Longitude" -msgstr "" +msgstr "Longitude" #: gui/src/kml.cpp:473 msgid "OpenCPN Route" -msgstr "" +msgstr "OpenCPN Route" #: gui/src/kml.cpp:517 msgid "OpenCPN Track" -msgstr "" +msgstr "OpenCPN Track" #: gui/src/kml.cpp:566 msgid "OpenCPN Waypoint" -msgstr "" +msgstr "OpenCPN Waypoint" #: gui/src/kml.cpp:637 msgid "Choose Format for Copy" -msgstr "" +msgstr "Choose Format for Copy" #: gui/src/kml.cpp:645 msgid "KML Standard (Google Earth and others)" -msgstr "" +msgstr "KML Standard (Google Earth and others)" #: gui/src/kml.cpp:649 msgid "KML with extended waypoint data (QtVlm)" -msgstr "" +msgstr "KML with extended waypoint data (QtVlm)" #: gui/src/LinkPropDlg.cpp:47 msgid "Link" -msgstr "" +msgstr "Link" #: gui/src/LinkPropDlg.cpp:49 msgid "Link description" -msgstr "" +msgstr "Link description" #: gui/src/LinkPropDlg.cpp:58 msgid "URL" -msgstr "" +msgstr "URL" #: gui/src/LinkPropDlg.cpp:67 msgid "Local file..." -msgstr "" +msgstr "Local file..." #: gui/src/LinkPropDlg.cpp:122 msgid "Choose a file" -msgstr "" +msgstr "Choose a file" #: gui/src/LinkPropDlg.cpp:133 msgid "Link not complete, can't be saved." -msgstr "" +msgstr "Link not complete, can't be saved." #: gui/src/load_errors_dlg.cpp:49 msgid "\n" "The following plugins have encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"The following plugins have encountered errors during startup:\n\n" #: gui/src/load_errors_dlg.cpp:54 msgid "\n" "The following plugin has encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"The following plugin has encountered errors during startup:\n\n" #: gui/src/load_errors_dlg.cpp:59 msgid "\n" "The following libraries have encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"The following libraries have encountered errors during startup:\n\n" #: gui/src/load_errors_dlg.cpp:64 msgid "\n" "The following library has encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"The following library has encountered errors during startup:\n\n" #: gui/src/load_errors_dlg.cpp:68 msgid "\n\n" "These plugins will be uninstalled. You might want to reinstall\n" "them after updating the catalog.\n" -msgstr "" +msgstr "\n\n" +"These plugins will be uninstalled. You might want to reinstall\n" +"them after updating the catalogue.\n" #: gui/src/load_errors_dlg.cpp:74 msgid "\n\n" "This plugin will be uninstalled. You might want to reinstall\n" "it after updating the catalog.\n" -msgstr "" +msgstr "\n\n" +"This plugin will be uninstalled. You might want to reinstall\n" +"it after updating the catalogue.\n" #: gui/src/load_errors_dlg.cpp:80 msgid "\n\n" "These libraries will be removed. You might want to reinstall their\n" "associated plugin after updating the catalog." -msgstr "" +msgstr "\n\n" +"These libraries will be removed. You might want to reinstall their\n" +"associated plugin after updating the catalogue." #: gui/src/load_errors_dlg.cpp:85 msgid "\n\n" "The library will be removed. You might want to reinstall it's\n" "associated plugin after updating the catalog." -msgstr "" +msgstr "\n\n" +"The library will be removed. You might want to reinstall it's\n" +"associated plugin after updating the catalogue." #: gui/src/MarkInfo.cpp:318 gui/src/RoutePropDlg.cpp:416 #: gui/src/TrackPropDlg.cpp:640 msgid "Basic" -msgstr "" +msgstr "Basic" #: gui/src/MarkInfo.cpp:341 msgid "This waypoint is part of a layer and can't be edited" -msgstr "" +msgstr "This waypoint is part of a layer and can't be edited" #: gui/src/MarkInfo.cpp:375 gui/src/MarkInfo.cpp:1883 #: gui/src/routemanagerdialog.cpp:748 msgid "Icon" -msgstr "" +msgstr "Icon" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" #: gui/src/MarkInfo.cpp:456 gui/src/MarkInfo.cpp:469 #: gui/src/RoutePropDlg.cpp:434 gui/src/TrackPropDlg.cpp:883 msgid "Links" -msgstr "" +msgstr "Links" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" -msgstr "" +msgstr "Edit" #: gui/src/MarkInfo.cpp:495 gui/src/MarkInfo.cpp:502 #: gui/src/RoutePropDlg.cpp:459 gui/src/RoutePropDlg.cpp:503 #: gui/src/TrackPropDlg.cpp:902 msgid "Add new" -msgstr "" +msgstr "Add new" #: gui/src/MarkInfo.cpp:543 msgid "Extended" -msgstr "" +msgstr "Extended" #: gui/src/MarkInfo.cpp:547 msgid "Extended Properties" -msgstr "" +msgstr "Extended Properties" #: gui/src/MarkInfo.cpp:557 gui/src/routemanagerdialog.cpp:981 #: gui/src/TrackPropDlg.cpp:380 gui/src/TrackPropDlg.cpp:717 msgid "Show on chart" -msgstr "" +msgstr "Show on chart" #: gui/src/MarkInfo.cpp:566 msgid "Show at scale > 1 :" -msgstr "" +msgstr "Show at scale > 1 :" #: gui/src/MarkInfo.cpp:577 msgid "Show waypoint name" -msgstr "" +msgstr "Show waypoint name" #: gui/src/MarkInfo.cpp:582 gui/src/MarkInfo.cpp:1897 msgid "Range rings" -msgstr "" +msgstr "Range rings" #: gui/src/MarkInfo.cpp:588 msgid "Number" -msgstr "" +msgstr "Number" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" -msgstr "" +msgstr "Distance" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Colour" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" -msgstr "" +msgstr "None" #: gui/src/MarkInfo.cpp:608 msgid "0.05" -msgstr "" +msgstr "0.05" #: gui/src/MarkInfo.cpp:633 msgid "GUID" -msgstr "" +msgstr "GUID" #: gui/src/MarkInfo.cpp:647 msgid "Tide Station" -msgstr "" +msgstr "Tide Station" #: gui/src/MarkInfo.cpp:675 msgid "Arrival Radius" -msgstr "" +msgstr "Arrival Radius" #: gui/src/MarkInfo.cpp:690 msgid "Planned Speed" -msgstr "" +msgstr "Planned Speed" #: gui/src/MarkInfo.cpp:704 msgid "ETD (UTC)" -msgstr "" +msgstr "ETD (UTC)" #: gui/src/MarkInfo.cpp:1170 gui/src/MarkInfo.cpp:1225 msgid "Add New" -msgstr "" +msgstr "Add New" #: gui/src/MarkInfo.cpp:1326 gui/src/TTYWindow.cpp:86 msgid "Copy" -msgstr "" +msgstr "Copy" #: gui/src/MarkInfo.cpp:1327 msgid "Copy lat/long" -msgstr "" +msgstr "Copy lat/long" #: gui/src/MarkInfo.cpp:1328 msgid "Paste" -msgstr "" +msgstr "Paste" #: gui/src/MarkInfo.cpp:1329 msgid "Paste lat/long" -msgstr "" +msgstr "Paste lat/long" #: gui/src/MarkInfo.cpp:1855 msgid "Save some defaults" -msgstr "" +msgstr "Save some defaults" #: gui/src/MarkInfo.cpp:1864 msgid "Check which properties of current waypoint\n" " should be set as default for NEW waypoints." -msgstr "" +msgstr "Check which properties of current waypoint\n" +" should be set as default for NEW waypoints." #: gui/src/MarkInfo.cpp:1871 gui/src/MarkInfo.cpp:1891 msgid "Do use" -msgstr "" +msgstr "Do use" #: gui/src/MarkInfo.cpp:1872 gui/src/MarkInfo.cpp:1896 msgid "Don't use" -msgstr "" +msgstr "Don't use" #: gui/src/MarkInfo.cpp:1874 msgid "Show Waypoint Name" -msgstr "" +msgstr "Show Waypoint Name" #: gui/src/MarkInfo.cpp:1905 msgid "Arrival radius" -msgstr "" +msgstr "Arrival radius" #: gui/src/MarkInfo.cpp:1916 msgid "Show only if" -msgstr "" +msgstr "Show only if" #: gui/src/MarkInfo.cpp:1918 msgid "Show always" -msgstr "" +msgstr "Show always" #: gui/src/MarkInfo.cpp:1919 msgid "Show only at scale" -msgstr "" +msgstr "Show only at scale" #: gui/src/MarkInfo.cpp:1958 msgid "Tide Station not found" -msgstr "" +msgstr "Tide Station not found" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" -msgstr "" +msgstr "Set scale" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" -msgstr "" +msgstr "Chart Scale" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" -msgstr "" +msgstr "Persistent" #: gui/src/navutil.cpp:2935 gui/src/navutil.cpp:3039 msgid "Export GPX file" -msgstr "" +msgstr "Export GPX file" #: gui/src/navutil.cpp:2945 msgid "Overwrite existing file?" -msgstr "" +msgstr "Overwrite existing file?" #: gui/src/navutil.cpp:3129 gui/src/navutil.cpp:3161 msgid "Import GPX file" -msgstr "" +msgstr "Import GPX file" #: gui/src/navutil.cpp:3227 msgid "Temporary" -msgstr "" +msgstr "Temporary" #: gui/src/navutil.cpp:3262 msgid "duplicate waypoints detected during import and ignored." -msgstr "" +msgstr "duplicate waypoints detected during import and ignored." #: gui/src/NMEALogWindow.cpp:59 msgid "NMEA Debug Window" -msgstr "" +msgstr "NMEA Debug Window" #: gui/src/ocpn_app.cpp:798 msgid "Cannot load route or waypoint file: " -msgstr "" +msgstr "Cannot load route or waypoint file: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " -msgstr "" +msgstr "Failed to initialise the user interface. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " -msgstr "" +msgstr "OpenCPN cannot start. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " -msgstr "" +msgstr "The necessary configuration files were not found. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " -msgstr "" +msgstr "See the log file at " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." -msgstr "" +msgstr " for details." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " -msgstr "" +msgstr " -- [Portable(-p) executing from " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" -msgstr "" +msgstr "Retrieving initial Chart Directory set from Windows Registry" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." -msgstr "" +msgstr "OpenCPN Initialised in %ld ms." #: gui/src/ocpn_frame.cpp:453 msgid "\n" @@ -5212,322 +5247,329 @@ msgid "\n" "OpenCPN must only be used in conjunction with approved paper charts and traditional methods of navigation.\n\n" "DO NOT rely upon OpenCPN for safety of life or property.\n\n" "Please click \"OK\" to agree and proceed, \"Cancel\" to quit.\n" -msgstr "" +msgstr "\n" +"OpenCPN 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.\n\n" +"See the GNU General Public Licence for more details.\n\n" +"OpenCPN must only be used in conjunction with approved paper charts and traditional methods of navigation.\n\n" +"DO NOT rely upon OpenCPN for safety of life or property.\n\n" +"Please click \"OK\" to agree and proceed, \"Cancel\" to quit.\n" #: gui/src/ocpn_frame.cpp:467 msgid "OpenCPN for Android" -msgstr "" +msgstr "OpenCPN for Android" #: gui/src/ocpn_frame.cpp:485 msgid "Welcome to OpenCPN" -msgstr "" +msgstr "Welcome to OpenCPN" #: gui/src/ocpn_frame.cpp:718 msgid "This AIS target has Persistent tracking selected by MMSI properties\n" "A Persistent track recording will therefore be restarted for this target.\n\n" "Do you instead want to stop Persistent tracking for this target?" -msgstr "" +msgstr "This AIS target has Persistent tracking selected by MMSI properties\n" +"A Persistent track recording will therefore be restarted for this target.\n\n" +"Do you instead want to stop Persistent tracking for this target?" #: gui/src/ocpn_frame.cpp:865 msgid "OpenCPN needs to update the chart database from config file entries...." -msgstr "" +msgstr "OpenCPN needs to update the chart database from config file entries...." #: gui/src/ocpn_frame.cpp:877 msgid "Rebuilding chart database from configuration file entries..." -msgstr "" +msgstr "Rebuilding chart database from configuration file entries..." #: gui/src/ocpn_frame.cpp:881 msgid "Elapsed time : " -msgstr "" +msgstr "Elapsed time : " #: gui/src/ocpn_frame.cpp:882 msgid "Estimated time : " -msgstr "" +msgstr "Estimated time : " #: gui/src/ocpn_frame.cpp:883 msgid "Remaining time : " -msgstr "" +msgstr "Remaining time : " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" -msgstr "" +msgstr "OpenCPN Chart Update" #: gui/src/ocpn_frame.cpp:1661 msgid "Anchorage created " msgstr "Anchorage created " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" -msgstr "" +msgstr "Show Toolbar" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" -msgstr "" +msgstr "Hide Toolbar" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" -msgstr "" +msgstr "MAN OVERBOARD" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " -msgstr "" +msgstr " at " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " -msgstr "" +msgstr " on " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" -msgstr "" +msgstr "1.0 NM along COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" -msgstr "" +msgstr "Temporary MOB Route" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" -msgstr "" +msgstr "Assumed 1 Mile Point" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " -msgstr "" +msgstr " Time: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " -msgstr "" +msgstr " Position: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" -msgstr "" +msgstr "Disable Tracking" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" -msgstr "" +msgstr "Enable Tracking" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" -msgstr "" +msgstr "Auto Follow" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Head Up Mode" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" -msgstr "" +msgstr "Zoom In" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" -msgstr "" +msgstr "Zoom Out" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" -msgstr "" +msgstr "Larger Scale Chart" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Smaller Scale Chart" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" -msgstr "" +msgstr "Exit OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" -msgstr "" +msgstr "&Navigate" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" -msgstr "" +msgstr "Show Chart Bar" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" -msgstr "" +msgstr "Show ENC text" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" -msgstr "" +msgstr "Show ENC Lights" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" -msgstr "" +msgstr "Show ENC Soundings" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" -msgstr "" +msgstr "Show ENC Anchoring Info" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" -msgstr "" +msgstr "Show ENC Data Quality" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" -msgstr "" +msgstr "Show Navobjects" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" -msgstr "" +msgstr "Show Tides" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Change Colour Scheme" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" -msgstr "" +msgstr "&View" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Show AIS Targets" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Hide Moored AIS Targets" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Show AIS Target Tracks" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Show CPA Alert Dialogues" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Sound CPA Alarms" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Show CPA Warnings" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Measure Distance" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Route && Mark Manager..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Create Route" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Drop Mark at Boat" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Drop Mark at Cursor" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Drop MOB Marker" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preferences" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Tools" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Window" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN Help" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Help" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Please restart OpenCPN to activate language or style changes." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Ship " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Rotated Mode" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Unnamed Route)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS MAN OVERBOARD" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Own ship" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Temporary AISMOB Route" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Present own ship" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Ownship Position: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " MOB Position: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS MAN OVERBOARD UPDATE" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Route & Mark Manager" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Print Chart" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN ENC Prepare" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC Completed." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5535,105 +5577,105 @@ msgstr "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI Extended Properties" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Tracking" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Default tracking" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Always track" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Never track" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignore this MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Handle this MMSI as SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Convert AIVDM to AIVDO for this MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "This MMSI is my Follower - No CPA Alert" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Default" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Always" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Never" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Edit MMSI Properties" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI Properties" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Track Mode" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignore" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Ship name" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Follower" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "New..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Add MMSI Properties" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5651,7 +5693,7 @@ msgstr "The device selected is not accessible; OpenCPN will likely not be able\n " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5671,1180 +5713,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG Predictor Length (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Heading Predictor Length (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Ship Icon Type" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Real Scale Bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Real Scale Vector" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Length Over All (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Width Over All (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS Offset from Bow (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS Offset from Midship (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Minimum Screen Size (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Show range rings" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distance between rings" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Distance Unit" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Nautical miles" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometres" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "Minutes (time)" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Range Ring Colour" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Show direction to Active Waypoint" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Style" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Solid" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Dot" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Long dash" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Short dash" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Dot dash" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Default colour" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Black" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Dark Red" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Dark Green" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Dark Yellow" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Dark Blue" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Dark Magenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Dark Cyan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Light Grey" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Dark Grey" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Red" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Green" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Yellow" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blue" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cyan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "White" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Tracks" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatic Daily Tracks at midnight" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatic Daily Tracks at" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Computer" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Highlight Tracks" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Highlight Colour" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Tracking Precision" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Low" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Medium" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "High" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Calculate values" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Calculate SOG and COG from position changes" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Min seconds between updates" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Routes/Points" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "New Routes" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Active Route" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Persist active route, automatically activate on start up" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Waypoint default icon" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Waypoint Arrival Circle Radius (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Advance route waypoint on arrival only" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "New Marks" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "Mark default icon" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "Show marks only at a chartscale greater than 1 :" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Override the settings for chartscale based visibility and show always" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "Mark range rings" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Waypoint Range Ring Colours" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Control Options" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "Lock marks and waypoints (Unless object property dialogue visible)" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Confirm deletion of tracks and routes" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Chart Files" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Directories" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Add Directory..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Remove Selected" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Compress Selected" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Add.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Remove" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Compress" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Migrate Charts.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Update Control" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Scan Charts and Update Database" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Force Full Database Rebuild" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Prepare all ENC Charts" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Templates" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Template Status" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Last Applied Template Title:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Saved Templates" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Create Config..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Delete Selected Config..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Apply Selected Config" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Create Config" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Problem applying selected configuration." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Advanced" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "De-skew Raster Charts" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Use Accelerated Graphics (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL Options" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Chart Rotation Averaging Time" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "seconds" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Chart Zoom/Scale Weighting" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vector" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 Detail level" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Physical Screen Width" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manual:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Chart Display" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Show Skewed Raster Charts as North-Up" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Graphics" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Chart Bar" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Show extended chart bar information." -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vector Chart Display" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Mariner's Standard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Depth Soundings" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Chart Information Objects" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Buoys/Lights" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Extended Light Sectors" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Chart Texts" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "National text on chart" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Important Text Only" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "De-Cluttered Text" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Chart Detail" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Reduced Detail at Small Scale" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "Additional detail reduction at Small Scale" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Graphics Style" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Paper Chart" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplified" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Boundaries" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Plain" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Symbolised" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Colours" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Colour" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Colour" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Shallow Depth" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Safety Depth" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Deep Depth" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "User Standard Objects" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Reset to STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Tides && Currents" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Active Datasets" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Add Dataset..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "All Available Charts" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Remove Chart" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "All Charts" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "New Group..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Delete Group" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Preserve scale when switching charts" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Controls" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Smooth Panning / Zooming" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom to Cursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Display Features" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Status Bar Option" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Live ETA at Cursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Default Boat Speed " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Canvas Layout" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Status Bar" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Units" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Statute miles" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Knots" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "MPH" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Depth" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperature" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Degrees, Decimal Minutes" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Decimal Degrees" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Degrees, Minutes, Seconds" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Bearings" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Show true" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Show magnetic" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Assumed magnetic variation" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "WindSpeed" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Show true bearings and headings" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Show magnetic bearings and headings." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM Plugin calculated magnetic variation" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " To set the magnetic variation manually,\n" " you must disable the WMM plugin." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Test" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Audio file name:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Select Sound File" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Sounds" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Anchor Alarm" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Play Sound on Anchor Alarm." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Select Anchor Alarm Sound" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Play Sound on AIS Alert." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Select AIS Alert Sound" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART Alert" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Play Sound on AIS SART Alert." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Select AIS SART Alert Sound" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC Alert" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Play Sound on DSC notification." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Select DSC notification Sound" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Sound Device Configuration" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Unknown device :" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Input device :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Sound Device" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Audio Play command:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS Targets" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA Calculation" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "No (T)CPA Alerts if target range is greater than (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Warn if CPA less than (NMi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...and TCPA is less than (min)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Lost Targets" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Mark targets as lost after (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Remove lost targets after (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Display" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Show target COG predictor arrow, length (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Sync AIS arrow length with own ship's COG predictor" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Show target tracks, length (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Suppress anchored/moored targets, speed max (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Draw AIS realtime prediction, target speed min (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Allow attenuation of less critical targets if more than ... targets" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Show area notices (from AIS binary messages)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Show AIS targets real size" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Show names with AIS targets at scale greater than 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Use WPL position messages. Action when received:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS position report" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Create mark" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Rollover" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Enable route/AIS info block" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Ship Name\" MMSI (Call Sign)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Class] Type (Status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA Alerts" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Show CPA/TCPA Alert Dialogue" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Test AIS Alert Sound" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Suppress Alerts for anchored/moored targets" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Enable Target Alert Acknowledge timeout (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "General Options" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Language" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Fonts" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Choose Font..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Choose Font Colour..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Sample" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Toolbar and Window Style" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Interface Options" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Show Status Bar" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Show Menu Bar" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Show Compass/GPS Status Window" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Enable Toolbar auto-hide" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Play Ships Bells" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Enable Touchscreen interface" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Enable Scaled Graphics interface" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Show Zoom buttons" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Use Inland ECDIS" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Inland ECDIS Manual" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "User Interface scale factor" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Chart Object scale factor" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Ship scale factor" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC Sounding factor" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC Text Scale" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Mouse wheel zoom sensitivity" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Apply" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Charts" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Connections" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Connect" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Ships" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "User Interface" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "User" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Plugins" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "User set magnetic variation" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "feet" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "fathoms" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Add a directory containing chart files" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - your ship's length must be > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - your ship's beam must be > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - your GPS offset from midship must be within your ship's beam" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - your GPS offset from bow must be within your ship's length" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - your minimum ship icon size must be between 1 and 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "The settings for own ship real size are not correct:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "The Inland ECDIS Manual is not available locally." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Would you like to visit the iECDIS Manual website for more information?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6854,15 +6891,15 @@ msgstr "Compression will alter chart files on disk.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7zip programs." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Compress Charts" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "No charts found to compress." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6871,71 +6908,71 @@ msgstr "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Enter Group Name" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "New Chart Group" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Select Tide/Current Data" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Texture Compression" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Texture Compression with Caching" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Texture Compression Caching" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Texture Memory Size (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Size: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Rebuild Texture Cache" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Clear Texture Cache" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Polygon Smoothing" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Line Smoothing" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (restart OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Use Accelerated Panning" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Texture Settings" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Texture Cache" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Miscellaneous" @@ -7017,127 +7054,127 @@ msgstr "Please check system log for more info." msgid " successfully installed from cache" msgstr " successfully installed from cache" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "These settings might destabilise OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Plugin Catalogue" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Update Plugin Catalogue" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Import plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Settings..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Disabled" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Update Plugin Catalogue: master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN Catalogue update" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Unable to copy catalogue file" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Unable to copy catalogue file to cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Catalogue update successful" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Select tarball file" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." -msgstr "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" +msgstr "Error extracting metadata from tarball (missing metadata.xml?)" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN Plugin Import Error" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Incompatible import plugin detected." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Error extracting import plugin tarball." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Plugin" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr " successfully imported" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Active Catalogue" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Last Catalogue" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Last change: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Please Update Plugin Catalogue." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Uninstall" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Uninstall plugin " -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Un-Installation" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Enabled" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Upgrade to Version " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Install..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Update to " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Website" @@ -7182,10 +7219,6 @@ msgstr "Satellites" msgid "OpenCPN Server Message" msgstr "OpenCPN Server Message" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AISRollover" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TideCurrentGraphRollover" @@ -7303,12 +7336,6 @@ msgstr "Route from Track" msgid "Send to &Peer" msgstr "Send to &Peer" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Marks" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "Show all marks" @@ -7512,15 +7539,15 @@ msgstr "but current chartscale is" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Therefore the new waypoint will not be visible at this zoom level." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Waypoint(s) Transmitted." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Error on Waypoint Upload. Garmin GPS not connected" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Error on Waypoint Upload. Please check logfiles..." @@ -7825,11 +7852,11 @@ msgstr "(Sector angles are True Bearings from Seaward)
" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7945,7 +7972,7 @@ msgstr "Today" msgid "Tomorrow" msgstr "Tomorrow" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "ToolTips" @@ -8246,153 +8273,156 @@ msgstr "Move Waypoint" msgid "Dismiss" msgstr "Dismiss" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "Select the units and data formats you would like to use." -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr " icon in the main Toolbar." -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "If you already have charts on your system, you may add them here." -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "Additional charts can be obtained using the Chart Downloader integrated in the application." -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "To access the Chart Downloader click on the " -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "NMEA0183: UDP port %d" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "NMEA2000: UDP port %d" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "NMEA0183: %s TCP port %d" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "NMEA2000: %s TCP port %d" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "GPSd: %s TCP port %d" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." -msgstr "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." +msgstr "Looking for navigation data sources, this may take a while..." -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "Scanning USB devices..." -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "Looking for UDP data feeds..." -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "Looking for TCP servers..." -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "Looking for Signal K servers..." + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "Looking for CAN interfaces..." -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "Looking for GPSD servers..." -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "SignalK: %s (%s port %d)" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "The system has been scanned for sources of navigation data." -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "Select a directory containing charts" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "Units and formats" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "Degrees, decimal minutes (DD MM.MM)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "Decimal degrees (DD.DDDDD)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "Degrees, minutes, seconds (DD MM SS)" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "Show true headings and bearings" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "Show magnetic headings and bearings" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "Detected navigation data sources:" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "Rescan..." -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "Add existing charts" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "Add chart directory..." - diff --git a/po/opencpn_es_EM.po b/po/opencpn_es_EM.po deleted file mode 100755 index 46b47da606..0000000000 --- a/po/opencpn_es_EM.po +++ /dev/null @@ -1,8308 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: opencpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" -"Last-Translator: \n" -"Language-Team: Spanish (Modern)\n" -"Language: es_EM\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-Crowdin-Project: opencpn\n" -"X-Crowdin-Project-ID: 49843\n" -"X-Crowdin-Language: es-EM\n" -"X-Crowdin-File: /po/opencpn.pot\n" -"X-Crowdin-File-ID: 102\n" - -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 -msgid "(Unnamed Track)" -msgstr "crwdns2016:0crwdne2016:0" - -#: model/include/model/track.h:136 -msgid "(Unknown Date)" -msgstr "crwdns29182:0crwdne29182:0" - -#: model/src/ais_decoder.cpp:934 -msgid "Vessel, type unknown" -msgstr "crwdns26727:0crwdne26727:0" - -#: model/src/ais_decoder.cpp:935 -msgid "Freightbarge" -msgstr "crwdns26729:0crwdne26729:0" - -#: model/src/ais_decoder.cpp:936 -msgid "Tankbarge" -msgstr "crwdns26731:0crwdne26731:0" - -#: model/src/ais_decoder.cpp:937 -msgid "Tankbarge, dry cargo as if liquid (e.g. cement)" -msgstr "crwdns26733:0crwdne26733:0" - -#: model/src/ais_decoder.cpp:938 -msgid "Service vessel, police patrol, port service" -msgstr "crwdns26735:0crwdne26735:0" - -#: model/src/ais_decoder.cpp:939 model/src/ais_decoder.cpp:993 -msgid "Pushboat, single" -msgstr "crwdns26737:0crwdne26737:0" - -#: model/src/ais_decoder.cpp:940 -msgid "Object, not otherwise specified" -msgstr "crwdns26739:0crwdne26739:0" - -#: model/src/ais_decoder.cpp:941 -msgid "Object, towed, not otherwise specified" -msgstr "crwdns26741:0crwdne26741:0" - -#: model/src/ais_decoder.cpp:942 -msgid "Bunkership" -msgstr "crwdns26743:0crwdne26743:0" - -#: model/src/ais_decoder.cpp:943 -msgid "Motor freighter" -msgstr "crwdns26745:0crwdne26745:0" - -#: model/src/ais_decoder.cpp:944 -msgid "Motor tanker" -msgstr "crwdns26747:0crwdne26747:0" - -#: model/src/ais_decoder.cpp:945 -msgid "Motor tanker, liquid cargo, type N" -msgstr "crwdns26749:0crwdne26749:0" - -#: model/src/ais_decoder.cpp:946 -msgid "Motor tanker, liquid cargo, type C" -msgstr "crwdns26751:0crwdne26751:0" - -#: model/src/ais_decoder.cpp:947 -msgid "Motor tanker, dry cargo as if liquid (e.g. cement)" -msgstr "crwdns26753:0crwdne26753:0" - -#: model/src/ais_decoder.cpp:948 -msgid "Container vessel" -msgstr "crwdns26755:0crwdne26755:0" - -#: model/src/ais_decoder.cpp:949 -msgid "Gas tanker" -msgstr "crwdns26757:0crwdne26757:0" - -#: model/src/ais_decoder.cpp:950 -msgid "Motor freighter, tug" -msgstr "crwdns26759:0crwdne26759:0" - -#: model/src/ais_decoder.cpp:951 -msgid "Motor tanker, tug" -msgstr "crwdns26761:0crwdne26761:0" - -#: model/src/ais_decoder.cpp:952 -msgid "Motor freighter with one or more ships alongside" -msgstr "crwdns26763:0crwdne26763:0" - -#: model/src/ais_decoder.cpp:953 -msgid "Motor freighter with tanker" -msgstr "crwdns26765:0crwdne26765:0" - -#: model/src/ais_decoder.cpp:954 -msgid "Motor freighter pushing one or more freighters" -msgstr "crwdns26767:0crwdne26767:0" - -#: model/src/ais_decoder.cpp:955 -msgid "Motor freighter pushing at least one tank-ship" -msgstr "crwdns26769:0crwdne26769:0" - -#: model/src/ais_decoder.cpp:956 -msgid "Tug, freighter" -msgstr "crwdns26771:0crwdne26771:0" - -#: model/src/ais_decoder.cpp:957 -msgid "Tug, tanker" -msgstr "crwdns26773:0crwdne26773:0" - -#: model/src/ais_decoder.cpp:958 -msgid "Tug freighter, coupled" -msgstr "crwdns26775:0crwdne26775:0" - -#: model/src/ais_decoder.cpp:959 -msgid "Tug, freighter/tanker, coupled" -msgstr "crwdns26777:0crwdne26777:0" - -#: model/src/ais_decoder.cpp:960 -msgid "Tankbarge, liquid cargo, type N" -msgstr "crwdns26779:0crwdne26779:0" - -#: model/src/ais_decoder.cpp:961 -msgid "Tankbarge, liquid cargo, type C" -msgstr "crwdns26781:0crwdne26781:0" - -#: model/src/ais_decoder.cpp:962 -msgid "Freightbarge with containers" -msgstr "crwdns26783:0crwdne26783:0" - -#: model/src/ais_decoder.cpp:963 -msgid "Tankbarge, gas" -msgstr "crwdns26785:0crwdne26785:0" - -#: model/src/ais_decoder.cpp:964 -msgid "Pushtow, one cargo barge" -msgstr "crwdns26787:0crwdne26787:0" - -#: model/src/ais_decoder.cpp:965 -msgid "Pushtow, two cargo barges" -msgstr "crwdns26789:0crwdne26789:0" - -#: model/src/ais_decoder.cpp:966 -msgid "Pushtow, three cargo barges" -msgstr "crwdns26791:0crwdne26791:0" - -#: model/src/ais_decoder.cpp:967 -msgid "Pushtow, four cargo barges" -msgstr "crwdns26793:0crwdne26793:0" - -#: model/src/ais_decoder.cpp:968 -msgid "Pushtow, five cargo barges" -msgstr "crwdns26795:0crwdne26795:0" - -#: model/src/ais_decoder.cpp:969 -msgid "Pushtow, six cargo barges" -msgstr "crwdns26797:0crwdne26797:0" - -#: model/src/ais_decoder.cpp:970 -msgid "Pushtow, seven cargo barges" -msgstr "crwdns26799:0crwdne26799:0" - -#: model/src/ais_decoder.cpp:971 -msgid "Pushtow, eight cargo barges" -msgstr "crwdns26801:0crwdne26801:0" - -#: model/src/ais_decoder.cpp:972 -msgid "Pushtow, nine or more barges" -msgstr "crwdns26803:0crwdne26803:0" - -#: model/src/ais_decoder.cpp:973 -msgid "Pushtow, one tank/gas barge" -msgstr "crwdns26805:0crwdne26805:0" - -#: model/src/ais_decoder.cpp:975 -msgid "Pushtow, two barges at least one tanker or gas barge" -msgstr "crwdns26807:0crwdne26807:0" - -#: model/src/ais_decoder.cpp:977 -msgid "Pushtow, three barges at least one tanker or gas barge" -msgstr "crwdns26809:0crwdne26809:0" - -#: model/src/ais_decoder.cpp:979 -msgid "Pushtow, four barges at least one tanker or gas barge" -msgstr "crwdns26811:0crwdne26811:0" - -#: model/src/ais_decoder.cpp:981 -msgid "Pushtow, five barges at least one tanker or gas barge" -msgstr "crwdns26813:0crwdne26813:0" - -#: model/src/ais_decoder.cpp:983 -msgid "Pushtow, six barges at least one tanker or gas barge" -msgstr "crwdns26815:0crwdne26815:0" - -#: model/src/ais_decoder.cpp:985 -msgid "Pushtow, seven barges at least one tanker or gas barge" -msgstr "crwdns26817:0crwdne26817:0" - -#: model/src/ais_decoder.cpp:987 -msgid "Pushtow, eight barges at least one tanker or gas barge" -msgstr "crwdns26819:0crwdne26819:0" - -#: model/src/ais_decoder.cpp:989 -msgid "Pushtow, nine or more barges at least one tanker or gas barge" -msgstr "crwdns26821:0crwdne26821:0" - -#: model/src/ais_decoder.cpp:990 -msgid "Tug, single" -msgstr "crwdns26823:0crwdne26823:0" - -#: model/src/ais_decoder.cpp:991 -msgid "Tug, one or more tows" -msgstr "crwdns26825:0crwdne26825:0" - -#: model/src/ais_decoder.cpp:992 -msgid "Tug, assisting a vessel or linked combination" -msgstr "crwdns26827:0crwdne26827:0" - -#: model/src/ais_decoder.cpp:994 -msgid "Passenger ship, ferry, cruise ship, red cross ship" -msgstr "crwdns26829:0crwdne26829:0" - -#: model/src/ais_decoder.cpp:995 -msgid "Ferry" -msgstr "crwdns26831:0crwdne26831:0" - -#: model/src/ais_decoder.cpp:996 -msgid "Red cross ship" -msgstr "crwdns26833:0crwdne26833:0" - -#: model/src/ais_decoder.cpp:997 -msgid "Cruise ship" -msgstr "crwdns26835:0crwdne26835:0" - -#: model/src/ais_decoder.cpp:998 -msgid "Passenger ship without accommodation" -msgstr "crwdns26837:0crwdne26837:0" - -#: model/src/ais_decoder.cpp:999 -msgid "Vessel, work maintenance craft, floating derrick, cable-ship, buoy-ship, dredge" -msgstr "crwdns26839:0crwdne26839:0" - -#: model/src/ais_decoder.cpp:1001 -msgid "Fishing boat" -msgstr "crwdns26841:0crwdne26841:0" - -#: model/src/ais_decoder.cpp:1002 -msgid "Barge, tanker, chemical" -msgstr "crwdns26843:0crwdne26843:0" - -#: model/src/ais_decoder.cpp:1003 -msgid "General cargo Vessel maritime" -msgstr "crwdns26845:0crwdne26845:0" - -#: model/src/ais_decoder.cpp:1004 -msgid "Unit carrier maritime" -msgstr "crwdns26847:0crwdne26847:0" - -#: model/src/ais_decoder.cpp:1005 -msgid "Bulk carrier maritime" -msgstr "crwdns26849:0crwdne26849:0" - -#: model/src/ais_decoder.cpp:1006 model/src/ais_target_data.cpp:1988 -msgid "Tanker" -msgstr "crwdns2398:0crwdne2398:0" - -#: model/src/ais_decoder.cpp:1007 -msgid "Liquified gas tanker" -msgstr "crwdns26851:0crwdne26851:0" - -#: model/src/ais_decoder.cpp:1008 -msgid "Pleasure craft, longer than 20 metres" -msgstr "crwdns26853:0crwdne26853:0" - -#: model/src/ais_decoder.cpp:1009 -msgid "Fast ship" -msgstr "crwdns26855:0crwdne26855:0" - -#: model/src/ais_decoder.cpp:1010 -msgid "Hydrofoil" -msgstr "crwdns26857:0crwdne26857:0" - -#: model/src/ais_decoder.cpp:2120 -#, c-format -msgid "%02X" -msgstr "crwdns26859:0%02Xcrwdne26859:0" - -#: model/src/ais_target_data.cpp:90 -msgid "Underway using Engine" -msgstr "crwdns21189:0crwdne21189:0" - -#: model/src/ais_target_data.cpp:91 -msgid "At Anchor" -msgstr "crwdns2360:0crwdne2360:0" - -#: model/src/ais_target_data.cpp:92 -msgid "Not Under Command" -msgstr "crwdns2361:0crwdne2361:0" - -#: model/src/ais_target_data.cpp:93 -msgid "Restricted Manoeuvrability" -msgstr "crwdns2362:0crwdne2362:0" - -#: model/src/ais_target_data.cpp:94 -msgid "Constrained by draught" -msgstr "crwdns2363:0crwdne2363:0" - -#: model/src/ais_target_data.cpp:95 -msgid "Moored" -msgstr "crwdns2364:0crwdne2364:0" - -#: model/src/ais_target_data.cpp:96 -msgid "Aground" -msgstr "crwdns2365:0crwdne2365:0" - -#: model/src/ais_target_data.cpp:97 -msgid "Engaged in Fishing" -msgstr "crwdns2366:0crwdne2366:0" - -#: model/src/ais_target_data.cpp:98 -msgid "Underway Sailing" -msgstr "crwdns21191:0crwdne21191:0" - -#: model/src/ais_target_data.cpp:99 model/src/ais_target_data.cpp:1978 -msgid "High Speed Craft" -msgstr "crwdns2368:0crwdne2368:0" - -#: model/src/ais_target_data.cpp:100 -msgid "Wing In Ground Effect" -msgstr "crwdns2369:0crwdne2369:0" - -#: model/src/ais_target_data.cpp:101 -msgid "Power-driven vessel towing astern (regional use)" -msgstr "crwdns8136:0crwdne8136:0" - -#: model/src/ais_target_data.cpp:102 -msgid "Power-driven vessel pushing ahead or towing alongside (regional use)" -msgstr "crwdns8137:0crwdne8137:0" - -#: model/src/ais_target_data.cpp:103 -msgid "Reserved 13" -msgstr "crwdns2372:0crwdne2372:0" - -#: model/src/ais_target_data.cpp:104 -msgid "Reserved 14" -msgstr "crwdns2373:0crwdne2373:0" - -#: model/src/ais_target_data.cpp:105 model/src/ais_target_data.cpp:576 -#: model/src/conn_params.cpp:208 gui/src/conn_params_panel.cpp:238 -#: gui/src/conn_params_panel.cpp:355 gui/src/conn_params_panel.cpp:724 -#: gui/src/conn_params_panel.cpp:759 -msgid "Undefined" -msgstr "crwdns2374:0crwdne2374:0" - -#: model/src/ais_target_data.cpp:106 -msgid "AtoN Virtual" -msgstr "crwdns19672:0crwdne19672:0" - -#: model/src/ais_target_data.cpp:107 -msgid "AtoN Virtual (On Position)" -msgstr "crwdns19674:0crwdne19674:0" - -#: model/src/ais_target_data.cpp:108 -msgid "AtoN Virtual (Off Position)" -msgstr "crwdns19676:0crwdne19676:0" - -#: model/src/ais_target_data.cpp:109 -msgid "AtoN Real" -msgstr "crwdns19678:0crwdne19678:0" - -#: model/src/ais_target_data.cpp:110 -msgid "AtoN Real (On Position)" -msgstr "crwdns19680:0crwdne19680:0" - -#: model/src/ais_target_data.cpp:111 -msgid "AtoN Real(Off Position)" -msgstr "crwdns19682:0crwdne19682:0" - -#: model/src/ais_target_data.cpp:120 -msgid "steady" -msgstr "crwdns29002:0crwdne29002:0" - -#: model/src/ais_target_data.cpp:122 -msgid "decreasing" -msgstr "crwdns29004:0crwdne29004:0" - -#: model/src/ais_target_data.cpp:124 -msgid "increasing" -msgstr "crwdns29006:0crwdne29006:0" - -#: model/src/ais_target_data.cpp:483 model/src/ais_target_data.cpp:1081 -#: gui/src/OCPNListCtrl.cpp:121 -msgid "SAR Helicopter" -msgstr "crwdns19684:0crwdne19684:0" - -#: model/src/ais_target_data.cpp:483 model/src/ais_target_data.cpp:1081 -#: gui/src/OCPNListCtrl.cpp:121 -msgid "SAR Aircraft" -msgstr "crwdns2910:0crwdne2910:0" - -#: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 -#: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 -msgid "MMSI" -msgstr "crwdns2893:0crwdne2893:0" - -#: model/src/ais_target_data.cpp:490 model/src/ais_target_data.cpp:503 -#: model/src/ais_target_data.cpp:519 gui/src/AISTargetListDialog.cpp:578 -msgid "Class" -msgstr "crwdns2894:0crwdne2894:0" - -#: model/src/ais_target_data.cpp:492 -msgid "IMO" -msgstr "crwdns2911:0crwdne2911:0" - -#: model/src/ais_target_data.cpp:528 -msgid "Nation" -msgstr "crwdns10336:0crwdne10336:0" - -#: model/src/ais_target_data.cpp:529 -msgid "Flag" -msgstr "crwdns5435:0crwdne5435:0" - -#: model/src/ais_target_data.cpp:542 model/src/ais_target_data.cpp:1119 -#: gui/src/AISTargetListDialog.cpp:146 gui/src/AISTargetListDialog.cpp:160 -#: gui/src/OCPNListCtrl.cpp:139 -msgid "Active" -msgstr "crwdns2888:0crwdne2888:0" - -#: model/src/ais_target_data.cpp:544 model/src/ais_target_data.cpp:1121 -#: gui/src/AISTargetListDialog.cpp:148 gui/src/AISTargetListDialog.cpp:162 -#: gui/src/OCPNListCtrl.cpp:141 -msgid "Testing" -msgstr "crwdns2889:0crwdne2889:0" - -#: model/src/ais_target_data.cpp:561 model/src/ais_target_data.cpp:886 -#: model/src/ais_target_data.cpp:1099 model/src/ais_target_data.cpp:1354 -#: model/src/ais_target_data.cpp:1989 gui/src/chartdbs.cpp:1408 -msgid "Unknown" -msgstr "crwdns1961:0crwdne1961:0" - -#: model/src/ais_target_data.cpp:591 -msgid "Safety Broadcast Message" -msgstr "crwdns2912:0crwdne2912:0" - -#: model/src/ais_target_data.cpp:657 -msgid "Distress relay" -msgstr "crwdns26639:0crwdne26639:0" - -#: model/src/ais_target_data.cpp:660 -msgid "by:" -msgstr "crwdns26641:0crwdne26641:0" - -#: model/src/ais_target_data.cpp:664 -msgid "Nature of distress: " -msgstr "crwdns26643:0crwdne26643:0" - -#: model/src/ais_target_data.cpp:682 -msgid " (Last Known)" -msgstr "crwdns2913:0crwdne2913:0" - -#: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 -#: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 -#: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 -msgid "Position" -msgstr "crwdns2848:0crwdne2848:0" - -#: model/src/ais_target_data.cpp:691 -msgid "Report Age" -msgstr "crwdns2914:0crwdne2914:0" - -#: model/src/ais_target_data.cpp:702 -msgid "Issued (UTC)" -msgstr "crwdns29008:0crwdne29008:0" - -#: model/src/ais_target_data.cpp:721 -msgid "Report as of" -msgstr "crwdns2915:0crwdne2915:0" - -#: model/src/ais_target_data.cpp:726 gui/src/RoutePropDlgImpl.cpp:805 -#: gui/src/TrackPropDlg.cpp:367 gui/src/TrackPropDlg.cpp:1349 -msgid "Destination" -msgstr "crwdns2209:0crwdne2209:0" - -#: model/src/ais_target_data.cpp:727 -msgid "ETA (UTC)" -msgstr "crwdns2916:0crwdne2916:0" - -#: model/src/ais_target_data.cpp:790 model/src/ais_target_data.cpp:796 -msgid "Right" -msgstr "crwdns2918:0crwdne2918:0" - -#: model/src/ais_target_data.cpp:792 model/src/ais_target_data.cpp:799 -msgid "Left" -msgstr "crwdns2919:0crwdne2919:0" - -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 -#: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 -#: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 -msgid "Speed" -msgstr "crwdns2269:0crwdne2269:0" - -#: model/src/ais_target_data.cpp:836 gui/src/routeprintout.cpp:110 -#: gui/src/routeprintout.cpp:386 gui/src/RoutePropDlg.cpp:401 -#: gui/src/trackprintout.cpp:91 gui/src/trackprintout.cpp:308 -msgid "Course" -msgstr "crwdns2273:0crwdne2273:0" - -#: model/src/ais_target_data.cpp:838 gui/src/priority_gui.cpp:229 -msgid "Heading" -msgstr "crwdns2920:0crwdne2920:0" - -#: model/src/ais_target_data.cpp:846 -msgid "Turn Rate" -msgstr "crwdns2921:0crwdne2921:0" - -#: model/src/ais_target_data.cpp:851 gui/src/AISTargetListDialog.cpp:614 -msgid "Range" -msgstr "crwdns2897:0crwdne2897:0" - -#: model/src/ais_target_data.cpp:852 gui/src/RoutePropDlg.cpp:364 -#: gui/src/TrackPropDlg.cpp:306 -msgid "Bearing" -msgstr "crwdns2265:0crwdne2265:0" - -#: model/src/ais_target_data.cpp:863 -msgid "in " -msgstr "crwdns2922:0crwdne2922:0" - -#: model/src/ais_target_data.cpp:866 model/src/ais_target_data.cpp:1170 -#: gui/src/AISTargetListDialog.cpp:640 gui/src/chcanv.cpp:6611 -msgid "CPA" -msgstr "crwdns2900:0crwdne2900:0" - -#: model/src/ais_target_data.cpp:873 model/src/ais_target_data.cpp:876 -msgid "Inland Blue Flag" -msgstr "crwdns2923:0crwdne2923:0" - -#: model/src/ais_target_data.cpp:874 gui/src/catalog_mgr.cpp:340 -msgid "Clear" -msgstr "crwdns2924:0crwdne2924:0" - -#: model/src/ais_target_data.cpp:877 -msgid "Set" -msgstr "crwdns2925:0crwdne2925:0" - -#: model/src/ais_target_data.cpp:888 -msgid "Altitude" -msgstr "crwdns2926:0crwdne2926:0" - -#: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 -msgid "Wind speed" -msgstr "crwdns29010:0crwdne29010:0" - -#: model/src/ais_target_data.cpp:907 -msgid "Wind gust" -msgstr "crwdns29012:0crwdne29012:0" - -#: model/src/ais_target_data.cpp:913 model/src/ais_target_data.cpp:1185 -msgid "Water level deviation" -msgstr "crwdns29014:0crwdne29014:0" - -#: model/src/ais_target_data.cpp:920 -msgid "Water level dev. Ref: " -msgstr "crwdns29016:0crwdne29016:0" - -#: model/src/ais_target_data.cpp:930 model/src/ais_target_data.cpp:1193 -msgid "Water level" -msgstr "crwdns29018:0crwdne29018:0" - -#: model/src/ais_target_data.cpp:940 -msgid "Surface current " -msgstr "crwdns29020:0crwdne29020:0" - -#: model/src/ais_target_data.cpp:950 model/src/ais_target_data.cpp:957 -#: model/src/ais_target_data.cpp:1211 -msgid "s" -msgstr "crwdns29022:0crwdne29022:0" - -#: model/src/ais_target_data.cpp:960 -msgid "Waves height & period" -msgstr "crwdns29024:0crwdne29024:0" - -#: model/src/ais_target_data.cpp:962 -msgid "Swell height & period " -msgstr "crwdns29026:0crwdne29026:0" - -#: model/src/ais_target_data.cpp:979 -msgid "Air Temperatur" -msgstr "crwdns29028:0crwdne29028:0" - -#: model/src/ais_target_data.cpp:980 -msgid "Air pressure" -msgstr "crwdns29030:0crwdne29030:0" - -#: model/src/ais_target_data.cpp:994 -msgid "Relative Humidity" -msgstr "crwdns29032:0crwdne29032:0" - -#: model/src/ais_target_data.cpp:996 -msgid "Dew Point " -msgstr "crwdns29034:0crwdne29034:0" - -#: model/src/ais_target_data.cpp:1010 -msgid "Water Temperatur" -msgstr "crwdns29036:0crwdne29036:0" - -#: model/src/ais_target_data.cpp:1011 -msgid "Sea state" -msgstr "crwdns29038:0crwdne29038:0" - -#: model/src/ais_target_data.cpp:1026 -msgid "Precipitation" -msgstr "crwdns29040:0crwdne29040:0" - -#: model/src/ais_target_data.cpp:1028 -msgid "Horizontal Visibility" -msgstr "crwdns29042:0crwdne29042:0" - -#: model/src/ais_target_data.cpp:1037 gui/src/OCPNListCtrl.cpp:88 -msgid "No" -msgstr "crwdns8023:0crwdne8023:0" - -#: model/src/ais_target_data.cpp:1038 gui/src/OCPNListCtrl.cpp:86 -msgid "Yes" -msgstr "crwdns8022:0crwdne8022:0" - -#: model/src/ais_target_data.cpp:1041 -msgid "Sea salinity" -msgstr "crwdns29044:0crwdne29044:0" - -#: model/src/ais_target_data.cpp:1043 -msgid "Ice status" -msgstr "crwdns29046:0crwdne29046:0" - -#: model/src/ais_target_data.cpp:1161 model/src/ais_target_data.cpp:1165 -msgid " COG Unavailable" -msgstr "crwdns2927:0crwdne2927:0" - -#: model/src/ais_target_data.cpp:1171 model/src/navutil_base.cpp:302 -msgid "in" -msgstr "crwdns2189:0crwdne2189:0" - -#: model/src/ais_target_data.cpp:1172 -msgid "min" -msgstr "crwdns2928:0crwdne2928:0" - -#: model/src/ais_target_data.cpp:1201 gui/src/TCWin.cpp:90 -msgid "Current" -msgstr "crwdns6179:0crwdne6179:0" - -#: model/src/ais_target_data.cpp:1202 model/src/navutil_base.cpp:320 -#: model/src/navutil_base.cpp:343 -msgid "kts" -msgstr "crwdns27087:0crwdne27087:0" - -#: model/src/ais_target_data.cpp:1209 -msgid "Wave height" -msgstr "crwdns29048:0crwdne29048:0" - -#: model/src/ais_target_data.cpp:1217 -msgid "Water temp" -msgstr "crwdns29050:0crwdne29050:0" - -#: model/src/ais_target_data.cpp:1225 -msgid "Air temp" -msgstr "crwdns29052:0crwdne29052:0" - -#: model/src/ais_target_data.cpp:1232 -msgid "Air press" -msgstr "crwdns29054:0crwdne29054:0" - -#: model/src/ais_target_data.cpp:1242 -msgid "Visibility" -msgstr "crwdns29056:0crwdne29056:0" - -#: model/src/ais_target_data.cpp:1330 -msgid "A" -msgstr "crwdns2929:0crwdne2929:0" - -#: model/src/ais_target_data.cpp:1332 -msgid "B" -msgstr "crwdns2930:0crwdne2930:0" - -#: model/src/ais_target_data.cpp:1334 model/src/ais_target_data.cpp:2055 -msgid "AtoN" -msgstr "crwdns2455:0crwdne2455:0" - -#: model/src/ais_target_data.cpp:1334 -msgid "Aid to Navigation" -msgstr "crwdns2931:0crwdne2931:0" - -#: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 -msgid "Base" -msgstr "crwdns2672:0crwdne2672:0" - -#: model/src/ais_target_data.cpp:1336 -msgid "Base Station" -msgstr "crwdns2932:0crwdne2932:0" - -#: model/src/ais_target_data.cpp:1338 model/src/ais_target_data.cpp:2087 -msgid "Buddy" -msgstr "crwdns2474:0crwdne2474:0" - -#: model/src/ais_target_data.cpp:1338 -msgid "GPSGate Buddy" -msgstr "crwdns2933:0crwdne2933:0" - -#: model/src/ais_target_data.cpp:1341 model/src/ais_target_data.cpp:1343 -#: model/src/ais_target_data.cpp:2088 -msgid "DSC" -msgstr "crwdns2475:0crwdne2475:0" - -#: model/src/ais_target_data.cpp:1341 -msgid "DSC Distress" -msgstr "crwdns2934:0crwdne2934:0" - -#: model/src/ais_target_data.cpp:1343 -msgid "DSC Position Report" -msgstr "crwdns2935:0crwdne2935:0" - -#: model/src/ais_target_data.cpp:1345 -msgid "SART" -msgstr "crwdns2936:0crwdne2936:0" - -#: model/src/ais_target_data.cpp:1347 model/src/ais_target_data.cpp:2090 -msgid "ARPA" -msgstr "crwdns2476:0crwdne2476:0" - -#: model/src/ais_target_data.cpp:1349 model/src/ais_target_data.cpp:2091 -msgid "APRS" -msgstr "crwdns2477:0crwdne2477:0" - -#: model/src/ais_target_data.cpp:1349 model/src/ais_target_data.cpp:2026 -msgid "APRS Position Report" -msgstr "crwdns2435:0crwdne2435:0" - -#: model/src/ais_target_data.cpp:1351 -msgid "METEO" -msgstr "crwdns29058:0crwdne29058:0" - -#: model/src/ais_target_data.cpp:1351 -msgid "Meteorologic" -msgstr "crwdns29060:0crwdne29060:0" - -#: model/src/ais_target_data.cpp:1354 -msgid "Unk" -msgstr "crwdns2937:0crwdne2937:0" - -#: model/src/ais_target_data.cpp:1360 -msgid "Fire, explosion" -msgstr "crwdns26645:0crwdne26645:0" - -#: model/src/ais_target_data.cpp:1360 -msgid "Flooding" -msgstr "crwdns27337:0crwdne27337:0" - -#: model/src/ais_target_data.cpp:1361 -msgid "Collision" -msgstr "crwdns26649:0crwdne26649:0" - -#: model/src/ais_target_data.cpp:1361 -msgid "Grounding" -msgstr "crwdns26651:0crwdne26651:0" - -#: model/src/ais_target_data.cpp:1362 -msgid "Listing, in danger of capsizing" -msgstr "crwdns27339:0crwdne27339:0" - -#: model/src/ais_target_data.cpp:1362 -msgid "Sinking" -msgstr "crwdns26655:0crwdne26655:0" - -#: model/src/ais_target_data.cpp:1363 -msgid "Disabled and adrift" -msgstr "crwdns26657:0crwdne26657:0" - -#: model/src/ais_target_data.cpp:1363 -msgid "Undesignated distress" -msgstr "crwdns26659:0crwdne26659:0" - -#: model/src/ais_target_data.cpp:1364 -msgid "Abandoning ship" -msgstr "crwdns26661:0crwdne26661:0" - -#: model/src/ais_target_data.cpp:1364 -msgid "Piracy/armed robbery attack" -msgstr "crwdns27341:0crwdne27341:0" - -#: model/src/ais_target_data.cpp:1365 -msgid "Man overboard" -msgstr "crwdns26665:0crwdne26665:0" - -#: model/src/ais_target_data.cpp:1365 -msgid "EPIRB emission" -msgstr "crwdns26667:0crwdne26667:0" - -#: model/src/ais_target_data.cpp:1418 -msgid "Albania" -msgstr "crwdns5436:0crwdne5436:0" - -#: model/src/ais_target_data.cpp:1420 -msgid "Andorra" -msgstr "crwdns5437:0crwdne5437:0" - -#: model/src/ais_target_data.cpp:1422 -msgid "Austria" -msgstr "crwdns5438:0crwdne5438:0" - -#: model/src/ais_target_data.cpp:1424 -msgid "Azores" -msgstr "crwdns5439:0crwdne5439:0" - -#: model/src/ais_target_data.cpp:1426 -msgid "Belgium" -msgstr "crwdns5440:0crwdne5440:0" - -#: model/src/ais_target_data.cpp:1428 -msgid "Belarus" -msgstr "crwdns5441:0crwdne5441:0" - -#: model/src/ais_target_data.cpp:1430 -msgid "Bulgaria" -msgstr "crwdns5442:0crwdne5442:0" - -#: model/src/ais_target_data.cpp:1432 -msgid "Vatican City State" -msgstr "crwdns5443:0crwdne5443:0" - -#: model/src/ais_target_data.cpp:1435 model/src/ais_target_data.cpp:1439 -msgid "Cyprus" -msgstr "crwdns5444:0crwdne5444:0" - -#: model/src/ais_target_data.cpp:1437 model/src/ais_target_data.cpp:1449 -msgid "Germany" -msgstr "crwdns5445:0crwdne5445:0" - -#: model/src/ais_target_data.cpp:1441 -msgid "Georgia" -msgstr "crwdns5446:0crwdne5446:0" - -#: model/src/ais_target_data.cpp:1443 -msgid "Moldova" -msgstr "crwdns5447:0crwdne5447:0" - -#: model/src/ais_target_data.cpp:1445 model/src/ais_target_data.cpp:1462 -#: model/src/ais_target_data.cpp:1494 model/src/ais_target_data.cpp:1508 -msgid "Malta" -msgstr "crwdns5448:0crwdne5448:0" - -#: model/src/ais_target_data.cpp:1447 -msgid "Armenia" -msgstr "crwdns5449:0crwdne5449:0" - -#: model/src/ais_target_data.cpp:1452 -msgid "Denmark" -msgstr "crwdns5450:0crwdne5450:0" - -#: model/src/ais_target_data.cpp:1454 model/src/ais_target_data.cpp:1456 -msgid "Spain" -msgstr "crwdns5451:0crwdne5451:0" - -#: model/src/ais_target_data.cpp:1460 -msgid "France" -msgstr "crwdns5452:0crwdne5452:0" - -#: model/src/ais_target_data.cpp:1464 -msgid "Finland" -msgstr "crwdns5453:0crwdne5453:0" - -#: model/src/ais_target_data.cpp:1466 -msgid "Faroe Islands" -msgstr "crwdns5454:0crwdne5454:0" - -#: model/src/ais_target_data.cpp:1471 -msgid "Great Britain" -msgstr "crwdns5455:0crwdne5455:0" - -#: model/src/ais_target_data.cpp:1473 -msgid "Gibraltar" -msgstr "crwdns5456:0crwdne5456:0" - -#: model/src/ais_target_data.cpp:1475 model/src/ais_target_data.cpp:1481 -msgid "Greece" -msgstr "crwdns5457:0crwdne5457:0" - -#: model/src/ais_target_data.cpp:1477 -msgid "Croatia" -msgstr "crwdns5458:0crwdne5458:0" - -#: model/src/ais_target_data.cpp:1483 -msgid "Morocco" -msgstr "crwdns5459:0crwdne5459:0" - -#: model/src/ais_target_data.cpp:1485 -msgid "Hungary" -msgstr "crwdns5460:0crwdne5460:0" - -#: model/src/ais_target_data.cpp:1489 -msgid "Netherlands" -msgstr "crwdns5461:0crwdne5461:0" - -#: model/src/ais_target_data.cpp:1491 -msgid "Italy" -msgstr "crwdns5462:0crwdne5462:0" - -#: model/src/ais_target_data.cpp:1496 -msgid "Ireland" -msgstr "crwdns5463:0crwdne5463:0" - -#: model/src/ais_target_data.cpp:1498 -msgid "Iceland" -msgstr "crwdns5464:0crwdne5464:0" - -#: model/src/ais_target_data.cpp:1500 -msgid "Liechtenstein" -msgstr "crwdns5465:0crwdne5465:0" - -#: model/src/ais_target_data.cpp:1502 -msgid "Luxembourg" -msgstr "crwdns5466:0crwdne5466:0" - -#: model/src/ais_target_data.cpp:1504 -msgid "Monaco" -msgstr "crwdns5467:0crwdne5467:0" - -#: model/src/ais_target_data.cpp:1506 -msgid "Madeira" -msgstr "crwdns5468:0crwdne5468:0" - -#: model/src/ais_target_data.cpp:1512 -msgid "Norway" -msgstr "crwdns5469:0crwdne5469:0" - -#: model/src/ais_target_data.cpp:1514 -msgid "Poland" -msgstr "crwdns5470:0crwdne5470:0" - -#: model/src/ais_target_data.cpp:1516 -msgid "Montenegro" -msgstr "crwdns5471:0crwdne5471:0" - -#: model/src/ais_target_data.cpp:1518 -msgid "Portugal" -msgstr "crwdns5472:0crwdne5472:0" - -#: model/src/ais_target_data.cpp:1520 -msgid "Romania" -msgstr "crwdns5473:0crwdne5473:0" - -#: model/src/ais_target_data.cpp:1523 -msgid "Sweden" -msgstr "crwdns5474:0crwdne5474:0" - -#: model/src/ais_target_data.cpp:1525 -msgid "Slovak Republic" -msgstr "crwdns5475:0crwdne5475:0" - -#: model/src/ais_target_data.cpp:1527 -msgid "San Marino" -msgstr "crwdns5476:0crwdne5476:0" - -#: model/src/ais_target_data.cpp:1529 -msgid "Switzerland" -msgstr "crwdns5477:0crwdne5477:0" - -#: model/src/ais_target_data.cpp:1531 -msgid "Czech Republic" -msgstr "crwdns5478:0crwdne5478:0" - -#: model/src/ais_target_data.cpp:1533 -msgid "Turkey" -msgstr "crwdns5479:0crwdne5479:0" - -#: model/src/ais_target_data.cpp:1535 -msgid "Ukraine" -msgstr "crwdns5480:0crwdne5480:0" - -#: model/src/ais_target_data.cpp:1537 -msgid "Russian" -msgstr "crwdns5481:0crwdne5481:0" - -#: model/src/ais_target_data.cpp:1539 -msgid "Macedonia" -msgstr "crwdns5482:0crwdne5482:0" - -#: model/src/ais_target_data.cpp:1541 -msgid "Latvia" -msgstr "crwdns5483:0crwdne5483:0" - -#: model/src/ais_target_data.cpp:1543 -msgid "Estonia" -msgstr "crwdns5484:0crwdne5484:0" - -#: model/src/ais_target_data.cpp:1545 -msgid "Lithuania" -msgstr "crwdns5485:0crwdne5485:0" - -#: model/src/ais_target_data.cpp:1547 -msgid "Slovenia" -msgstr "crwdns5486:0crwdne5486:0" - -#: model/src/ais_target_data.cpp:1549 -msgid "Serbia" -msgstr "crwdns5487:0crwdne5487:0" - -#: model/src/ais_target_data.cpp:1551 -msgid "Anguilla" -msgstr "crwdns5488:0crwdne5488:0" - -#: model/src/ais_target_data.cpp:1553 -msgid "Alaska" -msgstr "crwdns5489:0crwdne5489:0" - -#: model/src/ais_target_data.cpp:1556 -msgid "Antigua and Barbuda" -msgstr "crwdns5490:0crwdne5490:0" - -#: model/src/ais_target_data.cpp:1558 -msgid "Antilles" -msgstr "crwdns5491:0crwdne5491:0" - -#: model/src/ais_target_data.cpp:1560 -msgid "Aruba" -msgstr "crwdns5492:0crwdne5492:0" - -#: model/src/ais_target_data.cpp:1563 model/src/ais_target_data.cpp:1567 -msgid "Bahamas" -msgstr "crwdns5493:0crwdne5493:0" - -#: model/src/ais_target_data.cpp:1565 -msgid "Bermuda" -msgstr "crwdns5494:0crwdne5494:0" - -#: model/src/ais_target_data.cpp:1569 -msgid "Belize" -msgstr "crwdns5495:0crwdne5495:0" - -#: model/src/ais_target_data.cpp:1571 -msgid "Barbados" -msgstr "crwdns5496:0crwdne5496:0" - -#: model/src/ais_target_data.cpp:1573 -msgid "Canada" -msgstr "crwdns5497:0crwdne5497:0" - -#: model/src/ais_target_data.cpp:1575 -msgid "Cayman Islands" -msgstr "crwdns5498:0crwdne5498:0" - -#: model/src/ais_target_data.cpp:1577 -msgid "Costa Rica" -msgstr "crwdns5499:0crwdne5499:0" - -#: model/src/ais_target_data.cpp:1579 -msgid "Cuba" -msgstr "crwdns5500:0crwdne5500:0" - -#: model/src/ais_target_data.cpp:1581 -msgid "Dominica" -msgstr "crwdns5501:0crwdne5501:0" - -#: model/src/ais_target_data.cpp:1583 -msgid "Dominican Republic" -msgstr "crwdns5502:0crwdne5502:0" - -#: model/src/ais_target_data.cpp:1585 -msgid "Guadeloupe" -msgstr "crwdns5503:0crwdne5503:0" - -#: model/src/ais_target_data.cpp:1587 -msgid "Grenada" -msgstr "crwdns5504:0crwdne5504:0" - -#: model/src/ais_target_data.cpp:1589 -msgid "Greenland" -msgstr "crwdns5505:0crwdne5505:0" - -#: model/src/ais_target_data.cpp:1591 -msgid "Guatemala" -msgstr "crwdns5506:0crwdne5506:0" - -#: model/src/ais_target_data.cpp:1593 -msgid "Honduras" -msgstr "crwdns5507:0crwdne5507:0" - -#: model/src/ais_target_data.cpp:1595 -msgid "Haiti" -msgstr "crwdns5508:0crwdne5508:0" - -#: model/src/ais_target_data.cpp:1597 model/src/ais_target_data.cpp:1634 -msgid "United States of America" -msgstr "crwdns5509:0crwdne5509:0" - -#: model/src/ais_target_data.cpp:1599 -msgid "Jamaica" -msgstr "crwdns5510:0crwdne5510:0" - -#: model/src/ais_target_data.cpp:1601 -msgid "Saint Kitts and Nevis" -msgstr "crwdns5511:0crwdne5511:0" - -#: model/src/ais_target_data.cpp:1603 -msgid "Saint Lucia" -msgstr "crwdns5512:0crwdne5512:0" - -#: model/src/ais_target_data.cpp:1605 -msgid "Mexico" -msgstr "crwdns5513:0crwdne5513:0" - -#: model/src/ais_target_data.cpp:1607 -msgid "Martinique" -msgstr "crwdns5514:0crwdne5514:0" - -#: model/src/ais_target_data.cpp:1609 -msgid "Montserrat" -msgstr "crwdns5515:0crwdne5515:0" - -#: model/src/ais_target_data.cpp:1611 -msgid "Nicaragua" -msgstr "crwdns5516:0crwdne5516:0" - -#: model/src/ais_target_data.cpp:1619 model/src/ais_target_data.cpp:1640 -msgid "Panama" -msgstr "crwdns5517:0crwdne5517:0" - -#: model/src/ais_target_data.cpp:1621 -msgid "Puerto Rico" -msgstr "crwdns5518:0crwdne5518:0" - -#: model/src/ais_target_data.cpp:1623 -msgid "El Salvador" -msgstr "crwdns5519:0crwdne5519:0" - -#: model/src/ais_target_data.cpp:1625 -msgid "Saint Pierre and Miquelon" -msgstr "crwdns5520:0crwdne5520:0" - -#: model/src/ais_target_data.cpp:1627 -msgid "Trinidad and Tobago" -msgstr "crwdns5521:0crwdne5521:0" - -#: model/src/ais_target_data.cpp:1629 -msgid "Turks and Caicos Islands" -msgstr "crwdns5522:0crwdne5522:0" - -#: model/src/ais_target_data.cpp:1644 -msgid "Saint Vincent and the Grenadines" -msgstr "crwdns5523:0crwdne5523:0" - -#: model/src/ais_target_data.cpp:1646 -msgid "British Virgin Islands" -msgstr "crwdns5524:0crwdne5524:0" - -#: model/src/ais_target_data.cpp:1648 -msgid "United States Virgin Islands" -msgstr "crwdns5525:0crwdne5525:0" - -#: model/src/ais_target_data.cpp:1650 -msgid "Afghanistan" -msgstr "crwdns5526:0crwdne5526:0" - -#: model/src/ais_target_data.cpp:1652 -msgid "Saudi Arabia" -msgstr "crwdns5527:0crwdne5527:0" - -#: model/src/ais_target_data.cpp:1654 -msgid "Bangladesh" -msgstr "crwdns5528:0crwdne5528:0" - -#: model/src/ais_target_data.cpp:1656 -msgid "Bahrain" -msgstr "crwdns5529:0crwdne5529:0" - -#: model/src/ais_target_data.cpp:1658 -msgid "Bhutan" -msgstr "crwdns5530:0crwdne5530:0" - -#: model/src/ais_target_data.cpp:1662 -msgid "China" -msgstr "crwdns5531:0crwdne5531:0" - -#: model/src/ais_target_data.cpp:1664 -msgid "Taiwan" -msgstr "crwdns5532:0crwdne5532:0" - -#: model/src/ais_target_data.cpp:1666 -msgid "Sri Lanka" -msgstr "crwdns5533:0crwdne5533:0" - -#: model/src/ais_target_data.cpp:1668 -msgid "India" -msgstr "crwdns5534:0crwdne5534:0" - -#: model/src/ais_target_data.cpp:1670 -msgid "Iran" -msgstr "crwdns5535:0crwdne5535:0" - -#: model/src/ais_target_data.cpp:1672 -msgid "Azerbaijani Republic" -msgstr "crwdns5536:0crwdne5536:0" - -#: model/src/ais_target_data.cpp:1674 -msgid "Iraq" -msgstr "crwdns5537:0crwdne5537:0" - -#: model/src/ais_target_data.cpp:1676 -msgid "Israel" -msgstr "crwdns5538:0crwdne5538:0" - -#: model/src/ais_target_data.cpp:1678 model/src/ais_target_data.cpp:1680 -msgid "Japan" -msgstr "crwdns5539:0crwdne5539:0" - -#: model/src/ais_target_data.cpp:1682 -msgid "Turkmenistan" -msgstr "crwdns5540:0crwdne5540:0" - -#: model/src/ais_target_data.cpp:1684 -msgid "Kazakhstan" -msgstr "crwdns5541:0crwdne5541:0" - -#: model/src/ais_target_data.cpp:1686 -msgid "Uzbekistan" -msgstr "crwdns5542:0crwdne5542:0" - -#: model/src/ais_target_data.cpp:1688 -msgid "Jordan" -msgstr "crwdns5543:0crwdne5543:0" - -#: model/src/ais_target_data.cpp:1691 -msgid "Korea" -msgstr "crwdns5544:0crwdne5544:0" - -#: model/src/ais_target_data.cpp:1693 -msgid "Palestine" -msgstr "crwdns5545:0crwdne5545:0" - -#: model/src/ais_target_data.cpp:1695 -msgid "People's Rep. of Korea" -msgstr "crwdns5546:0crwdne5546:0" - -#: model/src/ais_target_data.cpp:1697 -msgid "Kuwait" -msgstr "crwdns5547:0crwdne5547:0" - -#: model/src/ais_target_data.cpp:1699 -msgid "Lebanon" -msgstr "crwdns5548:0crwdne5548:0" - -#: model/src/ais_target_data.cpp:1701 -msgid "Kyrgyz Republic" -msgstr "crwdns5549:0crwdne5549:0" - -#: model/src/ais_target_data.cpp:1703 -msgid "Macao" -msgstr "crwdns5550:0crwdne5550:0" - -#: model/src/ais_target_data.cpp:1705 -msgid "Maldives" -msgstr "crwdns5551:0crwdne5551:0" - -#: model/src/ais_target_data.cpp:1707 -msgid "Mongolia" -msgstr "crwdns5552:0crwdne5552:0" - -#: model/src/ais_target_data.cpp:1709 -msgid "Nepal" -msgstr "crwdns5553:0crwdne5553:0" - -#: model/src/ais_target_data.cpp:1711 -msgid "Oman" -msgstr "crwdns5554:0crwdne5554:0" - -#: model/src/ais_target_data.cpp:1713 -msgid "Pakistan" -msgstr "crwdns5555:0crwdne5555:0" - -#: model/src/ais_target_data.cpp:1715 -msgid "Qatar" -msgstr "crwdns5556:0crwdne5556:0" - -#: model/src/ais_target_data.cpp:1717 -msgid "Syrian Arab Republic" -msgstr "crwdns5557:0crwdne5557:0" - -#: model/src/ais_target_data.cpp:1720 -msgid "United Arab Emirates" -msgstr "crwdns5558:0crwdne5558:0" - -#: model/src/ais_target_data.cpp:1722 -msgid "Tajikistan" -msgstr "crwdns6639:0crwdne6639:0" - -#: model/src/ais_target_data.cpp:1725 -msgid "Yemen" -msgstr "crwdns5559:0crwdne5559:0" - -#: model/src/ais_target_data.cpp:1727 -msgid "Hong Kong" -msgstr "crwdns5560:0crwdne5560:0" - -#: model/src/ais_target_data.cpp:1729 -msgid "Bosnia and Herzegovina" -msgstr "crwdns5561:0crwdne5561:0" - -#: model/src/ais_target_data.cpp:1731 -msgid "Adelie Land" -msgstr "crwdns5562:0crwdne5562:0" - -#: model/src/ais_target_data.cpp:1733 -msgid "Australia" -msgstr "crwdns5563:0crwdne5563:0" - -#: model/src/ais_target_data.cpp:1735 -msgid "Myanmar" -msgstr "crwdns5564:0crwdne5564:0" - -#: model/src/ais_target_data.cpp:1737 -msgid "Brunei Darussalam" -msgstr "crwdns5565:0crwdne5565:0" - -#: model/src/ais_target_data.cpp:1739 -msgid "Micronesia" -msgstr "crwdns5566:0crwdne5566:0" - -#: model/src/ais_target_data.cpp:1741 -msgid "Palau" -msgstr "crwdns5567:0crwdne5567:0" - -#: model/src/ais_target_data.cpp:1743 -msgid "New Zealand" -msgstr "crwdns5568:0crwdne5568:0" - -#: model/src/ais_target_data.cpp:1746 -msgid "Cambodia" -msgstr "crwdns5569:0crwdne5569:0" - -#: model/src/ais_target_data.cpp:1748 -msgid "Christmas Island" -msgstr "crwdns5570:0crwdne5570:0" - -#: model/src/ais_target_data.cpp:1750 -msgid "Cook Islands" -msgstr "crwdns5571:0crwdne5571:0" - -#: model/src/ais_target_data.cpp:1752 -msgid "Fiji" -msgstr "crwdns5572:0crwdne5572:0" - -#: model/src/ais_target_data.cpp:1754 -msgid "Cocos (Keeling) Islands" -msgstr "crwdns19686:0crwdne19686:0" - -#: model/src/ais_target_data.cpp:1756 -msgid "Indonesia" -msgstr "crwdns5574:0crwdne5574:0" - -#: model/src/ais_target_data.cpp:1758 -msgid "Kiribati" -msgstr "crwdns5575:0crwdne5575:0" - -#: model/src/ais_target_data.cpp:1760 -msgid "Lao People's Dem. Rep." -msgstr "crwdns5576:0crwdne5576:0" - -#: model/src/ais_target_data.cpp:1762 -msgid "Malaysia" -msgstr "crwdns5577:0crwdne5577:0" - -#: model/src/ais_target_data.cpp:1764 -msgid "Northern Mariana Islands" -msgstr "crwdns5578:0crwdne5578:0" - -#: model/src/ais_target_data.cpp:1766 -msgid "Marshall Islands" -msgstr "crwdns5579:0crwdne5579:0" - -#: model/src/ais_target_data.cpp:1768 -msgid "New Caledonia" -msgstr "crwdns5580:0crwdne5580:0" - -#: model/src/ais_target_data.cpp:1770 -msgid "Niue" -msgstr "crwdns5581:0crwdne5581:0" - -#: model/src/ais_target_data.cpp:1772 -msgid "Nauru" -msgstr "crwdns5582:0crwdne5582:0" - -#: model/src/ais_target_data.cpp:1774 -msgid "French Polynesia" -msgstr "crwdns5583:0crwdne5583:0" - -#: model/src/ais_target_data.cpp:1776 -msgid "Philippines" -msgstr "crwdns5584:0crwdne5584:0" - -#: model/src/ais_target_data.cpp:1778 -msgid "East Timor" -msgstr "crwdns21387:0crwdne21387:0" - -#: model/src/ais_target_data.cpp:1780 -msgid "Papua New Guinea" -msgstr "crwdns5585:0crwdne5585:0" - -#: model/src/ais_target_data.cpp:1782 -msgid "Pitcairn Island" -msgstr "crwdns5586:0crwdne5586:0" - -#: model/src/ais_target_data.cpp:1784 -msgid "Solomon Islands" -msgstr "crwdns5587:0crwdne5587:0" - -#: model/src/ais_target_data.cpp:1786 -msgid "American Samoa" -msgstr "crwdns5588:0crwdne5588:0" - -#: model/src/ais_target_data.cpp:1788 -msgid "Samoa" -msgstr "crwdns5589:0crwdne5589:0" - -#: model/src/ais_target_data.cpp:1793 -msgid "Singapore" -msgstr "crwdns5590:0crwdne5590:0" - -#: model/src/ais_target_data.cpp:1795 -msgid "Thailand" -msgstr "crwdns5591:0crwdne5591:0" - -#: model/src/ais_target_data.cpp:1797 -msgid "Tonga" -msgstr "crwdns5592:0crwdne5592:0" - -#: model/src/ais_target_data.cpp:1799 -msgid "Tuvalu" -msgstr "crwdns5593:0crwdne5593:0" - -#: model/src/ais_target_data.cpp:1801 -msgid "Viet Nam" -msgstr "crwdns5594:0crwdne5594:0" - -#: model/src/ais_target_data.cpp:1804 -msgid "Vanuatu" -msgstr "crwdns5595:0crwdne5595:0" - -#: model/src/ais_target_data.cpp:1806 -msgid "Wallis and Futuna Islands" -msgstr "crwdns5596:0crwdne5596:0" - -#: model/src/ais_target_data.cpp:1808 -msgid "South Africa" -msgstr "crwdns5597:0crwdne5597:0" - -#: model/src/ais_target_data.cpp:1810 -msgid "Angola" -msgstr "crwdns5598:0crwdne5598:0" - -#: model/src/ais_target_data.cpp:1812 -msgid "Algeria" -msgstr "crwdns5599:0crwdne5599:0" - -#: model/src/ais_target_data.cpp:1814 -msgid "Saint Paul" -msgstr "crwdns5600:0crwdne5600:0" - -#: model/src/ais_target_data.cpp:1816 -msgid "Ascension Island" -msgstr "crwdns5601:0crwdne5601:0" - -#: model/src/ais_target_data.cpp:1818 -msgid "Burundi" -msgstr "crwdns5602:0crwdne5602:0" - -#: model/src/ais_target_data.cpp:1820 -msgid "Benin" -msgstr "crwdns5603:0crwdne5603:0" - -#: model/src/ais_target_data.cpp:1822 -msgid "Botswana" -msgstr "crwdns5604:0crwdne5604:0" - -#: model/src/ais_target_data.cpp:1824 -msgid "Central African Republic" -msgstr "crwdns5605:0crwdne5605:0" - -#: model/src/ais_target_data.cpp:1826 -msgid "Cameroon" -msgstr "crwdns5606:0crwdne5606:0" - -#: model/src/ais_target_data.cpp:1828 -msgid "Congo" -msgstr "crwdns5607:0crwdne5607:0" - -#: model/src/ais_target_data.cpp:1830 -msgid "Comoros" -msgstr "crwdns5608:0crwdne5608:0" - -#: model/src/ais_target_data.cpp:1832 -msgid "Capo Verde" -msgstr "crwdns19688:0crwdne19688:0" - -#: model/src/ais_target_data.cpp:1834 -msgid "Crozet Archipelago" -msgstr "crwdns5610:0crwdne5610:0" - -#: model/src/ais_target_data.cpp:1836 -msgid "Ivory Coast" -msgstr "crwdns6225:0crwdne6225:0" - -#: model/src/ais_target_data.cpp:1838 -msgid "Comoros (Union of the)" -msgstr "crwdns5612:0crwdne5612:0" - -#: model/src/ais_target_data.cpp:1840 -msgid "Djibouti" -msgstr "crwdns5613:0crwdne5613:0" - -#: model/src/ais_target_data.cpp:1842 -msgid "Egypt" -msgstr "crwdns5614:0crwdne5614:0" - -#: model/src/ais_target_data.cpp:1844 -msgid "Ethiopia" -msgstr "crwdns5615:0crwdne5615:0" - -#: model/src/ais_target_data.cpp:1846 -msgid "Eritrea" -msgstr "crwdns5616:0crwdne5616:0" - -#: model/src/ais_target_data.cpp:1848 -msgid "Gabonese Republic" -msgstr "crwdns5617:0crwdne5617:0" - -#: model/src/ais_target_data.cpp:1850 -msgid "Ghana" -msgstr "crwdns5618:0crwdne5618:0" - -#: model/src/ais_target_data.cpp:1852 -msgid "Gambia" -msgstr "crwdns5619:0crwdne5619:0" - -#: model/src/ais_target_data.cpp:1854 -msgid "Guinea-Bissau" -msgstr "crwdns5620:0crwdne5620:0" - -#: model/src/ais_target_data.cpp:1856 -msgid "Equatorial Guinea" -msgstr "crwdns5621:0crwdne5621:0" - -#: model/src/ais_target_data.cpp:1858 -msgid "Guinea" -msgstr "crwdns5622:0crwdne5622:0" - -#: model/src/ais_target_data.cpp:1860 -msgid "Burkina Faso" -msgstr "crwdns5623:0crwdne5623:0" - -#: model/src/ais_target_data.cpp:1862 -msgid "Kenya" -msgstr "crwdns5624:0crwdne5624:0" - -#: model/src/ais_target_data.cpp:1864 -msgid "Kerguelen Islands" -msgstr "crwdns5625:0crwdne5625:0" - -#: model/src/ais_target_data.cpp:1867 -msgid "Liberia" -msgstr "crwdns5626:0crwdne5626:0" - -#: model/src/ais_target_data.cpp:1869 -msgid "South Sudan (Republic of)" -msgstr "crwdns5627:0crwdne5627:0" - -#: model/src/ais_target_data.cpp:1871 -msgid "Libya" -msgstr "crwdns8156:0crwdne8156:0" - -#: model/src/ais_target_data.cpp:1873 -msgid "Lesotho" -msgstr "crwdns5629:0crwdne5629:0" - -#: model/src/ais_target_data.cpp:1875 -msgid "Mauritius" -msgstr "crwdns5630:0crwdne5630:0" - -#: model/src/ais_target_data.cpp:1877 -msgid "Madagascar" -msgstr "crwdns5631:0crwdne5631:0" - -#: model/src/ais_target_data.cpp:1879 -msgid "Mali" -msgstr "crwdns5632:0crwdne5632:0" - -#: model/src/ais_target_data.cpp:1881 -msgid "Mozambique" -msgstr "crwdns5633:0crwdne5633:0" - -#: model/src/ais_target_data.cpp:1883 -msgid "Mauritania" -msgstr "crwdns5634:0crwdne5634:0" - -#: model/src/ais_target_data.cpp:1885 -msgid "Malawi" -msgstr "crwdns5635:0crwdne5635:0" - -#: model/src/ais_target_data.cpp:1887 -msgid "Niger" -msgstr "crwdns5636:0crwdne5636:0" - -#: model/src/ais_target_data.cpp:1889 -msgid "Nigeria" -msgstr "crwdns5637:0crwdne5637:0" - -#: model/src/ais_target_data.cpp:1891 -msgid "Namibia" -msgstr "crwdns5638:0crwdne5638:0" - -#: model/src/ais_target_data.cpp:1893 -msgid "Reunion" -msgstr "crwdns5639:0crwdne5639:0" - -#: model/src/ais_target_data.cpp:1895 -msgid "Rwanda" -msgstr "crwdns5640:0crwdne5640:0" - -#: model/src/ais_target_data.cpp:1897 -msgid "Sudan" -msgstr "crwdns5641:0crwdne5641:0" - -#: model/src/ais_target_data.cpp:1899 -msgid "Senegal" -msgstr "crwdns5642:0crwdne5642:0" - -#: model/src/ais_target_data.cpp:1901 -msgid "Seychelles" -msgstr "crwdns5643:0crwdne5643:0" - -#: model/src/ais_target_data.cpp:1903 -msgid "Saint Helena" -msgstr "crwdns5644:0crwdne5644:0" - -#: model/src/ais_target_data.cpp:1905 -msgid "Somalia" -msgstr "crwdns21389:0crwdne21389:0" - -#: model/src/ais_target_data.cpp:1907 -msgid "Sierra Leone" -msgstr "crwdns5646:0crwdne5646:0" - -#: model/src/ais_target_data.cpp:1909 -msgid "Sao Tome and Principe" -msgstr "crwdns5647:0crwdne5647:0" - -#: model/src/ais_target_data.cpp:1911 -msgid "Eswatini" -msgstr "crwdns12708:0crwdne12708:0" - -#: model/src/ais_target_data.cpp:1913 -msgid "Chad" -msgstr "crwdns5649:0crwdne5649:0" - -#: model/src/ais_target_data.cpp:1915 -msgid "Togolese Republic" -msgstr "crwdns5650:0crwdne5650:0" - -#: model/src/ais_target_data.cpp:1917 -msgid "Tunisia" -msgstr "crwdns5651:0crwdne5651:0" - -#: model/src/ais_target_data.cpp:1919 model/src/ais_target_data.cpp:1925 -msgid "Tanzania" -msgstr "crwdns5652:0crwdne5652:0" - -#: model/src/ais_target_data.cpp:1921 -msgid "Uganda" -msgstr "crwdns5653:0crwdne5653:0" - -#: model/src/ais_target_data.cpp:1923 -msgid "Dem Rep.of the Congo" -msgstr "crwdns5654:0crwdne5654:0" - -#: model/src/ais_target_data.cpp:1927 -msgid "Zambia" -msgstr "crwdns5655:0crwdne5655:0" - -#: model/src/ais_target_data.cpp:1929 -msgid "Zimbabwe" -msgstr "crwdns5656:0crwdne5656:0" - -#: model/src/ais_target_data.cpp:1931 -msgid "Argentine Republic" -msgstr "crwdns5657:0crwdne5657:0" - -#: model/src/ais_target_data.cpp:1933 -msgid "Brazil" -msgstr "crwdns5658:0crwdne5658:0" - -#: model/src/ais_target_data.cpp:1935 -msgid "Bolivia" -msgstr "crwdns5659:0crwdne5659:0" - -#: model/src/ais_target_data.cpp:1937 -msgid "Chile" -msgstr "crwdns5660:0crwdne5660:0" - -#: model/src/ais_target_data.cpp:1939 -msgid "Colombia" -msgstr "crwdns5661:0crwdne5661:0" - -#: model/src/ais_target_data.cpp:1941 -msgid "Ecuador" -msgstr "crwdns5662:0crwdne5662:0" - -#: model/src/ais_target_data.cpp:1943 -msgid "Falkland Islands" -msgstr "crwdns5663:0crwdne5663:0" - -#: model/src/ais_target_data.cpp:1945 -msgid "France - Guiana" -msgstr "crwdns19690:0crwdne19690:0" - -#: model/src/ais_target_data.cpp:1947 -msgid "Guyana" -msgstr "crwdns5665:0crwdne5665:0" - -#: model/src/ais_target_data.cpp:1949 -msgid "Paraguay" -msgstr "crwdns5666:0crwdne5666:0" - -#: model/src/ais_target_data.cpp:1951 -msgid "Peru" -msgstr "crwdns5667:0crwdne5667:0" - -#: model/src/ais_target_data.cpp:1953 -msgid "Suriname" -msgstr "crwdns5668:0crwdne5668:0" - -#: model/src/ais_target_data.cpp:1955 -msgid "Uruguay" -msgstr "crwdns5669:0crwdne5669:0" - -#: model/src/ais_target_data.cpp:1957 -msgid "Venezuela" -msgstr "crwdns5670:0crwdne5670:0" - -#: model/src/ais_target_data.cpp:1970 -msgid "Fishing Vessel" -msgstr "crwdns21193:0crwdne21193:0" - -#: model/src/ais_target_data.cpp:1971 -msgid "Towing Vessel" -msgstr "crwdns21195:0crwdne21195:0" - -#: model/src/ais_target_data.cpp:1972 -msgid "Towing Vessel, Long" -msgstr "crwdns21197:0crwdne21197:0" - -#: model/src/ais_target_data.cpp:1973 -msgid "Dredger" -msgstr "crwdns21199:0crwdne21199:0" - -#: model/src/ais_target_data.cpp:1974 -msgid "Diving Ops Vessel" -msgstr "crwdns21347:0crwdne21347:0" - -#: model/src/ais_target_data.cpp:1975 -msgid "Military Vessel" -msgstr "crwdns2386:0crwdne2386:0" - -#: model/src/ais_target_data.cpp:1976 -msgid "Sailing Vessel" -msgstr "crwdns2387:0crwdne2387:0" - -#: model/src/ais_target_data.cpp:1977 -msgid "Pleasure craft" -msgstr "crwdns2388:0crwdne2388:0" - -#: model/src/ais_target_data.cpp:1979 -msgid "Pilot Vessel" -msgstr "crwdns2389:0crwdne2389:0" - -#: model/src/ais_target_data.cpp:1980 -msgid "Search and Rescue Vessel" -msgstr "crwdns2390:0crwdne2390:0" - -#: model/src/ais_target_data.cpp:1981 model/src/ais_target_data.cpp:2045 -msgid "Tug" -msgstr "crwdns2391:0crwdne2391:0" - -#: model/src/ais_target_data.cpp:1982 -msgid "Port Tender" -msgstr "crwdns2392:0crwdne2392:0" - -#: model/src/ais_target_data.cpp:1983 -msgid "Pollution Control Vessel" -msgstr "crwdns2393:0crwdne2393:0" - -#: model/src/ais_target_data.cpp:1984 -msgid "Law Enforcement Vessel" -msgstr "crwdns2394:0crwdne2394:0" - -#: model/src/ais_target_data.cpp:1985 -msgid "Medical Transport" -msgstr "crwdns2395:0crwdne2395:0" - -#: model/src/ais_target_data.cpp:1986 -msgid "Passenger Ship" -msgstr "crwdns2396:0crwdne2396:0" - -#: model/src/ais_target_data.cpp:1987 -msgid "Cargo Ship" -msgstr "crwdns2397:0crwdne2397:0" - -#: model/src/ais_target_data.cpp:1990 -msgid "Unspecified" -msgstr "crwdns2399:0crwdne2399:0" - -#: model/src/ais_target_data.cpp:1991 -msgid "Reference Point" -msgstr "crwdns2400:0crwdne2400:0" - -#: model/src/ais_target_data.cpp:1992 model/src/ais_target_data.cpp:2057 -msgid "RACON" -msgstr "crwdns2401:0crwdne2401:0" - -#: model/src/ais_target_data.cpp:1993 -msgid "Fixed Structure" -msgstr "crwdns2402:0crwdne2402:0" - -#: model/src/ais_target_data.cpp:1994 -msgid "Spare" -msgstr "crwdns2403:0crwdne2403:0" - -#: model/src/ais_target_data.cpp:1995 -msgid "Light" -msgstr "crwdns2404:0crwdne2404:0" - -#: model/src/ais_target_data.cpp:1996 -msgid "Light w/Sectors" -msgstr "crwdns2405:0crwdne2405:0" - -#: model/src/ais_target_data.cpp:1997 -msgid "Leading Light Front" -msgstr "crwdns2406:0crwdne2406:0" - -#: model/src/ais_target_data.cpp:1998 -msgid "Leading Light Rear" -msgstr "crwdns2407:0crwdne2407:0" - -#: model/src/ais_target_data.cpp:1999 -msgid "Cardinal N Beacon" -msgstr "crwdns2408:0crwdne2408:0" - -#: model/src/ais_target_data.cpp:2000 -msgid "Cardinal E Beacon" -msgstr "crwdns2409:0crwdne2409:0" - -#: model/src/ais_target_data.cpp:2001 -msgid "Cardinal S Beacon" -msgstr "crwdns2410:0crwdne2410:0" - -#: model/src/ais_target_data.cpp:2002 -msgid "Cardinal W Beacon" -msgstr "crwdns2411:0crwdne2411:0" - -#: model/src/ais_target_data.cpp:2003 -msgid "Beacon, Port Hand" -msgstr "crwdns2412:0crwdne2412:0" - -#: model/src/ais_target_data.cpp:2004 -msgid "Beacon, Starboard Hand" -msgstr "crwdns2413:0crwdne2413:0" - -#: model/src/ais_target_data.cpp:2005 -msgid "Beacon, Preferred Channel Port Hand" -msgstr "crwdns2414:0crwdne2414:0" - -#: model/src/ais_target_data.cpp:2006 -msgid "Beacon, Preferred Channel Starboard Hand" -msgstr "crwdns2415:0crwdne2415:0" - -#: model/src/ais_target_data.cpp:2007 -msgid "Beacon, Isolated Danger" -msgstr "crwdns2416:0crwdne2416:0" - -#: model/src/ais_target_data.cpp:2008 -msgid "Beacon, Safe Water" -msgstr "crwdns2417:0crwdne2417:0" - -#: model/src/ais_target_data.cpp:2009 -msgid "Beacon, Special Mark" -msgstr "crwdns2418:0crwdne2418:0" - -#: model/src/ais_target_data.cpp:2010 -msgid "Cardinal Mark N" -msgstr "crwdns2419:0crwdne2419:0" - -#: model/src/ais_target_data.cpp:2011 -msgid "Cardinal Mark E" -msgstr "crwdns2420:0crwdne2420:0" - -#: model/src/ais_target_data.cpp:2012 -msgid "Cardinal Mark S" -msgstr "crwdns2421:0crwdne2421:0" - -#: model/src/ais_target_data.cpp:2013 -msgid "Cardinal Mark W" -msgstr "crwdns2422:0crwdne2422:0" - -#: model/src/ais_target_data.cpp:2014 -msgid "Port Hand Mark" -msgstr "crwdns2423:0crwdne2423:0" - -#: model/src/ais_target_data.cpp:2015 -msgid "Starboard Hand Mark" -msgstr "crwdns2424:0crwdne2424:0" - -#: model/src/ais_target_data.cpp:2016 -msgid "Preferred Channel Port Hand" -msgstr "crwdns2425:0crwdne2425:0" - -#: model/src/ais_target_data.cpp:2017 -msgid "Preferred Channel Starboard Hand" -msgstr "crwdns2426:0crwdne2426:0" - -#: model/src/ais_target_data.cpp:2018 -msgid "Isolated Danger" -msgstr "crwdns2427:0crwdne2427:0" - -#: model/src/ais_target_data.cpp:2019 model/src/ais_target_data.cpp:2073 -#: model/src/ais_target_data.cpp:2084 -msgid "Safe Water" -msgstr "crwdns2428:0crwdne2428:0" - -#: model/src/ais_target_data.cpp:2020 -msgid "Special Mark" -msgstr "crwdns2429:0crwdne2429:0" - -#: model/src/ais_target_data.cpp:2021 -msgid "Light Vessel/Rig" -msgstr "crwdns2430:0crwdne2430:0" - -#: model/src/ais_target_data.cpp:2022 -msgid "GpsGate Buddy" -msgstr "crwdns2431:0crwdne2431:0" - -#: model/src/ais_target_data.cpp:2023 -msgid "Position Report" -msgstr "crwdns2432:0crwdne2432:0" - -#: model/src/ais_target_data.cpp:2024 model/src/ais_target_data.cpp:2089 -msgid "Distress" -msgstr "crwdns2433:0crwdne2433:0" - -#: model/src/ais_target_data.cpp:2025 -msgid "ARPA radar target" -msgstr "crwdns2434:0crwdne2434:0" - -#: model/src/ais_target_data.cpp:2034 -msgid "F/V" -msgstr "crwdns2436:0crwdne2436:0" - -#: model/src/ais_target_data.cpp:2035 -msgid "Tow" -msgstr "crwdns2437:0crwdne2437:0" - -#: model/src/ais_target_data.cpp:2036 -msgid "Long Tow" -msgstr "crwdns2438:0crwdne2438:0" - -#: model/src/ais_target_data.cpp:2037 -msgid "Dredge" -msgstr "crwdns2439:0crwdne2439:0" - -#: model/src/ais_target_data.cpp:2038 -msgid "D/V" -msgstr "crwdns2440:0crwdne2440:0" - -#: model/src/ais_target_data.cpp:2039 -msgid "Mil/V" -msgstr "crwdns2441:0crwdne2441:0" - -#: model/src/ais_target_data.cpp:2040 -msgid "S/V" -msgstr "crwdns2442:0crwdne2442:0" - -#: model/src/ais_target_data.cpp:2041 -msgid "Yat" -msgstr "crwdns2443:0crwdne2443:0" - -#: model/src/ais_target_data.cpp:2042 -msgid "HSC" -msgstr "crwdns2444:0crwdne2444:0" - -#: model/src/ais_target_data.cpp:2043 -msgid "P/V" -msgstr "crwdns2445:0crwdne2445:0" - -#: model/src/ais_target_data.cpp:2044 -msgid "SAR/V" -msgstr "crwdns2446:0crwdne2446:0" - -#: model/src/ais_target_data.cpp:2046 -msgid "Tender" -msgstr "crwdns2447:0crwdne2447:0" - -#: model/src/ais_target_data.cpp:2047 -msgid "PC/V" -msgstr "crwdns2448:0crwdne2448:0" - -#: model/src/ais_target_data.cpp:2048 -msgid "LE/V" -msgstr "crwdns2449:0crwdne2449:0" - -#: model/src/ais_target_data.cpp:2049 -msgid "Med/V" -msgstr "crwdns2450:0crwdne2450:0" - -#: model/src/ais_target_data.cpp:2050 -msgid "Pass/V" -msgstr "crwdns2451:0crwdne2451:0" - -#: model/src/ais_target_data.cpp:2051 -msgid "M/V" -msgstr "crwdns2452:0crwdne2452:0" - -#: model/src/ais_target_data.cpp:2052 -msgid "M/T" -msgstr "crwdns2453:0crwdne2453:0" - -#: model/src/ais_target_data.cpp:2053 model/src/ais_target_data.cpp:2059 -msgid "?" -msgstr "crwdns2454:0crwdne2454:0" - -#: model/src/ais_target_data.cpp:2056 -msgid "Ref. Pt" -msgstr "crwdns2456:0crwdne2456:0" - -#: model/src/ais_target_data.cpp:2058 -msgid "Fix.Struct." -msgstr "crwdns2457:0crwdne2457:0" - -#: model/src/ais_target_data.cpp:2060 -msgid "Lt" -msgstr "crwdns2458:0crwdne2458:0" - -#: model/src/ais_target_data.cpp:2061 -msgid "Lt sect." -msgstr "crwdns2459:0crwdne2459:0" - -#: model/src/ais_target_data.cpp:2062 -msgid "Ldg Lt Front" -msgstr "crwdns2460:0crwdne2460:0" - -#: model/src/ais_target_data.cpp:2063 -msgid "Ldg Lt Rear" -msgstr "crwdns2461:0crwdne2461:0" - -#: model/src/ais_target_data.cpp:2064 model/src/ais_target_data.cpp:2075 -msgid "Card. N" -msgstr "crwdns2462:0crwdne2462:0" - -#: model/src/ais_target_data.cpp:2065 model/src/ais_target_data.cpp:2076 -msgid "Card. E" -msgstr "crwdns2463:0crwdne2463:0" - -#: model/src/ais_target_data.cpp:2066 model/src/ais_target_data.cpp:2077 -msgid "Card. S" -msgstr "crwdns2464:0crwdne2464:0" - -#: model/src/ais_target_data.cpp:2067 model/src/ais_target_data.cpp:2078 -msgid "Card. W" -msgstr "crwdns2465:0crwdne2465:0" - -#: model/src/ais_target_data.cpp:2068 -msgid "Port" -msgstr "crwdns2466:0crwdne2466:0" - -#: model/src/ais_target_data.cpp:2069 -msgid "Stbd" -msgstr "crwdns2467:0crwdne2467:0" - -#: model/src/ais_target_data.cpp:2070 model/src/ais_target_data.cpp:2071 -#: model/src/ais_target_data.cpp:2081 model/src/ais_target_data.cpp:2082 -msgid "Pref. Chnl" -msgstr "crwdns2468:0crwdne2468:0" - -#: model/src/ais_target_data.cpp:2072 model/src/ais_target_data.cpp:2083 -msgid "Isol. Dngr" -msgstr "crwdns2469:0crwdne2469:0" - -#: model/src/ais_target_data.cpp:2074 model/src/ais_target_data.cpp:2085 -msgid "Special" -msgstr "crwdns2470:0crwdne2470:0" - -#: model/src/ais_target_data.cpp:2079 -msgid "Port Hand" -msgstr "crwdns2471:0crwdne2471:0" - -#: model/src/ais_target_data.cpp:2080 -msgid "Stbd Hand" -msgstr "crwdns2472:0crwdne2472:0" - -#: model/src/ais_target_data.cpp:2086 -msgid "LtV/Rig" -msgstr "crwdns2473:0crwdne2473:0" - -#: model/src/comm_n0183_output.cpp:288 -msgid "Connecting to " -msgstr "crwdns29062:0crwdne29062:0" - -#: model/src/comm_n0183_output.cpp:308 -msgid "Connected to " -msgstr "crwdns29064:0crwdne29064:0" - -#: model/src/conn_params.cpp:171 gui/src/connection_edit.cpp:273 -#: gui/src/conn_params_panel.cpp:220 gui/src/conn_params_panel.cpp:728 -msgid "Serial" -msgstr "crwdns26885:0crwdne26885:0" - -#: model/src/conn_params.cpp:173 gui/src/connection_edit.cpp:278 -#: gui/src/conn_params_panel.cpp:312 gui/src/conn_params_panel.cpp:765 -msgid "Network" -msgstr "crwdns26887:0crwdne26887:0" - -#: model/src/conn_params.cpp:175 -msgid "GPS" -msgstr "crwdns27035:0crwdne27035:0" - -#: model/src/conn_params.cpp:177 -msgid "BT" -msgstr "crwdns27037:0crwdne27037:0" - -#: model/src/conn_params.cpp:189 -msgid "Internal" -msgstr "crwdns27039:0crwdne27039:0" - -#: model/src/conn_params.cpp:200 gui/src/connection_edit.cpp:351 -msgid "TCP" -msgstr "crwdns26899:0crwdne26899:0" - -#: model/src/conn_params.cpp:202 gui/src/connection_edit.cpp:358 -msgid "UDP" -msgstr "crwdns26901:0crwdne26901:0" - -#: model/src/conn_params.cpp:204 gui/src/connection_edit.cpp:364 -msgid "GPSD" -msgstr "crwdns26903:0crwdne26903:0" - -#: model/src/conn_params.cpp:206 gui/src/connection_edit.cpp:370 -msgid "Signal K" -msgstr "crwdns26905:0crwdne26905:0" - -#: model/src/conn_params.cpp:229 -msgid "Input" -msgstr "crwdns27041:0crwdne27041:0" - -#: model/src/conn_params.cpp:231 -msgid "Output" -msgstr "crwdns27043:0crwdne27043:0" - -#: model/src/conn_params.cpp:233 -msgid "In/Out" -msgstr "crwdns27045:0crwdne27045:0" - -#: model/src/conn_params.cpp:240 -msgid "Reject" -msgstr "crwdns27047:0crwdne27047:0" - -#: model/src/conn_params.cpp:242 -msgid "Accept" -msgstr "crwdns27049:0crwdne27049:0" - -#: model/src/conn_params.cpp:245 -msgid "Drop" -msgstr "crwdns27051:0crwdne27051:0" - -#: model/src/conn_params.cpp:247 gui/src/SendToGpsDlg.cpp:207 -#: gui/src/SendToPeerDlg.cpp:285 -msgid "Send" -msgstr "crwdns8008:0crwdne8008:0" - -#: model/src/conn_params.cpp:264 -msgid "In" -msgstr "crwdns27053:0crwdne27053:0" - -#: model/src/conn_params.cpp:270 -msgid "In: None" -msgstr "crwdns27055:0crwdne27055:0" - -#: model/src/conn_params.cpp:274 -msgid "Out" -msgstr "crwdns27057:0crwdne27057:0" - -#: model/src/conn_params.cpp:280 -msgid ", Out: None" -msgstr "crwdns27059:0crwdne27059:0" - -#: model/src/instance_handler.cpp:162 gui/src/ocpn_app.cpp:1044 -msgid "Sorry, an existing instance of OpenCPN may be too busy to respond.\n" -"Please retry." -msgstr "crwdns27343:0crwdne27343:0" - -#: model/src/navutil_base.cpp:264 -msgid "C" -msgstr "crwdns21243:0crwdne21243:0" - -#: model/src/navutil_base.cpp:267 -msgid "F" -msgstr "crwdns21245:0crwdne21245:0" - -#: model/src/navutil_base.cpp:270 -msgid "K" -msgstr "crwdns21247:0crwdne21247:0" - -#: model/src/navutil_base.cpp:284 gui/src/MarkInfo.cpp:612 -msgid "NMi" -msgstr "crwdns2183:0crwdne2183:0" - -#: model/src/navutil_base.cpp:287 -msgid "mi" -msgstr "crwdns27077:0crwdne27077:0" - -#: model/src/navutil_base.cpp:290 gui/src/MarkInfo.cpp:612 -msgid "km" -msgstr "crwdns2185:0crwdne2185:0" - -#: model/src/navutil_base.cpp:293 model/src/navutil_base.cpp:483 -msgid "m" -msgstr "crwdns27079:0crwdne27079:0" - -#: model/src/navutil_base.cpp:296 model/src/navutil_base.cpp:480 -msgid "ft" -msgstr "crwdns27081:0crwdne27081:0" - -#: model/src/navutil_base.cpp:299 model/src/navutil_base.cpp:486 -msgid "fa" -msgstr "crwdns27083:0crwdne27083:0" - -#: model/src/navutil_base.cpp:305 -msgid "cm" -msgstr "crwdns27085:0crwdne27085:0" - -#: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 -msgid "mph" -msgstr "crwdns27089:0crwdne27089:0" - -#: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 -msgid "km/h" -msgstr "crwdns2193:0crwdne2193:0" - -#: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 -msgid "m/s" -msgstr "crwdns2194:0crwdne2194:0" - -#: model/src/navutil_base.cpp:657 -msgid "H " -msgstr "crwdns29184:0crwdne29184:0" - -#: model/src/navutil_base.cpp:658 -msgid "M" -msgstr "crwdns29186:0crwdne29186:0" - -#: model/src/navutil_base.cpp:660 -msgid "M " -msgstr "crwdns29188:0crwdne29188:0" - -#: model/src/navutil_base.cpp:661 -msgid "S" -msgstr "crwdns29190:0crwdne29190:0" - -#: model/src/navutil_base.cpp:672 gui/src/RoutePropDlgImpl.cpp:355 -#: gui/src/RoutePropDlgImpl.cpp:360 -msgid "N/A" -msgstr "crwdns12382:0crwdne12382:0" - -#: model/src/plugin_blacklist.cpp:62 -#, c-format -msgid "\n" -"PlugIn %s, version %i.%i was detected.\n" -"This version is known to be unstable and will not be loaded.\n" -"Please update this PlugIn using the PlugIn manager master catalog.\n" -msgstr "crwdns27409:0%scrwdnd27409:0%icrwdnd27409:0%icrwdne27409:0" - -#: model/src/plugin_blacklist.cpp:68 -#, c-format -msgid "\n" -"PlugIn %s, version %i.%i was detected.\n" -"This version is known to be unstable.\n" -"Please update this PlugIn using the PlugIn manager master catalog.\n" -msgstr "crwdns27411:0%scrwdnd27411:0%icrwdnd27411:0%icrwdne27411:0" - -#: model/src/plugin_blacklist.cpp:74 -#, c-format -msgid "\n" -"PlugIn %s, version %i.%i was detected.\n" -"This plugin is obsolete, the o-charts plugin should be used\n" -"instead. Please uninstall this plugin and install o-charts\n" -"using the PlugIn manager master catalog.\n" -msgstr "crwdns27413:0%scrwdnd27413:0%icrwdnd27413:0%icrwdne27413:0" - -#: model/src/plugin_blacklist.cpp:251 -#, c-format -msgid "Plugin library %s can not be loaded" -msgstr "crwdns27263:0%scrwdne27263:0" - -#: model/src/plugin_loader.cpp:168 -msgid " [Imported]" -msgstr "crwdns29068:0crwdne29068:0" - -#: model/src/plugin_loader.cpp:170 -msgid " [Orphan]" -msgstr "crwdns29070:0crwdne29070:0" - -#: model/src/plugin_loader.cpp:1454 -msgid "\n" -" Install/uninstall plugin or remove file to mute message" -msgstr "crwdns27273:0crwdne27273:0" - -#: model/src/plugin_loader.cpp:1457 -msgid " PluginLoader: Cannot load symbol create_pi: " -msgstr "crwdns27415:0crwdne27415:0" - -#: model/src/plugin_loader.cpp:1581 -msgid "Incompatible plugin detected: " -msgstr "crwdns27265:0crwdne27265:0" - -#: model/src/plugin_loader.cpp:1582 -msgid " API Version detected: " -msgstr "crwdns27279:0crwdne27279:0" - -#: model/src/plugin_loader.cpp:1584 -msgid " PlugIn Version detected: " -msgstr "crwdns27281:0crwdne27281:0" - -#: model/src/rest_server.cpp:368 -msgid "No error" -msgstr "crwdns29072:0crwdne29072:0" - -#: model/src/rest_server.cpp:370 -msgid "Server Generic Error" -msgstr "crwdns27241:0crwdne27241:0" - -#: model/src/rest_server.cpp:372 -msgid "Peer rejected object" -msgstr "crwdns27243:0crwdne27243:0" - -#: model/src/rest_server.cpp:374 -msgid "Peer rejected duplicate object" -msgstr "crwdns27245:0crwdne27245:0" - -#: model/src/rest_server.cpp:376 -msgid "Peer internal error (insert)" -msgstr "crwdns27247:0crwdne27247:0" - -#: model/src/rest_server.cpp:378 -msgid "Peer requests new pincode" -msgstr "crwdns29074:0crwdne29074:0" - -#: model/src/rest_server.cpp:380 -msgid "XML parse error" -msgstr "crwdns29076:0crwdne29076:0" - -#: model/src/rest_server.cpp:382 -msgid "Unspecified error" -msgstr "crwdns29078:0crwdne29078:0" - -#: model/src/rest_server.cpp:518 -msgid "wants to send you new data." -msgstr "crwdns29080:0crwdne29080:0" - -#: model/src/rest_server.cpp:519 -msgid "Please enter the following PIN number on " -msgstr "crwdns29082:0crwdne29082:0" - -#: model/src/rest_server.cpp:520 -msgid "to pair with this device" -msgstr "crwdns29084:0crwdne29084:0" - -#: model/src/rest_server.cpp:646 -msgid "The received route already exists on this system.\n" -"Replace?" -msgstr "crwdns27301:0crwdne27301:0" - -#: model/src/rest_server.cpp:647 model/src/rest_server.cpp:689 -#: model/src/rest_server.cpp:730 -msgid "Always replace objects?" -msgstr "crwdns29086:0crwdne29086:0" - -#: model/src/rest_server.cpp:688 -msgid "The received track already exists on this system.\n" -"Replace?" -msgstr "crwdns27305:0crwdne27305:0" - -#: model/src/rest_server.cpp:729 -msgid "The received waypoint already exists on this system.\n" -"Replace?" -msgstr "crwdns27307:0crwdne27307:0" - -#: model/src/routeman.cpp:903 -msgid "Waypoints can be renamed to reflect the new order, the names will be '001', '002' etc.\n\n" -"Do you want to rename the waypoints?" -msgstr "crwdns2825:0crwdne2825:0" - -#: model/src/routeman.cpp:909 -msgid "Waypoints will be renamed to reflect the natural order, the names will be '001', '002' etc.\n\n" -"Do you want to rename the waypoints?" -msgstr "crwdns21323:0crwdne21323:0" - -#: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 -msgid "About OpenCPN" -msgstr "crwdns1950:0crwdne1950:0" - -#: gui/include/gui/AISTargetAlertDialog.h:48 gui/src/routemanagerdialog.cpp:1404 -#: gui/src/routemanagerdialog.cpp:1448 gui/src/routemanagerdialog.cpp:2260 -#: gui/src/routemanagerdialog.cpp:2366 gui/src/routemanagerdialog.cpp:2726 -#: gui/src/routemanagerdialog.cpp:2758 gui/src/routemanagerdialog.cpp:2893 -#: gui/src/routemanagerdialog.cpp:3057 gui/src/toolbar.cpp:2297 -msgid "OpenCPN Alert" -msgstr "crwdns2335:0crwdne2335:0" - -#: gui/include/gui/AISTargetAlertDialog.h:67 -msgid "OpenCPN AIS Alert" -msgstr "crwdns7862:0crwdne7862:0" - -#: gui/include/gui/AISTargetQueryDialog.h:46 -#: gui/include/gui/AISTargetQueryDialog.h:57 gui/include/gui/S57QueryDialog.h:42 -#: gui/include/gui/S57QueryDialog.h:51 gui/src/canvasMenu.cpp:475 -#: gui/src/canvasMenu.cpp:484 gui/src/chcanv.cpp:9750 -msgid "Object Query" -msgstr "crwdns2135:0crwdne2135:0" - -#: gui/include/gui/GoToPositionDialog.h:44 gui/src/AISTargetListDialog.cpp:699 -#: gui/src/canvasMenu.cpp:518 -msgid "Center view" -msgstr "crwdns9219:0crwdne9219:0" - -#: gui/include/gui/LinkPropDlg.h:79 gui/include/gui/LinkPropDlg.h:92 -msgid "Link Properties" -msgstr "crwdns1951:0crwdne1951:0" - -#: gui/include/gui/MarkInfo.h:100 gui/include/gui/MarkInfo.h:361 -#: gui/src/chcanv.cpp:9908 gui/src/routemanagerdialog.cpp:2689 -#: gui/src/RoutePropDlgImpl.cpp:927 -msgid "Waypoint Properties" -msgstr "crwdns1946:0crwdne1946:0" - -#: gui/include/gui/n0183_ctx_factory.h:37 -msgid "Overwrite Garmin device route number 1?" -msgstr "crwdns24764:0crwdne24764:0" - -#: gui/include/gui/n0183_ctx_factory.h:38 -msgid "OpenCPN Message" -msgstr "crwdns24766:0crwdne24766:0" - -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 -msgid "Options" -msgstr "crwdns1948:0crwdne1948:0" - -#: gui/include/gui/peer_client_dlg.h:41 gui/include/gui/rest_server_gui.h:44 -#: gui/include/gui/SendToGpsDlg.h:40 gui/src/canvasMenu.cpp:774 -#: gui/src/canvasMenu.cpp:874 gui/src/canvasMenu.cpp:925 -#: gui/src/canvasMenu.cpp:1731 gui/src/canvasMenu.cpp:1742 -#: gui/src/canvasMenu.cpp:1782 gui/src/canvasMenu.cpp:1793 -#: gui/src/routemanagerdialog.cpp:496 gui/src/routemanagerdialog.cpp:1847 -#: gui/src/routemanagerdialog.cpp:2863 -msgid "Send to GPS" -msgstr "crwdns7978:0crwdne7978:0" - -#: gui/include/gui/routeprintout.h:77 gui/src/routeprintout.cpp:340 -msgid "Print Route Selection" -msgstr "crwdns2849:0crwdne2849:0" - -#: gui/include/gui/RoutePropDlg.h:174 gui/include/gui/RoutePropDlgImpl.h:97 -#: gui/src/canvasMenu.cpp:1893 gui/src/chcanv.cpp:7765 -#: gui/src/RoutePropDlgImpl.cpp:514 -msgid "Route Properties" -msgstr "crwdns1945:0crwdne1945:0" - -#: gui/include/gui/S57QueryDialog.h:88 gui/include/gui/S57QueryDialog.h:94 -#: gui/src/S57QueryDialog.cpp:218 -msgid "Extra Object Info" -msgstr "crwdns12262:0crwdne12262:0" - -#: gui/include/gui/SendToPeerDlg.h:61 gui/src/routemanagerdialog.cpp:497 -msgid "Send to Peer" -msgstr "crwdns27455:0crwdne27455:0" - -#: gui/include/gui/trackprintout.h:78 gui/src/trackprintout.cpp:275 -msgid "Print Track Selection" -msgstr "crwdns24644:0crwdne24644:0" - -#: gui/include/gui/TrackPropDlg.h:197 gui/src/TrackPropDlg.cpp:1228 -#: gui/src/TrackPropDlg.cpp:1242 -msgid "Track properties" -msgstr "crwdns9220:0crwdne9220:0" - -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 -msgid "OpenCPN Initial Configuration" -msgstr "crwdns29280:0crwdne29280:0" - -#: gui/src/about.cpp:224 gui/src/about.cpp:268 gui/src/about.cpp:402 -#: gui/src/about.cpp:520 gui/src/AISTargetListDialog.cpp:325 -#: gui/src/CanvasOptions.cpp:73 gui/src/chcanv.cpp:11994 -#: gui/src/chcanv.cpp:12027 gui/src/ChInfoWin.cpp:53 gui/src/cm93.cpp:6239 -#: gui/src/concanv.cpp:103 gui/src/connection_edit.cpp:247 -#: gui/src/conn_params_panel.cpp:86 gui/src/conn_params_panel.cpp:144 -#: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 -#: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 -#: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 -#: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 -#: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 -#: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 -#: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 -#: gui/src/TrackPropDlg.cpp:654 -msgid "Dialog" -msgstr "crwdns2027:0crwdne2027:0" - -#: gui/src/about.cpp:398 -msgid "The Open Source Chart Plotter/Navigator" -msgstr "crwdns24646:0crwdne24646:0" - -#: gui/src/about.cpp:420 -msgid "Copy Log File to Clipboard" -msgstr "crwdns24648:0crwdne24648:0" - -#: gui/src/about.cpp:423 -msgid "Copy Settings File to Clipboard" -msgstr "crwdns24650:0crwdne24650:0" - -#: gui/src/about.cpp:447 -msgid "About" -msgstr "crwdns24652:0crwdne24652:0" - -#: gui/src/about.cpp:464 -msgid "Authors" -msgstr "crwdns24654:0crwdne24654:0" - -#: gui/src/about.cpp:480 gui/src/AboutFrame.cpp:249 -msgid "License" -msgstr "crwdns2820:0crwdne2820:0" - -#: gui/src/about.cpp:495 gui/src/AboutFrame.cpp:238 -msgid "Help" -msgstr "crwdns2821:0crwdne2821:0" - -#: gui/src/about.cpp:501 gui/src/AISTargetListDialog.cpp:794 -msgid "Close" -msgstr "crwdns2822:0crwdne2822:0" - -#: gui/src/AboutFrame.cpp:36 -msgid "< Back" -msgstr "crwdns12264:0crwdne12264:0" - -#: gui/src/AboutFrame.cpp:52 gui/src/udev_rule_mgr.cpp:375 -msgid "OpenCPN" -msgstr "crwdns12266:0crwdne12266:0" - -#: gui/src/AboutFrame.cpp:74 -msgid "(c) 2000-2023" -msgstr "crwdns27335:0crwdne27335:0" - -#: gui/src/AboutFrame.cpp:81 -msgid "The OpenCPN Authors" -msgstr "crwdns12272:0crwdne12272:0" - -#: gui/src/AboutFrame.cpp:93 -msgid "OpenCPN is a Free Software project, built by sailors.\n" -"It is freely available to download and distribute without charge." -msgstr "crwdns12274:0crwdne12274:0" - -#: gui/src/AboutFrame.cpp:103 -msgid "Want to help?" -msgstr "crwdns12276:0crwdne12276:0" - -#: gui/src/AboutFrame.cpp:109 -msgid "Donate" -msgstr "crwdns12278:0crwdne12278:0" - -#: gui/src/AboutFrame.cpp:118 -msgid "or" -msgstr "crwdns12280:0crwdne12280:0" - -#: gui/src/AboutFrame.cpp:124 -msgid "get involved!" -msgstr "crwdns12282:0crwdne12282:0" - -#: gui/src/AboutFrame.cpp:139 -msgid "Logfile:" -msgstr "crwdns12284:0crwdne12284:0" - -#: gui/src/AboutFrame.cpp:161 -msgid "Config file:" -msgstr "crwdns12288:0crwdne12288:0" - -#: gui/src/AboutFrame.cpp:174 -msgid "Copy to clipboard" -msgstr "crwdns12292:0crwdne12292:0" - -#: gui/src/AboutFrame.cpp:182 -msgid "Plugin API: " -msgstr "crwdns19670:0crwdne19670:0" - -#: gui/src/AboutFrame.cpp:226 -msgid "OpenCPN Website" -msgstr "crwdns12294:0crwdne12294:0" - -#: gui/src/AboutFrameImpl.cpp:94 -msgid "OpenCPN Help documentation is not available locally." -msgstr "crwdns16158:0crwdne16158:0" - -#: gui/src/AboutFrameImpl.cpp:97 -msgid "Would you like to visit the opencpn.org website for more information?" -msgstr "crwdns16160:0crwdne16160:0" - -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 -#: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 -#: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 -#: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 -#: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 -#: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 -#: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 -#: gui/src/SendToPeerDlg.cpp:114 gui/src/tcmgr.cpp:685 -#: gui/src/udev_rule_mgr.cpp:404 -msgid "OpenCPN Info" -msgstr "crwdns1979:0crwdne1979:0" - -#: gui/src/ais.cpp:85 -msgid "Caution Area: Marine mammals habitat (implies whales NOT observed)" -msgstr "crwdns2478:0crwdne2478:0" - -#: gui/src/ais.cpp:87 -msgid "Caution Area: Marine mammals in area - reduce speed" -msgstr "crwdns2479:0crwdne2479:0" - -#: gui/src/ais.cpp:88 -msgid "Caution Area: Marine mammals in area - stay clear" -msgstr "crwdns2480:0crwdne2480:0" - -#: gui/src/ais.cpp:89 -msgid "Caution Area: Marine mammals in area - report sightings" -msgstr "crwdns2481:0crwdne2481:0" - -#: gui/src/ais.cpp:90 -msgid "Caution Area: Protected habitat - reduce speed" -msgstr "crwdns2482:0crwdne2482:0" - -#: gui/src/ais.cpp:91 -msgid "Caution Area: Protected habitat - stay clear" -msgstr "crwdns2483:0crwdne2483:0" - -#: gui/src/ais.cpp:92 -msgid "Caution Area: Protected habitat - no fishing or anchoring" -msgstr "crwdns2484:0crwdne2484:0" - -#: gui/src/ais.cpp:93 -msgid "Caution Area: Derelicts (drifting objects)" -msgstr "crwdns2485:0crwdne2485:0" - -#: gui/src/ais.cpp:94 -msgid "Caution Area: Traffic congestion" -msgstr "crwdns2486:0crwdne2486:0" - -#: gui/src/ais.cpp:95 -msgid "Caution Area: Marine event" -msgstr "crwdns2487:0crwdne2487:0" - -#: gui/src/ais.cpp:96 -msgid "Caution Area: Divers down" -msgstr "crwdns2488:0crwdne2488:0" - -#: gui/src/ais.cpp:97 -msgid "Caution Area: Swim area" -msgstr "crwdns2489:0crwdne2489:0" - -#: gui/src/ais.cpp:98 -msgid "Caution Area: Dredge operations" -msgstr "crwdns2490:0crwdne2490:0" - -#: gui/src/ais.cpp:99 -msgid "Caution Area: Survey operations" -msgstr "crwdns2491:0crwdne2491:0" - -#: gui/src/ais.cpp:100 -msgid "Caution Area: Underwater operation" -msgstr "crwdns2492:0crwdne2492:0" - -#: gui/src/ais.cpp:101 -msgid "Caution Area: Seaplane operations" -msgstr "crwdns2493:0crwdne2493:0" - -#: gui/src/ais.cpp:102 -msgid "Caution Area: Fishery - nets in water" -msgstr "crwdns2494:0crwdne2494:0" - -#: gui/src/ais.cpp:103 -msgid "Caution Area: Cluster of fishing vessels" -msgstr "crwdns2495:0crwdne2495:0" - -#: gui/src/ais.cpp:104 -msgid "Caution Area: Fairway closed" -msgstr "crwdns2496:0crwdne2496:0" - -#: gui/src/ais.cpp:105 -msgid "Caution Area: Harbour closed" -msgstr "crwdns2497:0crwdne2497:0" - -#: gui/src/ais.cpp:106 -msgid "Caution Area: Risk (define in Associated text field)" -msgstr "crwdns2498:0crwdne2498:0" - -#: gui/src/ais.cpp:107 -msgid "Caution Area: Underwater vehicle operation" -msgstr "crwdns2499:0crwdne2499:0" - -#: gui/src/ais.cpp:108 gui/src/ais.cpp:119 gui/src/ais.cpp:127 -#: gui/src/ais.cpp:134 gui/src/ais.cpp:135 gui/src/ais.cpp:136 -#: gui/src/ais.cpp:137 gui/src/ais.cpp:138 gui/src/ais.cpp:139 -#: gui/src/ais.cpp:140 gui/src/ais.cpp:141 gui/src/ais.cpp:142 -#: gui/src/ais.cpp:143 gui/src/ais.cpp:147 gui/src/ais.cpp:148 -#: gui/src/ais.cpp:149 gui/src/ais.cpp:150 gui/src/ais.cpp:151 -#: gui/src/ais.cpp:165 gui/src/ais.cpp:166 gui/src/ais.cpp:167 -#: gui/src/ais.cpp:176 gui/src/ais.cpp:177 gui/src/ais.cpp:199 -#: gui/src/ais.cpp:200 gui/src/ais.cpp:201 gui/src/ais.cpp:203 -#: gui/src/ais.cpp:206 gui/src/ais.cpp:207 gui/src/ais.cpp:208 -#: gui/src/ais.cpp:209 gui/src/ais.cpp:210 gui/src/ais.cpp:214 -#: gui/src/ais.cpp:215 -msgid "(reserved for future use)" -msgstr "crwdns2500:0crwdne2500:0" - -#: gui/src/ais.cpp:109 -msgid "Environmental Caution Area: Storm front (line squall)" -msgstr "crwdns2501:0crwdne2501:0" - -#: gui/src/ais.cpp:110 -msgid "Environmental Caution Area: Hazardous sea ice" -msgstr "crwdns2502:0crwdne2502:0" - -#: gui/src/ais.cpp:111 -msgid "Environmental Caution Area: Storm warning (storm cell or line of storms)" -msgstr "crwdns2503:0crwdne2503:0" - -#: gui/src/ais.cpp:113 -msgid "Environmental Caution Area: High wind" -msgstr "crwdns2504:0crwdne2504:0" - -#: gui/src/ais.cpp:114 -msgid "Environmental Caution Area: High waves" -msgstr "crwdns2505:0crwdne2505:0" - -#: gui/src/ais.cpp:115 -msgid "Environmental Caution Area: Restricted visibility (fog, rain, etc.)" -msgstr "crwdns2506:0crwdne2506:0" - -#: gui/src/ais.cpp:117 -msgid "Environmental Caution Area: Strong currents" -msgstr "crwdns2507:0crwdne2507:0" - -#: gui/src/ais.cpp:118 -msgid "Environmental Caution Area: Heavy icing" -msgstr "crwdns2508:0crwdne2508:0" - -#: gui/src/ais.cpp:120 -msgid "Restricted Area: Fishing prohibited" -msgstr "crwdns2509:0crwdne2509:0" - -#: gui/src/ais.cpp:121 -msgid "Restricted Area: No anchoring." -msgstr "crwdns2510:0crwdne2510:0" - -#: gui/src/ais.cpp:122 -msgid "Restricted Area: Entry approval required prior to transit" -msgstr "crwdns2511:0crwdne2511:0" - -#: gui/src/ais.cpp:123 -msgid "Restricted Area: Entry prohibited" -msgstr "crwdns2512:0crwdne2512:0" - -#: gui/src/ais.cpp:124 -msgid "Restricted Area: Active military OPAREA" -msgstr "crwdns2513:0crwdne2513:0" - -#: gui/src/ais.cpp:125 -msgid "Restricted Area: Firing - danger area." -msgstr "crwdns2514:0crwdne2514:0" - -#: gui/src/ais.cpp:126 -msgid "Restricted Area: Drifting Mines" -msgstr "crwdns2515:0crwdne2515:0" - -#: gui/src/ais.cpp:128 -msgid "Anchorage Area: Anchorage open" -msgstr "crwdns2516:0crwdne2516:0" - -#: gui/src/ais.cpp:129 -msgid "Anchorage Area: Anchorage closed" -msgstr "crwdns2517:0crwdne2517:0" - -#: gui/src/ais.cpp:130 -msgid "Anchorage Area: Anchoring prohibited" -msgstr "crwdns2518:0crwdne2518:0" - -#: gui/src/ais.cpp:131 -msgid "Anchorage Area: Deep draft anchorage" -msgstr "crwdns2519:0crwdne2519:0" - -#: gui/src/ais.cpp:132 -msgid "Anchorage Area: Shallow draft anchorage" -msgstr "crwdns2520:0crwdne2520:0" - -#: gui/src/ais.cpp:133 -msgid "Anchorage Area: Vessel transfer operations" -msgstr "crwdns2521:0crwdne2521:0" - -#: gui/src/ais.cpp:144 -msgid "Security Alert - Level 1" -msgstr "crwdns2522:0crwdne2522:0" - -#: gui/src/ais.cpp:145 -msgid "Security Alert - Level 2" -msgstr "crwdns2523:0crwdne2523:0" - -#: gui/src/ais.cpp:146 -msgid "Security Alert - Level 3" -msgstr "crwdns2524:0crwdne2524:0" - -#: gui/src/ais.cpp:152 -msgid "Distress Area: Vessel disabled and adrift" -msgstr "crwdns2525:0crwdne2525:0" - -#: gui/src/ais.cpp:153 -msgid "Distress Area: Vessel sinking" -msgstr "crwdns2526:0crwdne2526:0" - -#: gui/src/ais.cpp:154 -msgid "Distress Area: Vessel abandoning ship" -msgstr "crwdns2527:0crwdne2527:0" - -#: gui/src/ais.cpp:155 -msgid "Distress Area: Vessel requests medical assistance" -msgstr "crwdns2528:0crwdne2528:0" - -#: gui/src/ais.cpp:156 -msgid "Distress Area: Vessel flooding" -msgstr "crwdns2529:0crwdne2529:0" - -#: gui/src/ais.cpp:157 -msgid "Distress Area: Vessel fire/explosion" -msgstr "crwdns2530:0crwdne2530:0" - -#: gui/src/ais.cpp:158 -msgid "Distress Area: Vessel grounding" -msgstr "crwdns2531:0crwdne2531:0" - -#: gui/src/ais.cpp:159 -msgid "Distress Area: Vessel collision" -msgstr "crwdns2532:0crwdne2532:0" - -#: gui/src/ais.cpp:160 -msgid "Distress Area: Vessel listing/capsizing" -msgstr "crwdns2533:0crwdne2533:0" - -#: gui/src/ais.cpp:161 -msgid "Distress Area: Vessel under assault" -msgstr "crwdns2534:0crwdne2534:0" - -#: gui/src/ais.cpp:162 -msgid "Distress Area: Person overboard" -msgstr "crwdns2535:0crwdne2535:0" - -#: gui/src/ais.cpp:163 -msgid "Distress Area: SAR area" -msgstr "crwdns2536:0crwdne2536:0" - -#: gui/src/ais.cpp:164 -msgid "Distress Area: Pollution response area" -msgstr "crwdns2537:0crwdne2537:0" - -#: gui/src/ais.cpp:168 -msgid "Instruction: Contact VTS at this point/juncture" -msgstr "crwdns2538:0crwdne2538:0" - -#: gui/src/ais.cpp:169 -msgid "Instruction: Contact Port Administration at this point/juncture" -msgstr "crwdns2539:0crwdne2539:0" - -#: gui/src/ais.cpp:171 -msgid "Instruction: Do not proceed beyond this point/juncture" -msgstr "crwdns2540:0crwdne2540:0" - -#: gui/src/ais.cpp:172 -msgid "Instruction: Await instructions prior to proceeding beyond this point/juncture" -msgstr "crwdns2541:0crwdne2541:0" - -#: gui/src/ais.cpp:174 -msgid "Proceed to this location - await instructions" -msgstr "crwdns2542:0crwdne2542:0" - -#: gui/src/ais.cpp:175 -msgid "Clearance granted - proceed to berth" -msgstr "crwdns2543:0crwdne2543:0" - -#: gui/src/ais.cpp:178 -msgid "Information: Pilot boarding position" -msgstr "crwdns2544:0crwdne2544:0" - -#: gui/src/ais.cpp:179 -msgid "Information: Icebreaker waiting area" -msgstr "crwdns2545:0crwdne2545:0" - -#: gui/src/ais.cpp:180 -msgid "Information: Places of refuge" -msgstr "crwdns2546:0crwdne2546:0" - -#: gui/src/ais.cpp:181 -msgid "Information: Position of icebreakers" -msgstr "crwdns2547:0crwdne2547:0" - -#: gui/src/ais.cpp:182 -msgid "Information: Location of response units" -msgstr "crwdns2548:0crwdne2548:0" - -#: gui/src/ais.cpp:183 -msgid "VTS active target" -msgstr "crwdns2549:0crwdne2549:0" - -#: gui/src/ais.cpp:184 -msgid "Rogue or suspicious vessel" -msgstr "crwdns2550:0crwdne2550:0" - -#: gui/src/ais.cpp:185 -msgid "Vessel requesting non-distress assistance" -msgstr "crwdns2551:0crwdne2551:0" - -#: gui/src/ais.cpp:186 -msgid "Chart Feature: Sunken vessel" -msgstr "crwdns2552:0crwdne2552:0" - -#: gui/src/ais.cpp:187 -msgid "Chart Feature: Submerged object" -msgstr "crwdns2553:0crwdne2553:0" - -#: gui/src/ais.cpp:188 -msgid "Chart Feature: Semi-submerged object" -msgstr "crwdns2554:0crwdne2554:0" - -#: gui/src/ais.cpp:189 -msgid "Chart Feature: Shoal area" -msgstr "crwdns2555:0crwdne2555:0" - -#: gui/src/ais.cpp:190 -msgid "Chart Feature: Shoal area due north" -msgstr "crwdns2556:0crwdne2556:0" - -#: gui/src/ais.cpp:191 -msgid "Chart Feature: Shoal area due east" -msgstr "crwdns2557:0crwdne2557:0" - -#: gui/src/ais.cpp:192 -msgid "Chart Feature: Shoal area due south" -msgstr "crwdns2558:0crwdne2558:0" - -#: gui/src/ais.cpp:193 -msgid "Chart Feature: Shoal area due west" -msgstr "crwdns2559:0crwdne2559:0" - -#: gui/src/ais.cpp:194 -msgid "Chart Feature: Channel obstruction" -msgstr "crwdns2560:0crwdne2560:0" - -#: gui/src/ais.cpp:195 -msgid "Chart Feature: Reduced vertical clearance" -msgstr "crwdns2561:0crwdne2561:0" - -#: gui/src/ais.cpp:196 -msgid "Chart Feature: Bridge closed" -msgstr "crwdns2562:0crwdne2562:0" - -#: gui/src/ais.cpp:197 -msgid "Chart Feature: Bridge partially open" -msgstr "crwdns2563:0crwdne2563:0" - -#: gui/src/ais.cpp:198 -msgid "Chart Feature: Bridge fully open" -msgstr "crwdns2564:0crwdne2564:0" - -#: gui/src/ais.cpp:202 -msgid "Report from ship: Icing info" -msgstr "crwdns2565:0crwdne2565:0" - -#: gui/src/ais.cpp:204 -msgid "Report from ship: Miscellaneous information - define in Associated text field" -msgstr "crwdns2566:0crwdne2566:0" - -#: gui/src/ais.cpp:211 -msgid "Route: Recommended route" -msgstr "crwdns2567:0crwdne2567:0" - -#: gui/src/ais.cpp:212 -msgid "Route: Alternative route" -msgstr "crwdns2568:0crwdne2568:0" - -#: gui/src/ais.cpp:213 -msgid "Route: Recommended route through ice" -msgstr "crwdns2569:0crwdne2569:0" - -#: gui/src/ais.cpp:216 -msgid "Other - Define in associated text field" -msgstr "crwdns2570:0crwdne2570:0" - -#: gui/src/ais.cpp:217 -msgid "Cancellation - cancel area as identified by Message Linkage ID" -msgstr "crwdns2571:0crwdne2571:0" - -#: gui/src/ais.cpp:219 -msgid "Undefined (default)" -msgstr "crwdns2572:0crwdne2572:0" - -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 -msgid "AIS Target Name" -msgstr "crwdns8198:0crwdne8198:0" - -#: gui/src/ais_info_gui.cpp:95 -msgid "\n" -"This AIS target has Persistent Tracking selected by MMSI properties\n" -"A Persistent track recording will therefore be restarted for this target.\n\n" -"Do you instead want to stop Persistent Tracking for this target?\n" -msgstr "crwdns27391:0crwdne27391:0" - -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 -msgid "AIS Alert" -msgstr "crwdns7938:0crwdne7938:0" - -#: gui/src/AISTargetAlertDialog.cpp:146 gui/src/AISTargetAlertDialog.cpp:247 -msgid "AISTargetAlert" -msgstr "crwdns6368:0crwdne6368:0" - -#: gui/src/AISTargetAlertDialog.cpp:191 -msgid "&Silence Alert" -msgstr "crwdns6369:0crwdne6369:0" - -#: gui/src/AISTargetAlertDialog.cpp:197 -msgid "&Jump To" -msgstr "crwdns6371:0crwdne6371:0" - -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 -msgid "Create Waypoint" -msgstr "crwdns2845:0crwdne2845:0" - -#: gui/src/AISTargetAlertDialog.cpp:210 -msgid "&Acknowledge" -msgstr "crwdns6370:0crwdne6370:0" - -#: gui/src/AISTargetAlertDialog.cpp:213 -msgid "&Close Alert" -msgstr "crwdns26669:0crwdne26669:0" - -#: gui/src/AISTargetListDialog.cpp:152 gui/src/AISTargetListDialog.cpp:166 -#: gui/src/OCPNListCtrl.cpp:84 gui/src/OCPNListCtrl.cpp:94 -#: gui/src/OCPNListCtrl.cpp:131 gui/src/OCPNListCtrl.cpp:146 -#: gui/src/OCPNListCtrl.cpp:154 gui/src/OCPNListCtrl.cpp:166 -#: gui/src/OCPNListCtrl.cpp:173 gui/src/OCPNListCtrl.cpp:188 -#: gui/src/OCPNListCtrl.cpp:196 gui/src/OCPNListCtrl.cpp:204 -#: gui/src/OCPNListCtrl.cpp:214 -msgid "-" -msgstr "crwdns2890:0crwdne2890:0" - -#: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 -msgid "AIS target list" -msgstr "crwdns2909:0crwdne2909:0" - -#: gui/src/AISTargetListDialog.cpp:542 -msgid "Trk" -msgstr "crwdns2891:0crwdne2891:0" - -#: gui/src/AISTargetListDialog.cpp:551 gui/src/MarkInfo.cpp:351 -#: gui/src/routeprintout.cpp:365 gui/src/RoutePropDlg.cpp:102 -#: gui/src/RoutePropDlgImpl.cpp:803 gui/src/TrackPropDlg.cpp:344 -#: gui/src/TrackPropDlg.cpp:680 gui/src/TrackPropDlg.cpp:1347 -msgid "Name" -msgstr "crwdns2207:0crwdne2207:0" - -#: gui/src/AISTargetListDialog.cpp:560 -msgid "Call" -msgstr "crwdns2892:0crwdne2892:0" - -#: gui/src/AISTargetListDialog.cpp:587 gui/src/conn_params_panel.cpp:183 -#: gui/src/conn_params_panel.cpp:275 gui/src/conn_params_panel.cpp:405 -#: gui/src/conn_params_panel.cpp:508 gui/src/conn_params_panel.cpp:608 -msgid "Type" -msgstr "crwdns2633:0crwdne2633:0" - -#: gui/src/AISTargetListDialog.cpp:596 -msgid "Nav Status" -msgstr "crwdns2895:0crwdne2895:0" - -#: gui/src/AISTargetListDialog.cpp:605 -msgid "Brg" -msgstr "crwdns2896:0crwdne2896:0" - -#: gui/src/AISTargetListDialog.cpp:623 -msgid "CoG" -msgstr "crwdns2898:0crwdne2898:0" - -#: gui/src/AISTargetListDialog.cpp:632 -msgid "SoG" -msgstr "crwdns2899:0crwdne2899:0" - -#: gui/src/AISTargetListDialog.cpp:648 -msgid "TCPA" -msgstr "crwdns2901:0crwdne2901:0" - -#: gui/src/AISTargetListDialog.cpp:690 -msgid "Target info" -msgstr "crwdns2902:0crwdne2902:0" - -#: gui/src/AISTargetListDialog.cpp:707 -msgid "Center-Info-Close" -msgstr "crwdns26671:0crwdne26671:0" - -#: gui/src/AISTargetListDialog.cpp:715 -msgid "Create WPT" -msgstr "crwdns2903:0crwdne2903:0" - -#: gui/src/AISTargetListDialog.cpp:724 -msgid "Hide All Tracks" -msgstr "crwdns2904:0crwdne2904:0" - -#: gui/src/AISTargetListDialog.cpp:732 -msgid "Show All Tracks" -msgstr "crwdns2905:0crwdne2905:0" - -#: gui/src/AISTargetListDialog.cpp:740 -msgid "Toggle track" -msgstr "crwdns2906:0crwdne2906:0" - -#: gui/src/AISTargetListDialog.cpp:748 -msgid "Copy MMSI" -msgstr "crwdns9221:0crwdne9221:0" - -#: gui/src/AISTargetListDialog.cpp:756 -msgid "AutoSort" -msgstr "crwdns5434:0crwdne5434:0" - -#: gui/src/AISTargetListDialog.cpp:767 -msgid "Limit range: NM" -msgstr "crwdns2907:0crwdne2907:0" - -#: gui/src/AISTargetListDialog.cpp:783 -msgid "Target Count" -msgstr "crwdns2908:0crwdne2908:0" - -#: gui/src/AISTargetListDialog.cpp:1247 -msgid "Undock Target List" -msgstr "crwdns21203:0crwdne21203:0" - -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 -msgid "Record Track" -msgstr "crwdns6640:0crwdne6640:0" - -#: gui/src/AISTargetQueryDialog.cpp:175 -msgid "The recently captured track of this target has been recorded.\n" -"Do you want to continue recording until the end of the current OpenCPN session?" -msgstr "crwdns6641:0crwdne6641:0" - -#: gui/src/AISTargetQueryDialog.cpp:197 -msgid "AISTargetQuery" -msgstr "crwdns2938:0crwdne2938:0" - -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 -#: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 -#: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 -#: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 -#: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 -msgid "OK" -msgstr "crwdns2039:0crwdne2039:0" - -#: gui/src/AISTargetQueryDialog.cpp:309 -msgid "Stop Tracking" -msgstr "crwdns6615:0crwdne6615:0" - -#: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 -#: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 -msgid "Menu" -msgstr "crwdns5425:0crwdne5425:0" - -#: gui/src/canvasMenu.cpp:337 gui/src/canvasMenu.cpp:340 -#: gui/src/canvasMenu.cpp:357 -msgid "Undo" -msgstr "crwdns7947:0crwdne7947:0" - -#: gui/src/canvasMenu.cpp:347 gui/src/canvasMenu.cpp:350 -#: gui/src/canvasMenu.cpp:364 -msgid "Redo" -msgstr "crwdns7948:0crwdne7948:0" - -#: gui/src/canvasMenu.cpp:378 -msgid "End Route" -msgstr "crwdns7944:0crwdne7944:0" - -#: gui/src/canvasMenu.cpp:384 -msgid "Measure Off" -msgstr "crwdns7945:0crwdne7945:0" - -#: gui/src/canvasMenu.cpp:387 -msgid "Measure" -msgstr "crwdns7946:0crwdne7946:0" - -#: gui/src/canvasMenu.cpp:464 -msgid "Max Detail Here" -msgstr "crwdns7949:0crwdne7949:0" - -#: gui/src/canvasMenu.cpp:466 gui/src/canvasMenu.cpp:489 -msgid "Scale In" -msgstr "crwdns7950:0crwdne7950:0" - -#: gui/src/canvasMenu.cpp:468 gui/src/canvasMenu.cpp:491 -msgid "Scale Out" -msgstr "crwdns7951:0crwdne7951:0" - -#: gui/src/canvasMenu.cpp:503 -msgid "Drop Mark" -msgstr "crwdns7953:0crwdne7953:0" - -#: gui/src/canvasMenu.cpp:505 -msgid "New Route..." -msgstr "crwdns12304:0crwdne12304:0" - -#: gui/src/canvasMenu.cpp:509 -msgid "Move Boat Here" -msgstr "crwdns7954:0crwdne7954:0" - -#: gui/src/canvasMenu.cpp:514 -msgid "Navigate To Here" -msgstr "crwdns7955:0crwdne7955:0" - -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 -msgid "Course Up Mode" -msgstr "crwdns2095:0crwdne2095:0" - -#: gui/src/canvasMenu.cpp:525 -msgid "Heading Up Mode" -msgstr "crwdns19830:0crwdne19830:0" - -#: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 -msgid "North Up Mode" -msgstr "crwdns2097:0crwdne2097:0" - -#: gui/src/canvasMenu.cpp:532 -msgid "Chart Up Mode" -msgstr "crwdns7957:0crwdne7957:0" - -#: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 -msgid "Toggle Full Screen" -msgstr "crwdns7958:0crwdne7958:0" - -#: gui/src/canvasMenu.cpp:556 gui/src/canvasMenu.cpp:726 -#: gui/src/canvasMenu.cpp:744 -msgid "Zero XTE" -msgstr "crwdns7959:0crwdne7959:0" - -#: gui/src/canvasMenu.cpp:563 -msgid "Paste Waypoint" -msgstr "crwdns7960:0crwdne7960:0" - -#: gui/src/canvasMenu.cpp:567 gui/src/canvasMenu.cpp:575 -msgid "Paste Route" -msgstr "crwdns7961:0crwdne7961:0" - -#: gui/src/canvasMenu.cpp:571 gui/src/canvasMenu.cpp:576 -msgid "Paste Track" -msgstr "crwdns7962:0crwdne7962:0" - -#: gui/src/canvasMenu.cpp:586 -msgid "CM93 Offset Dialog..." -msgstr "crwdns7963:0crwdne7963:0" - -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 -msgid "Chart Groups" -msgstr "crwdns2102:0crwdne2102:0" - -#: gui/src/canvasMenu.cpp:618 -msgid "temporary" -msgstr "crwdns12306:0crwdne12306:0" - -#: gui/src/canvasMenu.cpp:621 -msgid "All Active Charts" -msgstr "crwdns7964:0crwdne7964:0" - -#: gui/src/canvasMenu.cpp:651 gui/src/CanvasOptions.cpp:214 -msgid "AIS" -msgstr "crwdns7943:0crwdne7943:0" - -#: gui/src/canvasMenu.cpp:652 -msgid "Target Query..." -msgstr "crwdns7965:0crwdne7965:0" - -#: gui/src/canvasMenu.cpp:656 -msgid "Hide Target CPA" -msgstr "crwdns7966:0crwdne7966:0" - -#: gui/src/canvasMenu.cpp:658 -msgid "Show Target CPA" -msgstr "crwdns7967:0crwdne7967:0" - -#: gui/src/canvasMenu.cpp:660 -msgid "Target List..." -msgstr "crwdns7968:0crwdne7968:0" - -#: gui/src/canvasMenu.cpp:665 -msgid "Hide Target Track" -msgstr "crwdns7969:0crwdne7969:0" - -#: gui/src/canvasMenu.cpp:668 -msgid "Show Target Track" -msgstr "crwdns7970:0crwdne7970:0" - -#: gui/src/canvasMenu.cpp:672 -msgid "Copy Target MMSI" -msgstr "crwdns9222:0crwdne9222:0" - -#: gui/src/canvasMenu.cpp:679 gui/src/canvasMenu.cpp:687 -msgid "Object Query..." -msgstr "crwdns7952:0crwdne7952:0" - -#: gui/src/canvasMenu.cpp:696 gui/src/catalog_mgr.cpp:99 -msgid "Hide" -msgstr "crwdns24796:0crwdne24796:0" - -#: gui/src/canvasMenu.cpp:696 gui/src/routemanagerdialog.cpp:428 -#: gui/src/routemanagerdialog.cpp:611 -msgid "Show" -msgstr "crwdns2303:0crwdne2303:0" - -#: gui/src/canvasMenu.cpp:698 gui/src/chcanv.cpp:6606 -msgid "CPA alarm " -msgstr "crwdns26683:0crwdne26683:0" - -#: gui/src/canvasMenu.cpp:706 -msgid "Unnamed Route" -msgstr "crwdns12308:0crwdne12308:0" - -#: gui/src/canvasMenu.cpp:714 -msgid "Layer Route" -msgstr "crwdns7971:0crwdne7971:0" - -#: gui/src/canvasMenu.cpp:716 gui/src/canvasMenu.cpp:734 -#: gui/src/canvasMenu.cpp:806 gui/src/canvasMenu.cpp:810 -#: gui/src/canvasMenu.cpp:835 gui/src/canvasMenu.cpp:842 -#: gui/src/canvasMenu.cpp:908 gui/src/canvasMenu.cpp:912 -#: gui/src/MarkInfo.cpp:325 -msgid "Properties" -msgstr "crwdns2214:0crwdne2214:0" - -#: gui/src/canvasMenu.cpp:723 gui/src/canvasMenu.cpp:741 -#: gui/src/canvasMenu.cpp:854 -msgid "Activate Next Waypoint" -msgstr "crwdns7973:0crwdne7973:0" - -#: gui/src/canvasMenu.cpp:725 gui/src/canvasMenu.cpp:743 -#: gui/src/routemanagerdialog.cpp:1350 -msgid "Deactivate" -msgstr "crwdns2114:0crwdne2114:0" - -#: gui/src/canvasMenu.cpp:728 gui/src/canvasMenu.cpp:746 -#: gui/src/canvasMenu.cpp:838 gui/src/canvasMenu.cpp:845 -#: gui/src/routemanagerdialog.cpp:1344 -msgid "Activate" -msgstr "crwdns2115:0crwdne2115:0" - -#: gui/src/canvasMenu.cpp:732 gui/src/chcanv.cpp:3780 gui/src/chcanv.cpp:10756 -#: gui/src/concanv.cpp:142 gui/src/concanv.cpp:157 gui/src/concanv.cpp:196 -msgid "Route" -msgstr "crwdns2057:0crwdne2057:0" - -#: gui/src/canvasMenu.cpp:749 -msgid "Insert Waypoint" -msgstr "crwdns7974:0crwdne7974:0" - -#: gui/src/canvasMenu.cpp:750 gui/src/undo.cpp:90 -msgid "Append Waypoint" -msgstr "crwdns2117:0crwdne2117:0" - -#: gui/src/canvasMenu.cpp:755 -msgid "Split around Leg" -msgstr "crwdns21205:0crwdne21205:0" - -#: gui/src/canvasMenu.cpp:757 gui/src/canvasMenu.cpp:811 -#: gui/src/canvasMenu.cpp:866 gui/src/canvasMenu.cpp:917 -msgid "Copy as KML" -msgstr "crwdns7984:0crwdne7984:0" - -#: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 -#: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 -#: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 -#: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 -msgid "Delete" -msgstr "crwdns2127:0crwdne2127:0" - -#: gui/src/canvasMenu.cpp:759 -msgid "Reverse..." -msgstr "crwdns7977:0crwdne7977:0" - -#: gui/src/canvasMenu.cpp:763 -msgid "Hide Waypoint Names" -msgstr "crwdns21207:0crwdne21207:0" - -#: gui/src/canvasMenu.cpp:766 -msgid "Show Waypoint Names" -msgstr "crwdns21209:0crwdne21209:0" - -#: gui/src/canvasMenu.cpp:769 -msgid "Resequence Waypoints..." -msgstr "crwdns21211:0crwdne21211:0" - -#: gui/src/canvasMenu.cpp:783 gui/src/canvasMenu.cpp:883 -msgid "Send to new GPS" -msgstr "crwdns7979:0crwdne7979:0" - -#: gui/src/canvasMenu.cpp:804 -msgid "Layer Track" -msgstr "crwdns7980:0crwdne7980:0" - -#: gui/src/canvasMenu.cpp:808 gui/src/chcanv.cpp:3955 -msgid "Track" -msgstr "crwdns7942:0crwdne7942:0" - -#: gui/src/canvasMenu.cpp:825 -msgid "Unnamed Waypoint" -msgstr "crwdns12314:0crwdne12314:0" - -#: gui/src/canvasMenu.cpp:833 gui/src/canvasMenu.cpp:906 -msgid "Layer Waypoint" -msgstr "crwdns7985:0crwdne7985:0" - -#: gui/src/canvasMenu.cpp:840 -msgid "Waypoint" -msgstr "crwdns7941:0crwdne7941:0" - -#: gui/src/canvasMenu.cpp:858 -msgid "Remove from Route" -msgstr "crwdns7983:0crwdne7983:0" - -#: gui/src/canvasMenu.cpp:863 -msgid "Split Route at Waypoint" -msgstr "crwdns21213:0crwdne21213:0" - -#: gui/src/canvasMenu.cpp:898 -msgid "Unnamed Mark" -msgstr "crwdns29192:0crwdne29192:0" - -#: gui/src/canvasMenu.cpp:910 -msgid "Mark" -msgstr "crwdns29194:0crwdne29194:0" - -#: gui/src/canvasMenu.cpp:915 -msgid "Navigate To This" -msgstr "crwdns7986:0crwdne7986:0" - -#: gui/src/canvasMenu.cpp:940 -msgid "Clear Anchor Watch" -msgstr "crwdns7987:0crwdne7987:0" - -#: gui/src/canvasMenu.cpp:951 -msgid "Set Anchor Watch" -msgstr "crwdns7988:0crwdne7988:0" - -#: gui/src/canvasMenu.cpp:992 -msgid "Main Menu" -msgstr "crwdns12316:0crwdne12316:0" - -#: gui/src/canvasMenu.cpp:1005 -msgid "Show Tide Information" -msgstr "crwdns7989:0crwdne7989:0" - -#: gui/src/canvasMenu.cpp:1011 -msgid "Show Current Information" -msgstr "crwdns7990:0crwdne7990:0" - -#: gui/src/canvasMenu.cpp:1193 -msgid "Temporary GOTO Route" -msgstr "crwdns7991:0crwdne7991:0" - -#: gui/src/canvasMenu.cpp:1194 gui/src/canvasMenu.cpp:1265 -#: gui/src/routemanagerdialog.cpp:2815 -msgid "Here" -msgstr "crwdns2144:0crwdne2144:0" - -#: gui/src/canvasMenu.cpp:1196 -msgid "There" -msgstr "crwdns7992:0crwdne7992:0" - -#: gui/src/canvasMenu.cpp:1261 gui/src/routemanagerdialog.cpp:2438 -#: gui/src/routemanagerdialog.cpp:2811 -msgid "(Unnamed Waypoint)" -msgstr "crwdns2146:0crwdne2146:0" - -#: gui/src/canvasMenu.cpp:1262 gui/src/routemanagerdialog.cpp:2812 -msgid "Go to " -msgstr "crwdns2147:0crwdne2147:0" - -#: gui/src/canvasMenu.cpp:1496 gui/src/canvasMenu.cpp:1530 -#: gui/src/routemanagerdialog.cpp:1535 -msgid "Rename Waypoints?" -msgstr "crwdns2148:0crwdne2148:0" - -#: gui/src/canvasMenu.cpp:1547 -msgid "Are you sure you want to delete this route?" -msgstr "crwdns7993:0crwdne7993:0" - -#: gui/src/canvasMenu.cpp:1548 -msgid "OpenCPN Route Delete" -msgstr "crwdns7994:0crwdne7994:0" - -#: gui/src/canvasMenu.cpp:1679 gui/src/RoutePropDlgImpl.cpp:1047 -#: gui/src/TrackPropDlg.cpp:1318 -msgid "_A" -msgstr "crwdns2204:0crwdne2204:0" - -#: gui/src/canvasMenu.cpp:1681 gui/src/RoutePropDlgImpl.cpp:1048 -#: gui/src/TrackPropDlg.cpp:1319 -msgid "_B" -msgstr "crwdns2205:0crwdne2205:0" - -#: gui/src/canvasMenu.cpp:1766 -msgid "Send Waypoint to OpenCPN Peer" -msgstr "crwdns26673:0crwdne26673:0" - -#: gui/src/canvasMenu.cpp:1817 -msgid "Send Route to OpenCPN Peer" -msgstr "crwdns26675:0crwdne26675:0" - -#: gui/src/canvasMenu.cpp:1907 -msgid "Are you sure you want to delete this track?" -msgstr "crwdns7995:0crwdne7995:0" - -#: gui/src/canvasMenu.cpp:1908 gui/src/routeman_gui.cpp:263 -msgid "OpenCPN Track Delete" -msgstr "crwdns2153:0crwdne2153:0" - -#: gui/src/canvasMenu.cpp:1956 -msgid "Send Track to OpenCPN Peer" -msgstr "crwdns26677:0crwdne26677:0" - -#: gui/src/CanvasOptions.cpp:111 -msgid "Chart Panel Options" -msgstr "crwdns12568:0crwdne12568:0" - -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 -msgid "Navigation Mode" -msgstr "crwdns6354:0crwdne6354:0" - -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 -msgid "North Up" -msgstr "crwdns6355:0crwdne6355:0" - -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 -msgid "Course Up" -msgstr "crwdns6356:0crwdne6356:0" - -#: gui/src/CanvasOptions.cpp:160 -msgid "Heading Up" -msgstr "crwdns19834:0crwdne19834:0" - -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 -msgid "Look Ahead Mode" -msgstr "crwdns2712:0crwdne2712:0" - -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 -msgid "Display Options" -msgstr "crwdns2638:0crwdne2638:0" - -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 -msgid "Enable Chart Quilting" -msgstr "crwdns2720:0crwdne2720:0" - -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 -msgid "Show Grid" -msgstr "crwdns2713:0crwdne2713:0" - -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 -msgid "Show Chart Outlines" -msgstr "crwdns2722:0crwdne2722:0" - -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 -msgid "Show Depth Units" -msgstr "crwdns2714:0crwdne2714:0" - -#: gui/src/CanvasOptions.cpp:218 -msgid "Show AIS targets" -msgstr "crwdns12570:0crwdne12570:0" - -#: gui/src/CanvasOptions.cpp:225 -msgid "Minimize less critical targets" -msgstr "crwdns12572:0crwdne12572:0" - -#: gui/src/CanvasOptions.cpp:236 -msgid "Tides and Currents" -msgstr "crwdns12574:0crwdne12574:0" - -#: gui/src/CanvasOptions.cpp:241 -msgid "Show Tide stations" -msgstr "crwdns12576:0crwdne12576:0" - -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 -msgid "Show Currents" -msgstr "crwdns1997:0crwdne1997:0" - -#: gui/src/CanvasOptions.cpp:259 -msgid "Vector Charts" -msgstr "crwdns12578:0crwdne12578:0" - -#: gui/src/CanvasOptions.cpp:263 -msgid "Show text" -msgstr "crwdns12580:0crwdne12580:0" - -#: gui/src/CanvasOptions.cpp:270 -msgid "Show depths" -msgstr "crwdns12582:0crwdne12582:0" - -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 -msgid "Buoy/Light Labels" -msgstr "crwdns2681:0crwdne2681:0" - -#: gui/src/CanvasOptions.cpp:284 -msgid "Lights" -msgstr "crwdns12584:0crwdne12584:0" - -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 -msgid "Light Descriptions" -msgstr "crwdns2682:0crwdne2682:0" - -#: gui/src/CanvasOptions.cpp:298 -msgid "Anchoring Info" -msgstr "crwdns12586:0crwdne12586:0" - -#: gui/src/CanvasOptions.cpp:306 -msgid "Show visible sector lights" -msgstr "crwdns21343:0crwdne21343:0" - -#: gui/src/CanvasOptions.cpp:314 -msgid "Show chart data quality" -msgstr "crwdns27453:0crwdne27453:0" - -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 -msgid "Display Category" -msgstr "crwdns2676:0crwdne2676:0" - -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 -msgid "Standard" -msgstr "crwdns2673:0crwdne2673:0" - -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 -msgid "All" -msgstr "crwdns2674:0crwdne2674:0" - -#: gui/src/CanvasOptions.cpp:327 -msgid "User Standard" -msgstr "crwdns12588:0crwdne12588:0" - -#: gui/src/catalog_mgr.cpp:92 -msgid "Manage Plugin Catalog" -msgstr "crwdns24724:0crwdne24724:0" - -#: gui/src/catalog_mgr.cpp:102 -msgid "Ultra advanced" -msgstr "crwdns24798:0crwdne24798:0" - -#: gui/src/catalog_mgr.cpp:129 gui/src/cat_settings.cpp:228 -#: gui/src/download_mgr.cpp:378 -msgid "Done" -msgstr "crwdns24614:0crwdne24614:0" - -#: gui/src/catalog_mgr.cpp:190 -msgid "Catalog URL status: " -msgstr "crwdns24726:0crwdne24726:0" - -#: gui/src/catalog_mgr.cpp:193 -msgid "Error" -msgstr "crwdns24728:0crwdne24728:0" - -#: gui/src/catalog_mgr.cpp:222 -msgid "Current active plugin catalog" -msgstr "crwdns24730:0crwdne24730:0" - -#: gui/src/catalog_mgr.cpp:229 -msgid "Default catalog" -msgstr "crwdns24732:0crwdne24732:0" - -#: gui/src/catalog_mgr.cpp:232 gui/src/catalog_mgr.cpp:242 -msgid "Use as active catalog" -msgstr "crwdns24734:0crwdne24734:0" - -#: gui/src/catalog_mgr.cpp:239 -msgid "Latest available catalog:" -msgstr "crwdns24736:0crwdne24736:0" - -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 -msgid "Cannot download data from url" -msgstr "crwdns21311:0crwdne21311:0" - -#: gui/src/catalog_mgr.cpp:296 -msgid "Cannot parse downloaded data" -msgstr "crwdns24738:0crwdne24738:0" - -#: gui/src/catalog_mgr.cpp:299 -msgid "Catalog update problem" -msgstr "crwdns24740:0crwdne24740:0" - -#: gui/src/catalog_mgr.cpp:345 -msgid "Use default location" -msgstr "crwdns24742:0crwdne24742:0" - -#: gui/src/catalog_mgr.cpp:350 -msgid "Save" -msgstr "crwdns24744:0crwdne24744:0" - -#: gui/src/catalog_mgr.cpp:384 -msgid "Catalog channel: " -msgstr "crwdns24746:0crwdne24746:0" - -#: gui/src/catalog_mgr.cpp:418 -msgid "Custom catalog URL: " -msgstr "crwdns24748:0crwdne24748:0" - -#: gui/src/catalog_mgr.cpp:467 gui/src/catalog_mgr.cpp:565 -msgid "Check latest release..." -msgstr "crwdns24750:0crwdne24750:0" - -#: gui/src/catalog_mgr.cpp:497 -msgid "Catalog updated" -msgstr "crwdns24752:0crwdne24752:0" - -#: gui/src/catalog_mgr.cpp:561 -msgid "Server is reachable..." -msgstr "crwdns24754:0crwdne24754:0" - -#: gui/src/catalog_mgr.cpp:563 -msgid "Check channel..." -msgstr "crwdns24756:0crwdne24756:0" - -#: gui/src/catalog_mgr.cpp:571 -msgid "Custom URL" -msgstr "crwdns24758:0crwdne24758:0" - -#: gui/src/catalog_mgr.cpp:589 -msgid "Fail: " -msgstr "crwdns24760:0crwdne24760:0" - -#: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 -#: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 -#: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 -#: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 -#: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 -#: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 -#: gui/src/SendToPeerDlg.cpp:281 gui/src/toolbar.cpp:2453 -#: gui/src/trackprintout.cpp:354 gui/src/TrackPropDlg.cpp:609 -#: gui/src/TrackPropDlg.cpp:998 -msgid "Cancel" -msgstr "crwdns2260:0crwdne2260:0" - -#: gui/src/catalog_mgr.cpp:630 gui/src/catalog_mgr.cpp:655 -msgid "Catalog Manager" -msgstr "crwdns24762:0crwdne24762:0" - -#: gui/src/cat_settings.cpp:91 -msgid "Select new flavour" -msgstr "crwdns24704:0crwdne24704:0" - -#: gui/src/cat_settings.cpp:92 -msgid "Default setting" -msgstr "crwdns24706:0crwdne24706:0" - -#: gui/src/cat_settings.cpp:162 -msgid "Active catalog" -msgstr "crwdns24708:0crwdne24708:0" - -#: gui/src/cat_settings.cpp:164 -msgid "Select plugin catalog" -msgstr "crwdns24710:0crwdne24710:0" - -#: gui/src/cat_settings.cpp:176 -msgid "Compatibility" -msgstr "crwdns24712:0crwdne24712:0" - -#: gui/src/cat_settings.cpp:178 -msgid "Active setting:" -msgstr "crwdns24714:0crwdne24714:0" - -#: gui/src/cat_settings.cpp:190 -msgid "Cache" -msgstr "crwdns24716:0crwdne24716:0" - -#: gui/src/cat_settings.cpp:199 -msgid "Clear cache" -msgstr "crwdns24718:0crwdne24718:0" - -#: gui/src/cat_settings.cpp:216 -#, c-format -msgid "Size: %d MB in %d files" -msgstr "crwdns24720:0%dcrwdnd24720:0%dcrwdne24720:0" - -#: gui/src/cat_settings.cpp:236 -msgid "Plugin Catalog Settings" -msgstr "crwdns24722:0crwdne24722:0" - -#: gui/src/chartdbs.cpp:1321 -msgid " ChartFile: " -msgstr "crwdns1953:0crwdne1953:0" - -#: gui/src/chartdbs.cpp:1339 -msgid " Name: " -msgstr "crwdns1954:0crwdne1954:0" - -#: gui/src/chartdbs.cpp:1363 gui/src/chartdbs.cpp:1365 gui/src/chcanv.cpp:5419 -#: gui/src/chcanv.cpp:5422 gui/src/chcanv.cpp:5426 gui/src/chcanv.cpp:5429 -#: gui/src/chcanv.cpp:5432 gui/src/chcanv.cpp:5458 -#: gui/src/routemanagerdialog.cpp:750 -msgid "Scale" -msgstr "crwdns9235:0crwdne9235:0" - -#: gui/src/chartdbs.cpp:1374 -msgid " ID: " -msgstr "crwdns1956:0crwdne1956:0" - -#: gui/src/chartdbs.cpp:1382 -msgid " Depth Units: " -msgstr "crwdns1957:0crwdne1957:0" - -#: gui/src/chartdbs.cpp:1390 -msgid " Soundings: " -msgstr "crwdns1958:0crwdne1958:0" - -#: gui/src/chartdbs.cpp:1398 -msgid " Datum: " -msgstr "crwdns1959:0crwdne1959:0" - -#: gui/src/chartdbs.cpp:1406 -msgid " Projection: " -msgstr "crwdns1960:0crwdne1960:0" - -#: gui/src/chartdbs.cpp:1410 -msgid "Mercator" -msgstr "crwdns1962:0crwdne1962:0" - -#: gui/src/chartdbs.cpp:1412 -msgid "Transverse Mercator" -msgstr "crwdns1963:0crwdne1963:0" - -#: gui/src/chartdbs.cpp:1414 -msgid "Polyconic" -msgstr "crwdns1964:0crwdne1964:0" - -#: gui/src/chartdbs.cpp:1416 -msgid "Web Mercator (EPSG:3857)" -msgstr "crwdns12342:0crwdne12342:0" - -#: gui/src/chartdbs.cpp:1424 -msgid " Source Edition: " -msgstr "crwdns1965:0crwdne1965:0" - -#: gui/src/chartdbs.cpp:1434 -msgid " Updated: " -msgstr "crwdns1966:0crwdne1966:0" - -#: gui/src/chartdbs.cpp:1668 -msgid "OpenCPN Chart Scan...." -msgstr "crwdns1967:0crwdne1967:0" - -#: gui/src/chartdbs.cpp:1708 -msgid "OpenCPN Directory Scan...." -msgstr "crwdns1968:0crwdne1968:0" - -#: gui/src/chartdbs.cpp:2063 -msgid "OpenCPN Chart Add...." -msgstr "crwdns1969:0crwdne1969:0" - -#: gui/src/chcanv.cpp:1364 gui/src/chcanv.cpp:1379 -msgid "Group \"" -msgstr "crwdns2008:0crwdne2008:0" - -#: gui/src/chcanv.cpp:1369 -msgid "\" is empty." -msgstr "crwdns12352:0crwdne12352:0" - -#: gui/src/chcanv.cpp:1371 gui/src/chcanv.cpp:1386 -msgid "OpenCPN Group Notice" -msgstr "crwdns2010:0crwdne2010:0" - -#: gui/src/chcanv.cpp:1384 -msgid "\" is empty, switching to \"All Active Charts\" group." -msgstr "crwdns2009:0crwdne2009:0" - -#: gui/src/chcanv.cpp:3782 gui/src/chcanv.cpp:10758 -msgid "Layer Route: " -msgstr "crwdns2065:0crwdne2065:0" - -#: gui/src/chcanv.cpp:3785 gui/src/chcanv.cpp:3960 -msgid "(unnamed)" -msgstr "crwdns2066:0crwdne2066:0" - -#: gui/src/chcanv.cpp:3789 -msgid "Total Length: " -msgstr "crwdns2067:0crwdne2067:0" - -#: gui/src/chcanv.cpp:3791 -msgid "Leg: from " -msgstr "crwdns2068:0crwdne2068:0" - -#: gui/src/chcanv.cpp:3791 -msgid " to " -msgstr "crwdns2069:0crwdne2069:0" - -#: gui/src/chcanv.cpp:3841 -msgid "From Ship To" -msgstr "crwdns19710:0crwdne19710:0" - -#: gui/src/chcanv.cpp:3863 gui/src/concanv.cpp:388 -msgid "%Dd %H:%M" -msgstr "crwdns10536:0%H:%Mcrwdne10536:0" - -#: gui/src/chcanv.cpp:3864 -msgid "%H:%M" -msgstr "crwdns2876:0%H:%Mcrwdne2876:0" - -#: gui/src/chcanv.cpp:3957 -msgid "Layer Track: " -msgstr "crwdns10508:0crwdne10508:0" - -#: gui/src/chcanv.cpp:3964 -msgid "Total Track: " -msgstr "crwdns19712:0crwdne19712:0" - -#: gui/src/chcanv.cpp:3981 -msgid "Segment Created: " -msgstr "crwdns19714:0crwdne19714:0" - -#: gui/src/chcanv.cpp:5449 gui/src/ocpn_frame.cpp:2116 -#: gui/src/ocpn_frame.cpp:2139 gui/src/OCPNPlatform.cpp:1722 -msgid "StatusBar" -msgstr "crwdns2007:0crwdne2007:0" - -#: gui/src/chcanv.cpp:6599 -msgid "ON" -msgstr "crwdns26679:0crwdne26679:0" - -#: gui/src/chcanv.cpp:6602 -msgid "OFF" -msgstr "crwdns26681:0crwdne26681:0" - -#: gui/src/chcanv.cpp:6610 -msgid "CPA Alarm is switched" -msgstr "crwdns26685:0crwdne26685:0" - -#: gui/src/chcanv.cpp:6778 -msgid "Composite of " -msgstr "crwdns29088:0crwdne29088:0" - -#: gui/src/chcanv.cpp:6783 -msgid "charts" -msgstr "crwdns29090:0crwdne29090:0" - -#: gui/src/chcanv.cpp:6785 -msgid "chart" -msgstr "crwdns29092:0crwdne29092:0" - -#: gui/src/chcanv.cpp:6789 -msgid "Chart scale" -msgstr "crwdns29094:0crwdne29094:0" - -#: gui/src/chcanv.cpp:6796 -msgid "Zoom in for more information" -msgstr "crwdns29096:0crwdne29096:0" - -#: gui/src/chcanv.cpp:7857 gui/src/chcanv.cpp:8430 -msgid "Use nearby waypoint?" -msgstr "crwdns2074:0crwdne2074:0" - -#: gui/src/chcanv.cpp:7857 gui/src/chcanv.cpp:7895 gui/src/chcanv.cpp:7916 -#: gui/src/chcanv.cpp:7978 gui/src/chcanv.cpp:8430 gui/src/chcanv.cpp:8468 -#: gui/src/chcanv.cpp:8488 gui/src/chcanv.cpp:8546 gui/src/chcanv.cpp:8940 -#: gui/src/chcanv.cpp:8958 gui/src/chcanv.cpp:9200 gui/src/chcanv.cpp:9218 -msgid "OpenCPN Route Create" -msgstr "crwdns2075:0crwdne2075:0" - -#: gui/src/chcanv.cpp:7887 gui/src/chcanv.cpp:8460 -msgid "Insert first part of this route in the new route?" -msgstr "crwdns21359:0crwdne21359:0" - -#: gui/src/chcanv.cpp:7891 gui/src/chcanv.cpp:8464 -msgid "Insert this route in the new route?" -msgstr "crwdns21349:0crwdne21349:0" - -#: gui/src/chcanv.cpp:7906 gui/src/chcanv.cpp:8479 -msgid "Append last part of this route to the new route?" -msgstr "crwdns21361:0crwdne21361:0" - -#: gui/src/chcanv.cpp:7909 gui/src/chcanv.cpp:8482 -msgid "Append this route to the new route?" -msgstr "crwdns21351:0crwdne21351:0" - -#: gui/src/chcanv.cpp:7968 gui/src/chcanv.cpp:8538 -msgid "For this leg the Great Circle route is " -msgstr "crwdns2076:0crwdne2076:0" - -#: gui/src/chcanv.cpp:7970 gui/src/chcanv.cpp:8540 -msgid " shorter than rhumbline.\n\n" -msgstr "crwdns2077:0crwdne2077:0" - -#: gui/src/chcanv.cpp:7971 gui/src/chcanv.cpp:8541 -msgid "Would you like include the Great Circle routing points for this leg?" -msgstr "crwdns2078:0crwdne2078:0" - -#: gui/src/chcanv.cpp:8906 gui/src/chcanv.cpp:9167 -msgid "Replace this RoutePoint by the nearby Waypoint?" -msgstr "crwdns21225:0crwdne21225:0" - -#: gui/src/chcanv.cpp:8908 gui/src/chcanv.cpp:9169 -msgid "OpenCPN RoutePoint change" -msgstr "crwdns21227:0crwdne21227:0" - -#: gui/src/chcanv.cpp:8933 gui/src/chcanv.cpp:9193 -msgid "Last part of route to be appended to dragged route?" -msgstr "crwdns21363:0crwdne21363:0" - -#: gui/src/chcanv.cpp:8937 gui/src/chcanv.cpp:9197 -msgid "Full route to be appended to dragged route?" -msgstr "crwdns21353:0crwdne21353:0" - -#: gui/src/chcanv.cpp:8951 gui/src/chcanv.cpp:9211 -msgid "First part of route to be inserted into dragged route?" -msgstr "crwdns21365:0crwdne21365:0" - -#: gui/src/chcanv.cpp:8955 gui/src/chcanv.cpp:9215 -msgid "Full route to be inserted into dragged route?" -msgstr "crwdns21357:0crwdne21357:0" - -#: gui/src/chcanv.cpp:8971 gui/src/chcanv.cpp:9231 -msgid "Do you really want to delete and replace this WayPoint" -msgstr "crwdns21233:0crwdne21233:0" - -#: gui/src/chcanv.cpp:8973 gui/src/chcanv.cpp:9233 -msgid "which has been created manually?" -msgstr "crwdns21235:0crwdne21235:0" - -#: gui/src/chcanv.cpp:9745 gui/src/chcanv.cpp:9755 -#: gui/src/S57QueryDialog.cpp:104 gui/src/S57QueryDialog.cpp:281 -msgid "ObjectQuery" -msgstr "crwdns2134:0crwdne2134:0" - -#: gui/src/chcanv.cpp:9910 gui/src/routemanagerdialog.cpp:2687 -msgid "Mark Properties" -msgstr "crwdns29196:0crwdne29196:0" - -#: gui/src/chcanv.cpp:9916 gui/src/routemanagerdialog.cpp:2693 -#: gui/src/RoutePropDlgImpl.cpp:518 -msgid "Layer" -msgstr "crwdns9236:0crwdne9236:0" - -#: gui/src/chcanv.cpp:10002 -msgid "There is an existing waypoint at the same location as the one you are pasting. Would you like to merge the pasted data with it?\n\n" -msgstr "crwdns2137:0crwdne2137:0" - -#: gui/src/chcanv.cpp:10004 -msgid "Answering 'No' will create a new waypoint at the same location." -msgstr "crwdns2138:0crwdne2138:0" - -#: gui/src/chcanv.cpp:10005 -msgid "Merge waypoint?" -msgstr "crwdns2139:0crwdne2139:0" - -#: gui/src/chcanv.cpp:10070 -msgid "There are existing waypoints at the same location as some of the ones you are pasting. Would you like to just merge the pasted data into them?\n\n" -msgstr "crwdns2140:0crwdne2140:0" - -#: gui/src/chcanv.cpp:10073 -msgid "Answering 'No' will create all new waypoints for this route." -msgstr "crwdns2141:0crwdne2141:0" - -#: gui/src/chcanv.cpp:10074 -msgid "Merge waypoints?" -msgstr "crwdns2142:0crwdne2142:0" - -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 -#: gui/src/RolloverWin.cpp:312 -msgid "RouteLegInfoRollover" -msgstr "crwdns2154:0crwdne2154:0" - -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 -msgid "MBTile requires OpenGL to be enabled" -msgstr "crwdns17740:0crwdne17740:0" - -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 -msgid "Feet" -msgstr "crwdns2155:0crwdne2155:0" - -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 -msgid "Meters" -msgstr "crwdns2156:0crwdne2156:0" - -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 -msgid "Fathoms" -msgstr "crwdns2157:0crwdne2157:0" - -#: gui/src/chcanv.cpp:12019 -msgid "OverZoom" -msgstr "crwdns2158:0crwdne2158:0" - -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 -msgid "ExtendedTideIcon" -msgstr "crwdns2159:0crwdne2159:0" - -#: gui/src/chcanv.cpp:12719 gui/src/chcanv.cpp:12720 -msgid "CurrentValue" -msgstr "crwdns2160:0crwdne2160:0" - -#: gui/src/chcanv.cpp:12953 gui/src/ocpn_frame.cpp:1071 -msgid "AIS Target Query" -msgstr "crwdns1988:0crwdne1988:0" - -#: gui/src/chcanv.cpp:13201 -msgid "Show all AIS Targets" -msgstr "crwdns8157:0crwdne8157:0" - -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 -msgid "Attenuate less critical AIS targets" -msgstr "crwdns9232:0crwdne9232:0" - -#: gui/src/chcanv.cpp:13203 -msgid "Hide AIS Targets" -msgstr "crwdns1996:0crwdne1996:0" - -#: gui/src/chcanv.cpp:13819 -msgid "Show This Chart" -msgstr "crwdns2018:0crwdne2018:0" - -#: gui/src/chcanv.cpp:13824 -msgid "Hide This Chart" -msgstr "crwdns2019:0crwdne2019:0" - -#: gui/src/cm93.cpp:6236 -msgid "OpenCPN CM93 Cell Offset Adjustments" -msgstr "crwdns2029:0crwdne2029:0" - -#: gui/src/cm93.cpp:6265 -msgid "Cell" -msgstr "crwdns2030:0crwdne2030:0" - -#: gui/src/cm93.cpp:6268 -msgid "M_COVR ID" -msgstr "crwdns2031:0crwdne2031:0" - -#: gui/src/cm93.cpp:6272 -msgid "Cell Scale" -msgstr "crwdns2032:0crwdne2032:0" - -#: gui/src/cm93.cpp:6276 -msgid "wgsox" -msgstr "crwdns2033:0crwdne2033:0" - -#: gui/src/cm93.cpp:6280 -msgid "wgsoy" -msgstr "crwdns2034:0crwdne2034:0" - -#: gui/src/cm93.cpp:6284 gui/src/cm93.cpp:6298 -msgid "User X Offset" -msgstr "crwdns2035:0crwdne2035:0" - -#: gui/src/cm93.cpp:6288 gui/src/cm93.cpp:6312 -msgid "User Y Offset" -msgstr "crwdns2036:0crwdne2036:0" - -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 -msgid "meters" -msgstr "crwdns6611:0crwdne6611:0" - -#: gui/src/concanv.cpp:99 gui/src/concanv.cpp:144 gui/src/concanv.cpp:159 -#: gui/src/concanv.cpp:198 gui/src/concanv.cpp:206 -msgid "This Leg" -msgstr "crwdns2054:0crwdne2054:0" - -#: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 -#: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 -msgid "Console Legend" -msgstr "crwdns2055:0crwdne2055:0" - -#: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 -#: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 -msgid "Console Value" -msgstr "crwdns2056:0crwdne2056:0" - -#: gui/src/concanv.cpp:209 -msgid "Full Route" -msgstr "crwdns2058:0crwdne2058:0" - -#: gui/src/concanv.cpp:211 -msgid "Show Highway" -msgstr "crwdns2059:0crwdne2059:0" - -#: gui/src/concanv.cpp:331 -msgid "XTE L" -msgstr "crwdns2060:0crwdne2060:0" - -#: gui/src/concanv.cpp:333 -msgid "XTE R" -msgstr "crwdns2061:0crwdne2061:0" - -#: gui/src/concanv.cpp:347 gui/src/concanv.cpp:412 -msgid "TTG @VMG" -msgstr "crwdns16162:0crwdne16162:0" - -#: gui/src/concanv.cpp:349 gui/src/concanv.cpp:415 -msgid "TTG @SOG" -msgstr "crwdns16164:0crwdne16164:0" - -#: gui/src/concanv.cpp:413 -msgid "ETA @VMG" -msgstr "crwdns16166:0crwdne16166:0" - -#: gui/src/concanv.cpp:416 -msgid "ETA @SOG" -msgstr "crwdns16168:0crwdne16168:0" - -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 -msgid "Title" -msgstr "crwdns12384:0crwdne12384:0" - -#: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 -#: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 -#: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 -msgid "Description" -msgstr "crwdns2271:0crwdne2271:0" - -#: gui/src/ConfigMgr.cpp:536 -msgid "Recovery Template" -msgstr "crwdns12564:0crwdne12564:0" - -#: gui/src/ConfigMgr.cpp:538 -msgid "Apply this template to return to a known safe configuration" -msgstr "crwdns12566:0crwdne12566:0" - -#: gui/src/connection_edit.cpp:187 -msgid "Connection Edit" -msgstr "crwdns29098:0crwdne29098:0" - -#: gui/src/connection_edit.cpp:202 gui/src/download_mgr.cpp:311 -#: gui/src/update_mgr.cpp:306 -msgid "More" -msgstr "crwdns24800:0crwdne24800:0" - -#: gui/src/connection_edit.cpp:205 gui/src/download_mgr.cpp:314 -#: gui/src/update_mgr.cpp:309 -msgid "Less" -msgstr "crwdns24802:0crwdne24802:0" - -#: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 -msgid "Edit Selected Connection" -msgstr "crwdns26883:0crwdne26883:0" - -#: gui/src/connection_edit.cpp:292 gui/src/conn_params_panel.cpp:442 -msgid "Built-in GPS" -msgstr "crwdns26889:0crwdne26889:0" - -#: gui/src/connection_edit.cpp:301 -msgid "Built-in Bluetooth SPP" -msgstr "crwdns26891:0crwdne26891:0" - -#: gui/src/connection_edit.cpp:305 gui/src/connection_edit.cpp:901 -msgid "BT Scan" -msgstr "crwdns26893:0crwdne26893:0" - -#: gui/src/connection_edit.cpp:315 -msgid "Bluetooth Data Sources" -msgstr "crwdns26895:0crwdne26895:0" - -#: gui/src/connection_edit.cpp:342 -msgid "Network Protocol" -msgstr "crwdns29100:0crwdne29100:0" - -#: gui/src/connection_edit.cpp:380 -msgid "Data Protocol" -msgstr "crwdns29102:0crwdne29102:0" - -#: gui/src/connection_edit.cpp:386 gui/src/connection_edit.cpp:511 -msgid "NMEA 0183" -msgstr "crwdns26943:0crwdne26943:0" - -#: gui/src/connection_edit.cpp:386 gui/src/connection_edit.cpp:511 -msgid "NMEA 2000" -msgstr "crwdns26945:0crwdne26945:0" - -#: gui/src/connection_edit.cpp:401 -msgid "Address" -msgstr "crwdns26907:0crwdne26907:0" - -#: gui/src/connection_edit.cpp:418 -msgid "DataPort" -msgstr "crwdns26909:0crwdne26909:0" - -#: gui/src/connection_edit.cpp:437 -msgid "socketCAN Source" -msgstr "crwdns26969:0crwdne26969:0" - -#: gui/src/connection_edit.cpp:466 -msgid "Data port" -msgstr "crwdns29106:0crwdne29106:0" - -#: gui/src/connection_edit.cpp:481 gui/src/conn_params_panel.cpp:213 -msgid "Baudrate" -msgstr "crwdns26913:0crwdne26913:0" - -#: gui/src/connection_edit.cpp:489 -msgid "150" -msgstr "crwdns26915:0crwdne26915:0" - -#: gui/src/connection_edit.cpp:489 -msgid "300" -msgstr "crwdns26917:0crwdne26917:0" - -#: gui/src/connection_edit.cpp:489 -msgid "600" -msgstr "crwdns26919:0crwdne26919:0" - -#: gui/src/connection_edit.cpp:489 -msgid "1200" -msgstr "crwdns26921:0crwdne26921:0" - -#: gui/src/connection_edit.cpp:489 -msgid "2400" -msgstr "crwdns26923:0crwdne26923:0" - -#: gui/src/connection_edit.cpp:490 -msgid "4800" -msgstr "crwdns26925:0crwdne26925:0" - -#: gui/src/connection_edit.cpp:490 -msgid "9600" -msgstr "crwdns26927:0crwdne26927:0" - -#: gui/src/connection_edit.cpp:490 -msgid "19200" -msgstr "crwdns26929:0crwdne26929:0" - -#: gui/src/connection_edit.cpp:490 -msgid "38400" -msgstr "crwdns26931:0crwdne26931:0" - -#: gui/src/connection_edit.cpp:490 -msgid "57600" -msgstr "crwdns26933:0crwdne26933:0" - -#: gui/src/connection_edit.cpp:491 -msgid "115200" -msgstr "crwdns26935:0crwdne26935:0" - -#: gui/src/connection_edit.cpp:491 -msgid "230400" -msgstr "crwdns26937:0crwdne26937:0" - -#: gui/src/connection_edit.cpp:491 -msgid "460800" -msgstr "crwdns26939:0crwdne26939:0" - -#: gui/src/connection_edit.cpp:491 -msgid "921600" -msgstr "crwdns26941:0crwdne26941:0" - -#: gui/src/connection_edit.cpp:506 gui/src/conn_params_panel.cpp:201 -#: gui/src/conn_params_panel.cpp:293 -msgid "Protocol" -msgstr "crwdns26897:0crwdne26897:0" - -#: gui/src/connection_edit.cpp:532 gui/src/connection_edit.cpp:547 -msgid "User Comment" -msgstr "crwdns26911:0crwdne26911:0" - -#: gui/src/connection_edit.cpp:560 -msgid "List position" -msgstr "crwdns26947:0crwdne26947:0" - -#: gui/src/connection_edit.cpp:565 -msgid "0" -msgstr "crwdns26949:0crwdne26949:0" - -#: gui/src/connection_edit.cpp:565 -msgid "1" -msgstr "crwdns26951:0crwdne26951:0" - -#: gui/src/connection_edit.cpp:565 -msgid "2" -msgstr "crwdns26953:0crwdne26953:0" - -#: gui/src/connection_edit.cpp:565 -msgid "3" -msgstr "crwdns26955:0crwdne26955:0" - -#: gui/src/connection_edit.cpp:565 -msgid "4" -msgstr "crwdns26957:0crwdne26957:0" - -#: gui/src/connection_edit.cpp:566 -msgid "5" -msgstr "crwdns26959:0crwdne26959:0" - -#: gui/src/connection_edit.cpp:566 -msgid "6" -msgstr "crwdns26961:0crwdne26961:0" - -#: gui/src/connection_edit.cpp:566 -msgid "7" -msgstr "crwdns26963:0crwdne26963:0" - -#: gui/src/connection_edit.cpp:566 -msgid "8" -msgstr "crwdns26965:0crwdne26965:0" - -#: gui/src/connection_edit.cpp:566 -msgid "9" -msgstr "crwdns26967:0crwdne26967:0" - -#: gui/src/connection_edit.cpp:588 -msgid "Receive Input on this Port" -msgstr "crwdns26977:0crwdne26977:0" - -#: gui/src/connection_edit.cpp:595 -msgid "Output on this port" -msgstr "crwdns26979:0crwdne26979:0" - -#: gui/src/connection_edit.cpp:596 -msgid "as autopilot or NMEA repeater" -msgstr "crwdns26981:0crwdne26981:0" - -#: gui/src/connection_edit.cpp:603 -msgid "Auth Token" -msgstr "crwdns29104:0crwdne29104:0" - -#: gui/src/connection_edit.cpp:617 -msgid "Control checksum" -msgstr "crwdns26971:0crwdne26971:0" - -#: gui/src/connection_edit.cpp:621 -msgid "If checked, only the sentences with a valid checksum are passed through" -msgstr "crwdns26973:0crwdne26973:0" - -#: gui/src/connection_edit.cpp:627 -msgid "Use Garmin (GRMN) mode for input" -msgstr "crwdns26975:0crwdne26975:0" - -#: gui/src/connection_edit.cpp:637 -msgid " UDP Multicast" -msgstr "crwdns29198:0crwdne29198:0" - -#: gui/src/connection_edit.cpp:646 -msgid "APB bearing precision" -msgstr "crwdns26987:0crwdne26987:0" - -#: gui/src/connection_edit.cpp:652 -msgid "x" -msgstr "crwdns26989:0crwdne26989:0" - -#: gui/src/connection_edit.cpp:652 -msgid "x.x" -msgstr "crwdns26991:0crwdne26991:0" - -#: gui/src/connection_edit.cpp:652 -msgid "x.xx" -msgstr "crwdns26993:0crwdne26993:0" - -#: gui/src/connection_edit.cpp:653 -msgid "x.xxx" -msgstr "crwdns26995:0crwdne26995:0" - -#: gui/src/connection_edit.cpp:653 -msgid "x.xxxx" -msgstr "crwdns26997:0crwdne26997:0" - -#: gui/src/connection_edit.cpp:667 -msgid "Automatic server discovery" -msgstr "crwdns26999:0crwdne26999:0" - -#: gui/src/connection_edit.cpp:671 -msgid "If checked, signal K server will be discovered automatically" -msgstr "crwdns27001:0crwdne27001:0" - -#: gui/src/connection_edit.cpp:677 -msgid "Discover now..." -msgstr "crwdns27003:0crwdne27003:0" - -#: gui/src/connection_edit.cpp:688 -msgid "Input filtering" -msgstr "crwdns27005:0crwdne27005:0" - -#: gui/src/connection_edit.cpp:697 gui/src/connection_edit.cpp:2459 -msgid "Accept only sentences" -msgstr "crwdns27007:0crwdne27007:0" - -#: gui/src/connection_edit.cpp:702 gui/src/connection_edit.cpp:2460 -msgid "Ignore sentences" -msgstr "crwdns27009:0crwdne27009:0" - -#: gui/src/connection_edit.cpp:725 -msgid "Output filtering" -msgstr "crwdns27011:0crwdne27011:0" - -#: gui/src/connection_edit.cpp:733 gui/src/connection_edit.cpp:2457 -msgid "Transmit sentences" -msgstr "crwdns27013:0crwdne27013:0" - -#: gui/src/connection_edit.cpp:737 gui/src/connection_edit.cpp:2457 -msgid "Drop sentences" -msgstr "crwdns27015:0crwdne27015:0" - -#: gui/src/connection_edit.cpp:847 -msgid "Stop Scan" -msgstr "crwdns27017:0crwdne27017:0" - -#: gui/src/connection_edit.cpp:1629 -msgid "Signal K server available." -msgstr "crwdns27021:0crwdne27021:0" - -#: gui/src/connection_edit.cpp:1631 -msgid "Signal K server not found." -msgstr "crwdns27023:0crwdne27023:0" - -#: gui/src/connection_edit.cpp:1748 -msgid "There is an enabled UDP input connection that uses the same data port." -msgstr "crwdns29200:0crwdne29200:0" - -#: gui/src/connection_edit.cpp:1751 -msgid "Please apply a filter on both connections to avoid a feedback loop." -msgstr "crwdns29202:0crwdne29202:0" - -#: gui/src/connection_edit.cpp:1756 -msgid "There is a disabled UDP Input connection that uses the same Dataport." -msgstr "crwdns29204:0crwdne29204:0" - -#: gui/src/connection_edit.cpp:1760 -msgid "If you enable that input please apply a filter on both connections to avoid a feedback loop." -msgstr "crwdns29206:0crwdne29206:0" - -#: gui/src/connection_edit.cpp:1764 -msgid "Or consider using a different data port for one of them" -msgstr "crwdns29208:0crwdne29208:0" - -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 -#: gui/src/routeman_gui.cpp:73 -msgid "OpenCPN Warning" -msgstr "crwdns6638:0crwdne6638:0" - -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 -#: gui/src/routemanagerdialog.cpp:1949 -msgid "OpenCPN info" -msgstr "crwdns2345:0crwdne2345:0" - -#: gui/src/connection_edit.cpp:2395 -msgid "Sentence Filter" -msgstr "crwdns27025:0crwdne27025:0" - -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 -msgid "Select All" -msgstr "crwdns2670:0crwdne2670:0" - -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 -msgid "Clear All" -msgstr "crwdns2671:0crwdne2671:0" - -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 -#: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 -msgid "Add" -msgstr "crwdns2295:0crwdne2295:0" - -#: gui/src/connection_edit.cpp:2525 -msgid "Enter the NMEA sentence (2, 3 or 5 characters)\n" -" or a valid REGEX expression (6 characters or longer)" -msgstr "crwdns27027:0crwdne27027:0" - -#: gui/src/connection_edit.cpp:2527 -msgid "Enter the NMEA sentence" -msgstr "crwdns27029:0crwdne27029:0" - -#: gui/src/connection_edit.cpp:2546 -msgid "An NMEA sentence is generally 3 characters long (like RMC, GGA etc.)\n" -" It can also have a two letter prefix identifying the source, or TALKER, of the message.\n" -" The whole sentences then looks like GPGGA or AITXT.\n" -" You may filter out all the sentences with certain TALKER prefix (like GP, AI etc.).\n" -" The filter also accepts Regular Expressions (REGEX) with 6 or more characters. \n\n" -msgstr "crwdns27031:0crwdne27031:0" - -#: gui/src/connection_edit.cpp:2563 -msgid "REGEX syntax error: \n" -msgstr "crwdns27033:0crwdne27033:0" - -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 -msgid "General" -msgstr "crwdns2574:0crwdne2574:0" - -#: gui/src/connections_dialog.cpp:128 -msgid "Filter NMEA Course and Speed data" -msgstr "crwdns26863:0crwdne26863:0" - -#: gui/src/connections_dialog.cpp:134 -msgid "Filter period (sec)" -msgstr "crwdns26865:0crwdne26865:0" - -#: gui/src/connections_dialog.cpp:154 -msgid "Show NMEA Debug Window" -msgstr "crwdns26867:0crwdne26867:0" - -#: gui/src/connections_dialog.cpp:160 -msgid "Format uploads for Furuno GP3X" -msgstr "crwdns26869:0crwdne26869:0" - -#: gui/src/connections_dialog.cpp:166 -msgid "Use Garmin GRMN (Host) mode for uploads" -msgstr "crwdns26871:0crwdne26871:0" - -#: gui/src/connections_dialog.cpp:173 -msgid "Use magnetic bearings in output sentence APB" -msgstr "crwdns29210:0crwdne29210:0" - -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "crwdns29212:0crwdne29212:0" - -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." -msgstr "crwdns26875:0crwdne26875:0" - -#: gui/src/connections_dialog.cpp:209 -msgid "Data Connections" -msgstr "crwdns26877:0crwdne26877:0" - -#: gui/src/connections_dialog.cpp:218 -msgid "Add Connection..." -msgstr "crwdns29214:0crwdne29214:0" - -#: gui/src/connections_dialog.cpp:222 -msgid "Edit Connection..." -msgstr "crwdns29216:0crwdne29216:0" - -#: gui/src/connections_dialog.cpp:227 -msgid "Remove Connection" -msgstr "crwdns26881:0crwdne26881:0" - -#: gui/src/connections_dialog.cpp:421 -msgid "Configure new connection" -msgstr "crwdns27019:0crwdne27019:0" - -#: gui/src/conn_params_panel.cpp:163 -msgid "Enable" -msgstr "crwdns27061:0crwdne27061:0" - -#: gui/src/conn_params_panel.cpp:195 gui/src/conn_params_panel.cpp:287 -#: gui/src/conn_params_panel.cpp:417 gui/src/conn_params_panel.cpp:520 -msgid "Direction" -msgstr "crwdns27063:0crwdne27063:0" - -#: gui/src/conn_params_panel.cpp:207 -msgid "Serial Port" -msgstr "crwdns27065:0crwdne27065:0" - -#: gui/src/conn_params_panel.cpp:260 gui/src/conn_params_panel.cpp:391 -#: gui/src/conn_params_panel.cpp:495 gui/src/conn_params_panel.cpp:598 -#: gui/src/conn_params_panel.cpp:698 gui/src/conn_params_panel.cpp:734 -#: gui/src/conn_params_panel.cpp:771 gui/src/conn_params_panel.cpp:773 -#: gui/src/conn_params_panel.cpp:777 gui/src/conn_params_panel.cpp:781 -msgid "Comment: " -msgstr "crwdns27067:0crwdne27067:0" - -#: gui/src/conn_params_panel.cpp:299 -msgid "Network Address" -msgstr "crwdns27069:0crwdne27069:0" - -#: gui/src/conn_params_panel.cpp:305 -msgid "Network Port" -msgstr "crwdns27071:0crwdne27071:0" - -#: gui/src/conn_params_panel.cpp:545 -msgid "Built-in Bluetooth" -msgstr "crwdns27073:0crwdne27073:0" - -#: gui/src/conn_params_panel.cpp:620 -msgid "Driver" -msgstr "crwdns27075:0crwdne27075:0" - -#: gui/src/DetailSlider.cpp:88 -msgid "CM93 Detail Level" -msgstr "crwdns2063:0crwdne2063:0" - -#: gui/src/DetailSlider.cpp:92 -msgid "Rasterchart Zoom/Scale Weighting" -msgstr "crwdns12374:0crwdne12374:0" - -#: gui/src/DetailSlider.cpp:96 -msgid "Vectorchart Zoom/Scale Weighting" -msgstr "crwdns12376:0crwdne12376:0" - -#: gui/src/download_mgr.cpp:207 gui/src/update_mgr.cpp:208 -msgid "Install" -msgstr "crwdns24606:0crwdne24606:0" - -#: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 -msgid "Reinstall" -msgstr "crwdns19814:0crwdne19814:0" - -#: gui/src/download_mgr.cpp:266 gui/src/update_mgr.cpp:242 -msgid "Update" -msgstr "crwdns24608:0crwdne24608:0" - -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 -#: gui/src/update_mgr.cpp:246 -msgid "Downgrade" -msgstr "crwdns19816:0crwdne19816:0" - -#: gui/src/download_mgr.cpp:387 -msgid "Update plugin catalog" -msgstr "crwdns24616:0crwdne24616:0" - -#: gui/src/download_mgr.cpp:400 -msgid "Advanced catalog update..." -msgstr "crwdns24618:0crwdne24618:0" - -#: gui/src/download_mgr.cpp:479 gui/src/update_mgr.cpp:469 -msgid "Plugin Manager" -msgstr "crwdns24620:0crwdne24620:0" - -#: gui/src/download_mgr.cpp:513 -msgid "Downloading " -msgstr "crwdns24622:0crwdne24622:0" - -#: gui/src/download_mgr.cpp:516 -msgid "Downloading" -msgstr "crwdns24624:0crwdne24624:0" - -#: gui/src/download_mgr.cpp:572 -msgid " successfully installed" -msgstr "crwdns24626:0crwdne24626:0" - -#: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 -msgid "Installation complete" -msgstr "crwdns24628:0crwdne24628:0" - -#: gui/src/download_mgr.cpp:589 gui/src/pluginmanager.cpp:1113 -msgid "Installation error" -msgstr "crwdns24630:0crwdne24630:0" - -#: gui/src/glChartCanvas.cpp:1925 -msgid "GridText" -msgstr "crwdns26687:0crwdne26687:0" - -#: gui/src/glChartCanvas.cpp:4528 -msgid "Waiting for raster chart compression thread exit." -msgstr "crwdns8020:0crwdne8020:0" - -#: gui/src/glTextureManager.cpp:1468 -msgid "OpenCPN Compressed Cache Update" -msgstr "crwdns24768:0crwdne24768:0" - -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 -#, c-format -msgid "Distance from Ownship: %4.0f NMi" -msgstr "crwdns8014:0%4.0fcrwdne8014:0" - -#: gui/src/GoToPositionDialog.cpp:120 gui/src/MarkInfo.cpp:404 -#: gui/src/RoutePropDlg.cpp:373 gui/src/TrackPropDlg.cpp:307 -msgid "Latitude" -msgstr "crwdns2266:0crwdne2266:0" - -#: gui/src/GoToPositionDialog.cpp:132 gui/src/MarkInfo.cpp:415 -#: gui/src/RoutePropDlg.cpp:377 gui/src/TrackPropDlg.cpp:308 -msgid "Longitude" -msgstr "crwdns2267:0crwdne2267:0" - -#: gui/src/kml.cpp:473 -msgid "OpenCPN Route" -msgstr "crwdns2839:0crwdne2839:0" - -#: gui/src/kml.cpp:517 -msgid "OpenCPN Track" -msgstr "crwdns2840:0crwdne2840:0" - -#: gui/src/kml.cpp:566 -msgid "OpenCPN Waypoint" -msgstr "crwdns2841:0crwdne2841:0" - -#: gui/src/kml.cpp:637 -msgid "Choose Format for Copy" -msgstr "crwdns2842:0crwdne2842:0" - -#: gui/src/kml.cpp:645 -msgid "KML Standard (Google Earth and others)" -msgstr "crwdns2843:0crwdne2843:0" - -#: gui/src/kml.cpp:649 -msgid "KML with extended waypoint data (QtVlm)" -msgstr "crwdns2844:0crwdne2844:0" - -#: gui/src/LinkPropDlg.cpp:47 -msgid "Link" -msgstr "crwdns2881:0crwdne2881:0" - -#: gui/src/LinkPropDlg.cpp:49 -msgid "Link description" -msgstr "crwdns2882:0crwdne2882:0" - -#: gui/src/LinkPropDlg.cpp:58 -msgid "URL" -msgstr "crwdns2883:0crwdne2883:0" - -#: gui/src/LinkPropDlg.cpp:67 -msgid "Local file..." -msgstr "crwdns2884:0crwdne2884:0" - -#: gui/src/LinkPropDlg.cpp:122 -msgid "Choose a file" -msgstr "crwdns2885:0crwdne2885:0" - -#: gui/src/LinkPropDlg.cpp:133 -msgid "Link not complete, can't be saved." -msgstr "crwdns2886:0crwdne2886:0" - -#: gui/src/load_errors_dlg.cpp:49 -msgid "\n" -"The following plugins have encountered errors during startup:\n\n" -msgstr "crwdns27393:0crwdne27393:0" - -#: gui/src/load_errors_dlg.cpp:54 -msgid "\n" -"The following plugin has encountered errors during startup:\n\n" -msgstr "crwdns27395:0crwdne27395:0" - -#: gui/src/load_errors_dlg.cpp:59 -msgid "\n" -"The following libraries have encountered errors during startup:\n\n" -msgstr "crwdns27397:0crwdne27397:0" - -#: gui/src/load_errors_dlg.cpp:64 -msgid "\n" -"The following library has encountered errors during startup:\n\n" -msgstr "crwdns27399:0crwdne27399:0" - -#: gui/src/load_errors_dlg.cpp:68 -msgid "\n\n" -"These plugins will be uninstalled. You might want to reinstall\n" -"them after updating the catalog.\n" -msgstr "crwdns27401:0crwdne27401:0" - -#: gui/src/load_errors_dlg.cpp:74 -msgid "\n\n" -"This plugin will be uninstalled. You might want to reinstall\n" -"it after updating the catalog.\n" -msgstr "crwdns27403:0crwdne27403:0" - -#: gui/src/load_errors_dlg.cpp:80 -msgid "\n\n" -"These libraries will be removed. You might want to reinstall their\n" -"associated plugin after updating the catalog." -msgstr "crwdns27405:0crwdne27405:0" - -#: gui/src/load_errors_dlg.cpp:85 -msgid "\n\n" -"The library will be removed. You might want to reinstall it's\n" -"associated plugin after updating the catalog." -msgstr "crwdns27407:0crwdne27407:0" - -#: gui/src/MarkInfo.cpp:318 gui/src/RoutePropDlg.cpp:416 -#: gui/src/TrackPropDlg.cpp:640 -msgid "Basic" -msgstr "crwdns2285:0crwdne2285:0" - -#: gui/src/MarkInfo.cpp:341 -msgid "This waypoint is part of a layer and can't be edited" -msgstr "crwdns12590:0crwdne12590:0" - -#: gui/src/MarkInfo.cpp:375 gui/src/MarkInfo.cpp:1883 -#: gui/src/routemanagerdialog.cpp:748 -msgid "Icon" -msgstr "crwdns2288:0crwdne2288:0" - -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 -msgid "Combo!" -msgstr "crwdns2289:0crwdne2289:0" - -#: gui/src/MarkInfo.cpp:456 gui/src/MarkInfo.cpp:469 -#: gui/src/RoutePropDlg.cpp:434 gui/src/TrackPropDlg.cpp:883 -msgid "Links" -msgstr "crwdns2291:0crwdne2291:0" - -#: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 -#: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 -#: gui/src/TrackPropDlg.cpp:930 -msgid "Edit" -msgstr "crwdns2293:0crwdne2293:0" - -#: gui/src/MarkInfo.cpp:495 gui/src/MarkInfo.cpp:502 -#: gui/src/RoutePropDlg.cpp:459 gui/src/RoutePropDlg.cpp:503 -#: gui/src/TrackPropDlg.cpp:902 -msgid "Add new" -msgstr "crwdns2294:0crwdne2294:0" - -#: gui/src/MarkInfo.cpp:543 -msgid "Extended" -msgstr "crwdns12616:0crwdne12616:0" - -#: gui/src/MarkInfo.cpp:547 -msgid "Extended Properties" -msgstr "crwdns12594:0crwdne12594:0" - -#: gui/src/MarkInfo.cpp:557 gui/src/routemanagerdialog.cpp:981 -#: gui/src/TrackPropDlg.cpp:380 gui/src/TrackPropDlg.cpp:717 -msgid "Show on chart" -msgstr "crwdns2297:0crwdne2297:0" - -#: gui/src/MarkInfo.cpp:566 -msgid "Show at scale > 1 :" -msgstr "crwdns12596:0crwdne12596:0" - -#: gui/src/MarkInfo.cpp:577 -msgid "Show waypoint name" -msgstr "crwdns12598:0crwdne12598:0" - -#: gui/src/MarkInfo.cpp:582 gui/src/MarkInfo.cpp:1897 -msgid "Range rings" -msgstr "crwdns12600:0crwdne12600:0" - -#: gui/src/MarkInfo.cpp:588 -msgid "Number" -msgstr "crwdns12602:0crwdne12602:0" - -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 -#: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 -#: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 -#: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 -msgid "Distance" -msgstr "crwdns2263:0crwdne2263:0" - -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 -#: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 -#: gui/src/TrackPropDlg.cpp:721 -msgid "Color" -msgstr "crwdns2859:0crwdne2859:0" - -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 -msgid "None" -msgstr "crwdns2649:0crwdne2649:0" - -#: gui/src/MarkInfo.cpp:608 -msgid "0.05" -msgstr "crwdns12604:0crwdne12604:0" - -#: gui/src/MarkInfo.cpp:633 -msgid "GUID" -msgstr "crwdns12606:0crwdne12606:0" - -#: gui/src/MarkInfo.cpp:647 -msgid "Tide Station" -msgstr "crwdns12608:0crwdne12608:0" - -#: gui/src/MarkInfo.cpp:675 -msgid "Arrival Radius" -msgstr "crwdns12612:0crwdne12612:0" - -#: gui/src/MarkInfo.cpp:690 -msgid "Planned Speed" -msgstr "crwdns12614:0crwdne12614:0" - -#: gui/src/MarkInfo.cpp:704 -msgid "ETD (UTC)" -msgstr "crwdns21345:0crwdne21345:0" - -#: gui/src/MarkInfo.cpp:1170 gui/src/MarkInfo.cpp:1225 -msgid "Add New" -msgstr "crwdns12618:0crwdne12618:0" - -#: gui/src/MarkInfo.cpp:1326 gui/src/TTYWindow.cpp:86 -msgid "Copy" -msgstr "crwdns6604:0crwdne6604:0" - -#: gui/src/MarkInfo.cpp:1327 -msgid "Copy lat/long" -msgstr "crwdns12620:0crwdne12620:0" - -#: gui/src/MarkInfo.cpp:1328 -msgid "Paste" -msgstr "crwdns12622:0crwdne12622:0" - -#: gui/src/MarkInfo.cpp:1329 -msgid "Paste lat/long" -msgstr "crwdns12624:0crwdne12624:0" - -#: gui/src/MarkInfo.cpp:1855 -msgid "Save some defaults" -msgstr "crwdns12626:0crwdne12626:0" - -#: gui/src/MarkInfo.cpp:1864 -msgid "Check which properties of current waypoint\n" -" should be set as default for NEW waypoints." -msgstr "crwdns12628:0crwdne12628:0" - -#: gui/src/MarkInfo.cpp:1871 gui/src/MarkInfo.cpp:1891 -msgid "Do use" -msgstr "crwdns12630:0crwdne12630:0" - -#: gui/src/MarkInfo.cpp:1872 gui/src/MarkInfo.cpp:1896 -msgid "Don't use" -msgstr "crwdns12632:0crwdne12632:0" - -#: gui/src/MarkInfo.cpp:1874 -msgid "Show Waypoint Name" -msgstr "crwdns12634:0crwdne12634:0" - -#: gui/src/MarkInfo.cpp:1905 -msgid "Arrival radius" -msgstr "crwdns12636:0crwdne12636:0" - -#: gui/src/MarkInfo.cpp:1916 -msgid "Show only if" -msgstr "crwdns12638:0crwdne12638:0" - -#: gui/src/MarkInfo.cpp:1918 -msgid "Show always" -msgstr "crwdns12640:0crwdne12640:0" - -#: gui/src/MarkInfo.cpp:1919 -msgid "Show only at scale" -msgstr "crwdns12642:0crwdne12642:0" - -#: gui/src/MarkInfo.cpp:1958 -msgid "Tide Station not found" -msgstr "crwdns19828:0crwdne19828:0" - -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 -msgid "Set scale" -msgstr "crwdns24772:0crwdne24772:0" - -#: gui/src/MUIBar.cpp:167 -msgid "Chart Scale" -msgstr "crwdns24774:0crwdne24774:0" - -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 -msgid "Persistent" -msgstr "crwdns6372:0crwdne6372:0" - -#: gui/src/navutil.cpp:2935 gui/src/navutil.cpp:3039 -msgid "Export GPX file" -msgstr "crwdns2162:0crwdne2162:0" - -#: gui/src/navutil.cpp:2945 -msgid "Overwrite existing file?" -msgstr "crwdns2163:0crwdne2163:0" - -#: gui/src/navutil.cpp:3129 gui/src/navutil.cpp:3161 -msgid "Import GPX file" -msgstr "crwdns2164:0crwdne2164:0" - -#: gui/src/navutil.cpp:3227 -msgid "Temporary" -msgstr "crwdns12378:0crwdne12378:0" - -#: gui/src/navutil.cpp:3262 -msgid "duplicate waypoints detected during import and ignored." -msgstr "crwdns12558:0crwdne12558:0" - -#: gui/src/NMEALogWindow.cpp:59 -msgid "NMEA Debug Window" -msgstr "crwdns8021:0crwdne8021:0" - -#: gui/src/ocpn_app.cpp:798 -msgid "Cannot load route or waypoint file: " -msgstr "crwdns29110:0crwdne29110:0" - -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 -msgid "Failed to initialize the user interface. " -msgstr "crwdns27111:0crwdne27111:0" - -#: gui/src/ocpn_app.cpp:1303 -msgid "OpenCPN cannot start. " -msgstr "crwdns27113:0crwdne27113:0" - -#: gui/src/ocpn_app.cpp:1304 -msgid "The necessary configuration files were not found. " -msgstr "crwdns27115:0crwdne27115:0" - -#: gui/src/ocpn_app.cpp:1305 -msgid "See the log file at " -msgstr "crwdns27117:0crwdne27117:0" - -#: gui/src/ocpn_app.cpp:1306 -msgid " for details." -msgstr "crwdns27119:0crwdne27119:0" - -#: gui/src/ocpn_app.cpp:1595 -msgid " -- [Portable(-p) executing from " -msgstr "crwdns27121:0crwdne27121:0" - -#: gui/src/ocpn_app.cpp:1670 -msgid "Retrieving initial Chart Directory set from Windows Registry" -msgstr "crwdns27123:0crwdne27123:0" - -#: gui/src/ocpn_app.cpp:1852 -#, c-format -msgid "OpenCPN Initialized in %ld ms." -msgstr "crwdns27125:0%ldcrwdne27125:0" - -#: gui/src/ocpn_frame.cpp:453 -msgid "\n" -"OpenCPN 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.\n\n" -"See the GNU General Public License for more details.\n\n" -"OpenCPN must only be used in conjunction with approved paper charts and traditional methods of navigation.\n\n" -"DO NOT rely upon OpenCPN for safety of life or property.\n\n" -"Please click \"OK\" to agree and proceed, \"Cancel\" to quit.\n" -msgstr "crwdns27127:0crwdne27127:0" - -#: gui/src/ocpn_frame.cpp:467 -msgid "OpenCPN for Android" -msgstr "crwdns27129:0crwdne27129:0" - -#: gui/src/ocpn_frame.cpp:485 -msgid "Welcome to OpenCPN" -msgstr "crwdns27131:0crwdne27131:0" - -#: gui/src/ocpn_frame.cpp:718 -msgid "This AIS target has Persistent tracking selected by MMSI properties\n" -"A Persistent track recording will therefore be restarted for this target.\n\n" -"Do you instead want to stop Persistent tracking for this target?" -msgstr "crwdns27133:0crwdne27133:0" - -#: gui/src/ocpn_frame.cpp:865 -msgid "OpenCPN needs to update the chart database from config file entries...." -msgstr "crwdns27135:0crwdne27135:0" - -#: gui/src/ocpn_frame.cpp:877 -msgid "Rebuilding chart database from configuration file entries..." -msgstr "crwdns27137:0crwdne27137:0" - -#: gui/src/ocpn_frame.cpp:881 -msgid "Elapsed time : " -msgstr "crwdns27139:0crwdne27139:0" - -#: gui/src/ocpn_frame.cpp:882 -msgid "Estimated time : " -msgstr "crwdns27141:0crwdne27141:0" - -#: gui/src/ocpn_frame.cpp:883 -msgid "Remaining time : " -msgstr "crwdns27143:0crwdne27143:0" - -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 -msgid "OpenCPN Chart Update" -msgstr "crwdns27145:0crwdne27145:0" - -#: gui/src/ocpn_frame.cpp:1661 -msgid "Anchorage created " -msgstr "crwdns2006:0crwdne2006:0" - -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 -msgid "Show Toolbar" -msgstr "crwdns27147:0crwdne27147:0" - -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 -msgid "Hide Toolbar" -msgstr "crwdns27149:0crwdne27149:0" - -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 -msgid "MAN OVERBOARD" -msgstr "crwdns27151:0crwdne27151:0" - -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 -msgid " at " -msgstr "crwdns27153:0crwdne27153:0" - -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 -msgid " on " -msgstr "crwdns27155:0crwdne27155:0" - -#: gui/src/ocpn_frame.cpp:2935 -msgid "1.0 NM along COG" -msgstr "crwdns27157:0crwdne27157:0" - -#: gui/src/ocpn_frame.cpp:2947 -msgid "Temporary MOB Route" -msgstr "crwdns27159:0crwdne27159:0" - -#: gui/src/ocpn_frame.cpp:2948 -msgid "Assumed 1 Mile Point" -msgstr "crwdns27161:0crwdne27161:0" - -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 -msgid " Time: " -msgstr "crwdns27163:0crwdne27163:0" - -#: gui/src/ocpn_frame.cpp:2978 -msgid " Position: " -msgstr "crwdns27165:0crwdne27165:0" - -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 -msgid "Disable Tracking" -msgstr "crwdns27167:0crwdne27167:0" - -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 -msgid "Enable Tracking" -msgstr "crwdns6598:0crwdne6598:0" - -#: gui/src/ocpn_frame.cpp:3437 -msgid "Auto Follow" -msgstr "crwdns1994:0crwdne1994:0" - -#: gui/src/ocpn_frame.cpp:3442 -msgid "Head Up Mode" -msgstr "crwdns27169:0crwdne27169:0" - -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 -msgid "Zoom In" -msgstr "crwdns1989:0crwdne1989:0" - -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 -msgid "Zoom Out" -msgstr "crwdns1990:0crwdne1990:0" - -#: gui/src/ocpn_frame.cpp:3453 -msgid "Larger Scale Chart" -msgstr "crwdns27171:0crwdne27171:0" - -#: gui/src/ocpn_frame.cpp:3455 -msgid "Smaller Scale Chart" -msgstr "crwdns27173:0crwdne27173:0" - -#: gui/src/ocpn_frame.cpp:3458 -msgid "Exit OpenCPN" -msgstr "crwdns27175:0crwdne27175:0" - -#: gui/src/ocpn_frame.cpp:3460 -msgid "&Navigate" -msgstr "crwdns27177:0crwdne27177:0" - -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 -msgid "Show Chart Bar" -msgstr "crwdns6289:0crwdne6289:0" - -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 -msgid "Show ENC text" -msgstr "crwdns9231:0crwdne9231:0" - -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 -msgid "Show ENC Lights" -msgstr "crwdns27179:0crwdne27179:0" - -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 -msgid "Show ENC Soundings" -msgstr "crwdns27181:0crwdne27181:0" - -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 -msgid "Show ENC Anchoring Info" -msgstr "crwdns27183:0crwdne27183:0" - -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 -msgid "Show ENC Data Quality" -msgstr "crwdns27185:0crwdne27185:0" - -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 -msgid "Show Navobjects" -msgstr "crwdns27187:0crwdne27187:0" - -#: gui/src/ocpn_frame.cpp:3508 -msgid "Show Tides" -msgstr "crwdns1998:0crwdne1998:0" - -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 -msgid "Change Color Scheme" -msgstr "crwdns2002:0crwdne2002:0" - -#: gui/src/ocpn_frame.cpp:3524 -msgid "&View" -msgstr "crwdns27189:0crwdne27189:0" - -#: gui/src/ocpn_frame.cpp:3527 -msgid "Show AIS Targets" -msgstr "crwdns2005:0crwdne2005:0" - -#: gui/src/ocpn_frame.cpp:3532 -msgid "Hide Moored AIS Targets" -msgstr "crwdns27191:0crwdne27191:0" - -#: gui/src/ocpn_frame.cpp:3533 -msgid "Show AIS Target Tracks" -msgstr "crwdns27193:0crwdne27193:0" - -#: gui/src/ocpn_frame.cpp:3534 -msgid "Show CPA Alert Dialogs" -msgstr "crwdns27195:0crwdne27195:0" - -#: gui/src/ocpn_frame.cpp:3535 -msgid "Sound CPA Alarms" -msgstr "crwdns27197:0crwdne27197:0" - -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 -msgid "Show CPA Warnings" -msgstr "crwdns27199:0crwdne27199:0" - -#: gui/src/ocpn_frame.cpp:3547 -msgid "&AIS" -msgstr "crwdns27201:0crwdne27201:0" - -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 -msgid "Measure Distance" -msgstr "crwdns27203:0crwdne27203:0" - -#: gui/src/ocpn_frame.cpp:3559 -msgid "Route && Mark Manager..." -msgstr "crwdns27205:0crwdne27205:0" - -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 -msgid "Create Route" -msgstr "crwdns1993:0crwdne1993:0" - -#: gui/src/ocpn_frame.cpp:3564 -msgid "Drop Mark at Boat" -msgstr "crwdns27207:0crwdne27207:0" - -#: gui/src/ocpn_frame.cpp:3566 -msgid "Drop Mark at Cursor" -msgstr "crwdns27209:0crwdne27209:0" - -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 -msgid "Drop MOB Marker" -msgstr "crwdns2003:0crwdne2003:0" - -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 -msgid "Preferences" -msgstr "crwdns2830:0crwdne2830:0" - -#: gui/src/ocpn_frame.cpp:3584 -msgid "&Tools" -msgstr "crwdns27211:0crwdne27211:0" - -#: gui/src/ocpn_frame.cpp:3588 -msgid "&Window" -msgstr "crwdns27213:0crwdne27213:0" - -#: gui/src/ocpn_frame.cpp:3593 -msgid "OpenCPN Help" -msgstr "crwdns27215:0crwdne27215:0" - -#: gui/src/ocpn_frame.cpp:3594 -msgid "&Help" -msgstr "crwdns27217:0crwdne27217:0" - -#: gui/src/ocpn_frame.cpp:4252 -msgid "Please restart OpenCPN to activate language or style changes." -msgstr "crwdns27219:0crwdne27219:0" - -#: gui/src/ocpn_frame.cpp:5253 -msgid " Ship " -msgstr "crwdns27221:0crwdne27221:0" - -#: gui/src/ocpn_frame.cpp:5945 -msgid "Rotated Mode" -msgstr "crwdns27223:0crwdne27223:0" - -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 -#: gui/src/trackprintout.cpp:409 -msgid "There was a problem printing.\n" -"Perhaps your current printer is not set correctly?" -msgstr "crwdns2021:0crwdne2021:0" - -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 -#: gui/src/routemanagerdialog.cpp:1272 -msgid "(Unnamed Route)" -msgstr "crwdns2022:0crwdne2022:0" - -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 -msgid "AIS MAN OVERBOARD" -msgstr "crwdns27225:0crwdne27225:0" - -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 -msgid "Own ship" -msgstr "crwdns9233:0crwdne9233:0" - -#: gui/src/ocpn_frame.cpp:6722 -msgid "Temporary AISMOB Route" -msgstr "crwdns27227:0crwdne27227:0" - -#: gui/src/ocpn_frame.cpp:6723 -msgid "Present own ship" -msgstr "crwdns27229:0crwdne27229:0" - -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 -msgid " Ownship Position: " -msgstr "crwdns27231:0crwdne27231:0" - -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 -msgid " MOB Position: " -msgstr "crwdns27233:0crwdne27233:0" - -#: gui/src/ocpn_frame.cpp:6789 -msgid "AIS MAN OVERBOARD UPDATE" -msgstr "crwdns27235:0crwdne27235:0" - -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 -msgid "Route & Mark Manager" -msgstr "crwdns6597:0crwdne6597:0" - -#: gui/src/ocpn_frame.cpp:7069 -msgid "Print Chart" -msgstr "crwdns1999:0crwdne1999:0" - -#: gui/src/ocpn_frame.cpp:7083 -msgid " (Ctrl-Space)" -msgstr "crwdns2004:0crwdne2004:0" - -#: gui/src/ocpn_frame.cpp:8619 -msgid "OpenCPN ENC Prepare" -msgstr "crwdns27237:0crwdne27237:0" - -#: gui/src/ocpn_frame.cpp:8685 -msgid "ENC Completed." -msgstr "crwdns27239:0crwdne27239:0" - -#: gui/src/options.cpp:840 -msgid "Create a private configuration template based on current settings.\n" -"This template will be saved, and may be selected for further use at any time.\n" -" " -msgstr "crwdns12386:0crwdne12386:0" - -#: gui/src/options.cpp:898 -msgid "MMSI Extended Properties" -msgstr "crwdns6193:0crwdne6193:0" - -#: gui/src/options.cpp:912 -msgid "Tracking" -msgstr "crwdns6194:0crwdne6194:0" - -#: gui/src/options.cpp:917 -msgid "Default tracking" -msgstr "crwdns6195:0crwdne6195:0" - -#: gui/src/options.cpp:922 -msgid "Always track" -msgstr "crwdns6196:0crwdne6196:0" - -#: gui/src/options.cpp:925 -msgid " Never track" -msgstr "crwdns8027:0crwdne8027:0" - -#: gui/src/options.cpp:934 -msgid "Ignore this MMSI" -msgstr "crwdns6198:0crwdne6198:0" - -#: gui/src/options.cpp:938 -msgid "Handle this MMSI as SART/PLB(AIS) MOB." -msgstr "crwdns6307:0crwdne6307:0" - -#: gui/src/options.cpp:942 -msgid "Convert AIVDM to AIVDO for this MMSI" -msgstr "crwdns6200:0crwdne6200:0" - -#: gui/src/options.cpp:946 -msgid "This MMSI is my Follower - No CPA Alert" -msgstr "crwdns8153:0crwdne8153:0" - -#: gui/src/options.cpp:1031 -msgid "An MMSI Id is generally a number of nine digits.\n" -"Please check your entries and cancel if necessary." -msgstr "crwdns8154:0crwdne8154:0" - -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 -#: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 -#: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 -#: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 -msgid "Default" -msgstr "crwdns2239:0crwdne2239:0" - -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 -#: gui/src/routemanagerdialog.cpp:2633 -msgid "Always" -msgstr "crwdns6201:0crwdne6201:0" - -#: gui/src/options.cpp:1084 -msgid "Never" -msgstr "crwdns6202:0crwdne6202:0" - -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 -msgid "Edit MMSI Properties" -msgstr "crwdns6331:0crwdne6331:0" - -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 -msgid "MMSI Properties" -msgstr "crwdns6203:0crwdne6203:0" - -#: gui/src/options.cpp:1233 -msgid "Track Mode" -msgstr "crwdns6204:0crwdne6204:0" - -#: gui/src/options.cpp:1242 -msgid "Ignore" -msgstr "crwdns6205:0crwdne6205:0" - -#: gui/src/options.cpp:1251 -msgid "MOB" -msgstr "crwdns6206:0crwdne6206:0" - -#: gui/src/options.cpp:1259 -msgid "VDM->VDO" -msgstr "crwdns6207:0crwdne6207:0" - -#: gui/src/options.cpp:1268 -msgid "Ship name" -msgstr "crwdns8165:0crwdne8165:0" - -#: gui/src/options.cpp:1277 -msgid "Follower" -msgstr "crwdns8155:0crwdne8155:0" - -#: gui/src/options.cpp:1282 -msgid "New..." -msgstr "crwdns6208:0crwdne6208:0" - -#: gui/src/options.cpp:1305 -msgid "Add MMSI Properties" -msgstr "crwdns6333:0crwdne6333:0" - -#: gui/src/options.cpp:1726 -msgid "The device selected is not accessible; opencpn will likely not be able\n" -"to use this device as-is. You might want to exit OpenCPN, reboot and\n" -"retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" -"with the following contents:\n\n" -" KERNEL==\"ttyUSB*\", MODE=\"0666\"\n" -" KERNEL==\"ttyACM*\", MODE=\"0666\"\n" -" KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" -"For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -msgstr "crwdns12388:0crwdne12388:0" - -#: gui/src/options.cpp:1737 -msgid "\n" -"The device selected is not accessible; opencpn will likely not be able\n" -"to use this device as-is. You might want to exit OpenCPN, reboot and\n" -"retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" -"with the following contents:\n\n" -" KERNEL==\"ttyUSB*\", MODE=\"0666\"\n" -" KERNEL==\"ttyACM*\", MODE=\"0666\"\n" -" KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" -"For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -msgstr "crwdns12390:0crwdne12390:0" - -#: gui/src/options.cpp:1859 -msgid "NMEA" -msgstr "crwdns2573:0crwdne2573:0" - -#: gui/src/options.cpp:1884 -msgid "COG Predictor Length (min)" -msgstr "crwdns2639:0crwdne2639:0" - -#: gui/src/options.cpp:1891 -msgid "Heading Predictor Length (NMi)" -msgstr "crwdns5923:0crwdne5923:0" - -#: gui/src/options.cpp:1898 -msgid "Ship Icon Type" -msgstr "crwdns2640:0crwdne2640:0" - -#: gui/src/options.cpp:1901 -msgid "Real Scale Bitmap" -msgstr "crwdns2641:0crwdne2641:0" - -#: gui/src/options.cpp:1902 -msgid "Real Scale Vector" -msgstr "crwdns2642:0crwdne2642:0" - -#: gui/src/options.cpp:1917 -msgid "Length Over All (m)" -msgstr "crwdns2643:0crwdne2643:0" - -#: gui/src/options.cpp:1923 -msgid "Width Over All (m)" -msgstr "crwdns2644:0crwdne2644:0" - -#: gui/src/options.cpp:1929 -msgid "GPS Offset from Bow (m)" -msgstr "crwdns2645:0crwdne2645:0" - -#: gui/src/options.cpp:1935 -msgid "GPS Offset from Midship (m)" -msgstr "crwdns2646:0crwdne2646:0" - -#: gui/src/options.cpp:1941 -msgid "Minimum Screen Size (mm)" -msgstr "crwdns2647:0crwdne2647:0" - -#: gui/src/options.cpp:1953 -msgid "Show range rings" -msgstr "crwdns6339:0crwdne6339:0" - -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 -msgid "Distance between rings" -msgstr "crwdns9240:0crwdne9240:0" - -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 -msgid "Distance Unit" -msgstr "crwdns2651:0crwdne2651:0" - -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 -msgid "Nautical miles" -msgstr "crwdns2771:0crwdne2771:0" - -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 -msgid "Kilometers" -msgstr "crwdns2653:0crwdne2653:0" - -#: gui/src/options.cpp:1982 -msgid "Minutes (time)" -msgstr "crwdns29218:0crwdne29218:0" - -#: gui/src/options.cpp:1989 -msgid "Range Ring Colour" -msgstr "crwdns10509:0crwdne10509:0" - -#: gui/src/options.cpp:2004 -msgid "Show direction to Active Waypoint" -msgstr "crwdns21391:0crwdne21391:0" - -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 -#: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 -msgid "Style" -msgstr "crwdns2860:0crwdne2860:0" - -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 -#: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 -msgid "Solid" -msgstr "crwdns2240:0crwdne2240:0" - -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 -#: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 -msgid "Dot" -msgstr "crwdns2241:0crwdne2241:0" - -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 -#: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 -msgid "Long dash" -msgstr "crwdns2242:0crwdne2242:0" - -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Short dash" -msgstr "crwdns2243:0crwdne2243:0" - -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "crwdns2244:0crwdne2244:0" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 -#: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 -msgid "Default color" -msgstr "crwdns2221:0crwdne2221:0" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 -#: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 -msgid "Black" -msgstr "crwdns2222:0crwdne2222:0" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 -#: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 -msgid "Dark Red" -msgstr "crwdns2223:0crwdne2223:0" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 -#: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 -msgid "Dark Green" -msgstr "crwdns2224:0crwdne2224:0" - -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 -#: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 -msgid "Dark Yellow" -msgstr "crwdns2225:0crwdne2225:0" - -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 -#: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 -msgid "Dark Blue" -msgstr "crwdns2226:0crwdne2226:0" - -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 -#: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 -msgid "Dark Magenta" -msgstr "crwdns2227:0crwdne2227:0" - -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 -#: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 -msgid "Dark Cyan" -msgstr "crwdns2228:0crwdne2228:0" - -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 -#: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 -msgid "Light Gray" -msgstr "crwdns2229:0crwdne2229:0" - -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 -#: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 -msgid "Dark Gray" -msgstr "crwdns2230:0crwdne2230:0" - -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 -#: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 -msgid "Red" -msgstr "crwdns2231:0crwdne2231:0" - -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 -#: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 -msgid "Green" -msgstr "crwdns2232:0crwdne2232:0" - -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 -#: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 -msgid "Yellow" -msgstr "crwdns2233:0crwdne2233:0" - -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 -#: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 -msgid "Blue" -msgstr "crwdns2234:0crwdne2234:0" - -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 -#: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 -msgid "Magenta" -msgstr "crwdns2235:0crwdne2235:0" - -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 -#: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 -msgid "Cyan" -msgstr "crwdns2236:0crwdne2236:0" - -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 -#: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 -msgid "White" -msgstr "crwdns2237:0crwdne2237:0" - -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 -msgid "Tracks" -msgstr "crwdns2314:0crwdne2314:0" - -#: gui/src/options.cpp:2049 -msgid "Automatic Daily Tracks at midnight" -msgstr "crwdns8166:0crwdne8166:0" - -#: gui/src/options.cpp:2057 -msgid "Automatic Daily Tracks at" -msgstr "crwdns8167:0crwdne8167:0" - -#: gui/src/options.cpp:2074 -msgid "Computer" -msgstr "crwdns8168:0crwdne8168:0" - -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 -#: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 -#: gui/src/TrackPropDlg.cpp:819 -msgid "UTC" -msgstr "crwdns2216:0crwdne2216:0" - -#: gui/src/options.cpp:2086 -msgid "LMT" -msgstr "crwdns8169:0crwdne8169:0" - -#: gui/src/options.cpp:2099 -msgid "Highlight Tracks" -msgstr "crwdns2655:0crwdne2655:0" - -#: gui/src/options.cpp:2103 -msgid "Highlight Colour" -msgstr "crwdns26689:0crwdne26689:0" - -#: gui/src/options.cpp:2118 -msgid "Tracking Precision" -msgstr "crwdns2656:0crwdne2656:0" - -#: gui/src/options.cpp:2121 -msgid "Low" -msgstr "crwdns2657:0crwdne2657:0" - -#: gui/src/options.cpp:2121 -msgid "Medium" -msgstr "crwdns2658:0crwdne2658:0" - -#: gui/src/options.cpp:2121 -msgid "High" -msgstr "crwdns2659:0crwdne2659:0" - -#: gui/src/options.cpp:2129 -msgid "Calculate values" -msgstr "crwdns10511:0crwdne10511:0" - -#: gui/src/options.cpp:2143 -msgid "Calculate SOG and COG from position changes" -msgstr "crwdns10512:0crwdne10512:0" - -#: gui/src/options.cpp:2148 -msgid "Min seconds between updates" -msgstr "crwdns10513:0crwdne10513:0" - -#: gui/src/options.cpp:2164 -msgid "Routes/Points" -msgstr "crwdns12398:0crwdne12398:0" - -#: gui/src/options.cpp:2177 -msgid "New Routes" -msgstr "crwdns16178:0crwdne16178:0" - -#: gui/src/options.cpp:2182 -msgid "Active Route" -msgstr "crwdns29112:0crwdne29112:0" - -#: gui/src/options.cpp:2188 -msgid "Persist active route, automatically activate on start up" -msgstr "crwdns29114:0crwdne29114:0" - -#: gui/src/options.cpp:2202 -msgid "Waypoint default icon" -msgstr "crwdns12402:0crwdne12402:0" - -#: gui/src/options.cpp:2228 -msgid "Waypoint Arrival Circle Radius (NMi)" -msgstr "crwdns2660:0crwdne2660:0" - -#: gui/src/options.cpp:2237 -msgid "Advance route waypoint on arrival only" -msgstr "crwdns6334:0crwdne6334:0" - -#: gui/src/options.cpp:2250 -msgid "New Marks" -msgstr "crwdns29220:0crwdne29220:0" - -#: gui/src/options.cpp:2265 -msgid "Mark default icon" -msgstr "crwdns29222:0crwdne29222:0" - -#: gui/src/options.cpp:2291 -msgid "Show marks only at a chartscale greater than 1 :" -msgstr "crwdns29224:0crwdne29224:0" - -#: gui/src/options.cpp:2300 -msgid "Override the settings for chartscale based visibility and show always" -msgstr "crwdns12406:0crwdne12406:0" - -#: gui/src/options.cpp:2313 -msgid "Mark range rings" -msgstr "crwdns29226:0crwdne29226:0" - -#: gui/src/options.cpp:2350 -msgid "Waypoint Range Ring Colours" -msgstr "crwdns7652:0crwdne7652:0" - -#: gui/src/options.cpp:2371 -msgid "Control Options" -msgstr "crwdns12408:0crwdne12408:0" - -#: gui/src/options.cpp:2380 -msgid "Lock marks and waypoints (Unless object property dialog visible)" -msgstr "crwdns29228:0crwdne29228:0" - -#: gui/src/options.cpp:2386 -msgid "Confirm deletion of tracks and routes" -msgstr "crwdns2778:0crwdne2778:0" - -#: gui/src/options.cpp:2444 -msgid "Chart Files" -msgstr "crwdns6340:0crwdne6340:0" - -#: gui/src/options.cpp:2449 -msgid "Directories" -msgstr "crwdns2662:0crwdne2662:0" - -#: gui/src/options.cpp:2472 -msgid "Add Directory..." -msgstr "crwdns2663:0crwdne2663:0" - -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 -#: gui/src/RoutePropDlgImpl.cpp:933 -msgid "Remove Selected" -msgstr "crwdns2664:0crwdne2664:0" - -#: gui/src/options.cpp:2474 -msgid "Compress Selected" -msgstr "crwdns9241:0crwdne9241:0" - -#: gui/src/options.cpp:2477 -msgid "Add.." -msgstr "crwdns24632:0crwdne24632:0" - -#: gui/src/options.cpp:2478 -msgid "Remove" -msgstr "crwdns8033:0crwdne8033:0" - -#: gui/src/options.cpp:2479 -msgid "Compress" -msgstr "crwdns24634:0crwdne24634:0" - -#: gui/src/options.cpp:2504 -msgid "Migrate Charts.." -msgstr "crwdns24776:0crwdne24776:0" - -#: gui/src/options.cpp:2512 -msgid "Update Control" -msgstr "crwdns2665:0crwdne2665:0" - -#: gui/src/options.cpp:2521 -msgid "Scan Charts and Update Database" -msgstr "crwdns2666:0crwdne2666:0" - -#: gui/src/options.cpp:2525 -msgid "Force Full Database Rebuild" -msgstr "crwdns2667:0crwdne2667:0" - -#: gui/src/options.cpp:2529 -msgid "Prepare all ENC Charts" -msgstr "crwdns9242:0crwdne9242:0" - -#: gui/src/options.cpp:2597 -msgid " [Modified]" -msgstr "crwdns12410:0crwdne12410:0" - -#: gui/src/options.cpp:2605 -msgid "Templates" -msgstr "crwdns12412:0crwdne12412:0" - -#: gui/src/options.cpp:2617 -msgid "Template Status" -msgstr "crwdns12414:0crwdne12414:0" - -#: gui/src/options.cpp:2627 -msgid "Last Applied Template Title:" -msgstr "crwdns12416:0crwdne12416:0" - -#: gui/src/options.cpp:2640 -msgid "Saved Templates" -msgstr "crwdns12418:0crwdne12418:0" - -#: gui/src/options.cpp:2667 -msgid "Create Config..." -msgstr "crwdns12420:0crwdne12420:0" - -#: gui/src/options.cpp:2679 -msgid "Delete Selected Config..." -msgstr "crwdns12422:0crwdne12422:0" - -#: gui/src/options.cpp:2687 -msgid "Apply Selected Config" -msgstr "crwdns12424:0crwdne12424:0" - -#: gui/src/options.cpp:2760 -msgid "Create Config" -msgstr "crwdns12426:0crwdne12426:0" - -#: gui/src/options.cpp:2814 -msgid "Problem applying selected configuration." -msgstr "crwdns12428:0crwdne12428:0" - -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 -#: gui/src/TrackPropDlg.cpp:946 -msgid "Advanced" -msgstr "crwdns2869:0crwdne2869:0" - -#: gui/src/options.cpp:2905 -msgid "De-skew Raster Charts" -msgstr "crwdns8044:0crwdne8044:0" - -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 -msgid "Use Accelerated Graphics (OpenGL)" -msgstr "crwdns2715:0crwdne2715:0" - -#: gui/src/options.cpp:2922 -msgid "OpenGL Options" -msgstr "crwdns17742:0crwdne17742:0" - -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 -msgid "Chart Rotation Averaging Time" -msgstr "crwdns10514:0crwdne10514:0" - -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 -msgid "seconds" -msgstr "crwdns6343:0crwdne6343:0" - -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 -msgid "Chart Zoom/Scale Weighting" -msgstr "crwdns6344:0crwdne6344:0" - -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 -msgid "Raster" -msgstr "crwdns9351:0crwdne9351:0" - -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 -msgid "Vector" -msgstr "crwdns9352:0crwdne9352:0" - -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 -msgid "CM93 Detail level" -msgstr "crwdns19724:0crwdne19724:0" - -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 -msgid "Physical Screen Width" -msgstr "crwdns6632:0crwdne6632:0" - -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 -msgid "Auto" -msgstr "crwdns6633:0crwdne6633:0" - -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 -msgid "Manual:" -msgstr "crwdns6634:0crwdne6634:0" - -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 -msgid "mm" -msgstr "crwdns6635:0crwdne6635:0" - -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 -msgid "Chart Display" -msgstr "crwdns6341:0crwdne6341:0" - -#: gui/src/options.cpp:3075 -msgid "Show Skewed Raster Charts as North-Up" -msgstr "crwdns2723:0crwdne2723:0" - -#: gui/src/options.cpp:3128 -msgid "With a lower value, the same zoom level shows a less detailed chart.\n" -"With a higher value, the same zoom level shows a more detailed chart." -msgstr "crwdns9353:0crwdne9353:0" - -#: gui/src/options.cpp:3233 -msgid "Graphics" -msgstr "crwdns6347:0crwdne6347:0" - -#: gui/src/options.cpp:3264 -msgid "Chart Bar" -msgstr "crwdns29116:0crwdne29116:0" - -#: gui/src/options.cpp:3270 -msgid "Show extended chart bar information." -msgstr "crwdns29118:0crwdne29118:0" - -#: gui/src/options.cpp:3289 -msgid "Vector Chart Display" -msgstr "crwdns6348:0crwdne6348:0" - -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 -msgid "Mariner's Standard" -msgstr "crwdns2669:0crwdne2669:0" - -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 -msgid "Depth Soundings" -msgstr "crwdns2677:0crwdne2677:0" - -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 -msgid "Chart Information Objects" -msgstr "crwdns2678:0crwdne2678:0" - -#: gui/src/options.cpp:3342 -msgid "Buoys/Lights" -msgstr "crwdns6349:0crwdne6349:0" - -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 -msgid "Extended Light Sectors" -msgstr "crwdns2683:0crwdne2683:0" - -#: gui/src/options.cpp:3364 -msgid "Chart Texts" -msgstr "crwdns6350:0crwdne6350:0" - -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 -msgid "National text on chart" -msgstr "crwdns2685:0crwdne2685:0" - -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 -msgid "Important Text Only" -msgstr "crwdns2679:0crwdne2679:0" - -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 -msgid "De-Cluttered Text" -msgstr "crwdns2684:0crwdne2684:0" - -#: gui/src/options.cpp:3385 -msgid "Chart Detail" -msgstr "crwdns6351:0crwdne6351:0" - -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 -msgid "Reduced Detail at Small Scale" -msgstr "crwdns2680:0crwdne2680:0" - -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 -msgid "Additional detail reduction at Small Scale" -msgstr "crwdns29230:0crwdne29230:0" - -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 -msgid "Graphics Style" -msgstr "crwdns6352:0crwdne6352:0" - -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 -msgid "Paper Chart" -msgstr "crwdns2686:0crwdne2686:0" - -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 -msgid "Simplified" -msgstr "crwdns2687:0crwdne2687:0" - -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 -msgid "Boundaries" -msgstr "crwdns2691:0crwdne2691:0" - -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 -msgid "Plain" -msgstr "crwdns2689:0crwdne2689:0" - -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 -msgid "Symbolized" -msgstr "crwdns2690:0crwdne2690:0" - -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 -msgid "Colors" -msgstr "crwdns2694:0crwdne2694:0" - -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 -msgid "2 Color" -msgstr "crwdns2692:0crwdne2692:0" - -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 -msgid "4 Color" -msgstr "crwdns2693:0crwdne2693:0" - -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 -msgid "Shallow Depth" -msgstr "crwdns2696:0crwdne2696:0" - -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 -msgid "Safety Depth" -msgstr "crwdns2697:0crwdne2697:0" - -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 -msgid "Deep Depth" -msgstr "crwdns2698:0crwdne2698:0" - -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 -msgid "User Standard Objects" -msgstr "crwdns12430:0crwdne12430:0" - -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 -msgid "Reset to STANDARD" -msgstr "crwdns9243:0crwdne9243:0" - -#: gui/src/options.cpp:3720 -msgid "Tides && Currents" -msgstr "crwdns2700:0crwdne2700:0" - -#: gui/src/options.cpp:3725 -msgid "Active Datasets" -msgstr "crwdns2701:0crwdne2701:0" - -#: gui/src/options.cpp:3765 -msgid "Add Dataset..." -msgstr "crwdns2702:0crwdne2702:0" - -#: gui/src/options.cpp:3809 -msgid "All Available Charts" -msgstr "crwdns2703:0crwdne2703:0" - -#: gui/src/options.cpp:3831 -msgid "Remove Chart" -msgstr "crwdns2704:0crwdne2704:0" - -#: gui/src/options.cpp:3868 -msgid "All Charts" -msgstr "crwdns2705:0crwdne2705:0" - -#: gui/src/options.cpp:3887 -msgid "New Group..." -msgstr "crwdns2706:0crwdne2706:0" - -#: gui/src/options.cpp:3889 -msgid "Delete Group" -msgstr "crwdns2707:0crwdne2707:0" - -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 -msgid "Preserve scale when switching charts" -msgstr "crwdns9244:0crwdne9244:0" - -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 -msgid "Controls" -msgstr "crwdns6346:0crwdne6346:0" - -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 -msgid "Smooth Panning / Zooming" -msgstr "crwdns2717:0crwdne2717:0" - -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 -msgid "Zoom to Cursor" -msgstr "crwdns2718:0crwdne2718:0" - -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 -msgid "Display Features" -msgstr "crwdns6357:0crwdne6357:0" - -#: gui/src/options.cpp:4045 -msgid "Status Bar Option" -msgstr "crwdns10515:0crwdne10515:0" - -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 -msgid "Live ETA at Cursor" -msgstr "crwdns10516:0crwdne10516:0" - -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 -msgid "Default Boat Speed " -msgstr "crwdns10517:0crwdne10517:0" - -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 -msgid "Canvas Layout" -msgstr "crwdns12432:0crwdne12432:0" - -#: gui/src/options.cpp:4232 -msgid "Status Bar" -msgstr "crwdns18968:0crwdne18968:0" - -#: gui/src/options.cpp:4299 -msgid "Units" -msgstr "crwdns6358:0crwdne6358:0" - -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 -msgid "Statute miles" -msgstr "crwdns2772:0crwdne2772:0" - -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 -msgid "Knots" -msgstr "crwdns2774:0crwdne2774:0" - -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 -msgid "Mph" -msgstr "crwdns2775:0crwdne2775:0" - -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 -msgid "Depth" -msgstr "crwdns6359:0crwdne6359:0" - -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 -msgid "Temperature" -msgstr "crwdns21251:0crwdne21251:0" - -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 -msgid "Celsius" -msgstr "crwdns21253:0crwdne21253:0" - -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 -msgid "Fahrenheit" -msgstr "crwdns21255:0crwdne21255:0" - -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 -msgid "Kelvin" -msgstr "crwdns21257:0crwdne21257:0" - -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 -msgid "Lat/Long" -msgstr "crwdns6360:0crwdne6360:0" - -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 -msgid "Degrees, Decimal Minutes" -msgstr "crwdns2767:0crwdne2767:0" - -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 -msgid "Decimal Degrees" -msgstr "crwdns2768:0crwdne2768:0" - -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 -msgid "Degrees, Minutes, Seconds" -msgstr "crwdns2769:0crwdne2769:0" - -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 -msgid "Bearings" -msgstr "crwdns6361:0crwdne6361:0" - -#: gui/src/options.cpp:4421 -msgid "Show true" -msgstr "crwdns9245:0crwdne9245:0" - -#: gui/src/options.cpp:4426 -msgid "Show magnetic" -msgstr "crwdns17744:0crwdne17744:0" - -#: gui/src/options.cpp:4442 -msgid "Assumed magnetic variation" -msgstr "crwdns6363:0crwdne6363:0" - -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 -msgid "deg (-W, +E)" -msgstr "crwdns7659:0crwdne7659:0" - -#: gui/src/options.cpp:4500 -msgid "WindSpeed" -msgstr "crwdns29120:0crwdne29120:0" - -#: gui/src/options.cpp:4564 -msgid "Show true bearings and headings" -msgstr "crwdns9246:0crwdne9246:0" - -#: gui/src/options.cpp:4567 -msgid "Show magnetic bearings and headings." -msgstr "crwdns9354:0crwdne9354:0" - -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 -msgid "WMM Plugin calculated magnetic variation" -msgstr "crwdns9355:0crwdne9355:0" - -#: gui/src/options.cpp:4597 -msgid " To set the magnetic variation manually,\n" -" you must disable the WMM plugin." -msgstr "crwdns9356:0crwdne9356:0" - -#: gui/src/options.cpp:4731 -msgid "Test" -msgstr "crwdns24828:0crwdne24828:0" - -#: gui/src/options.cpp:4744 -msgid "Audio file name:" -msgstr "crwdns21397:0crwdne21397:0" - -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 -msgid "Select Sound File" -msgstr "crwdns2798:0crwdne2798:0" - -#: gui/src/options.cpp:4854 -msgid "Sounds" -msgstr "crwdns21259:0crwdne21259:0" - -#: gui/src/options.cpp:4862 -msgid "Anchor Alarm" -msgstr "crwdns21261:0crwdne21261:0" - -#: gui/src/options.cpp:4863 -msgid "Play Sound on Anchor Alarm." -msgstr "crwdns21263:0crwdne21263:0" - -#: gui/src/options.cpp:4864 -msgid "Select Anchor Alarm Sound" -msgstr "crwdns21267:0crwdne21267:0" - -#: gui/src/options.cpp:4874 -msgid "Play Sound on AIS Alert." -msgstr "crwdns21271:0crwdne21271:0" - -#: gui/src/options.cpp:4875 -msgid "Select AIS Alert Sound" -msgstr "crwdns21273:0crwdne21273:0" - -#: gui/src/options.cpp:4888 -msgid "SART Alert" -msgstr "crwdns21277:0crwdne21277:0" - -#: gui/src/options.cpp:4889 -msgid "Play Sound on AIS SART Alert." -msgstr "crwdns21279:0crwdne21279:0" - -#: gui/src/options.cpp:4890 -msgid "Select AIS SART Alert Sound" -msgstr "crwdns21281:0crwdne21281:0" - -#: gui/src/options.cpp:4903 -msgid "DSC Alert" -msgstr "crwdns21285:0crwdne21285:0" - -#: gui/src/options.cpp:4904 -msgid "Play Sound on DSC notification." -msgstr "crwdns21287:0crwdne21287:0" - -#: gui/src/options.cpp:4905 -msgid "Select DSC notification Sound" -msgstr "crwdns21289:0crwdne21289:0" - -#: gui/src/options.cpp:4917 -msgid "Sound Device Configuration" -msgstr "crwdns29122:0crwdne29122:0" - -#: gui/src/options.cpp:4932 -msgid "Unknown device :" -msgstr "crwdns12440:0crwdne12440:0" - -#: gui/src/options.cpp:4937 -msgid "Input device :" -msgstr "crwdns24636:0crwdne24636:0" - -#: gui/src/options.cpp:4965 -msgid "Sound Device" -msgstr "crwdns12442:0crwdne12442:0" - -#: gui/src/options.cpp:4979 -msgid "Audio Play command:" -msgstr "crwdns12438:0crwdne12438:0" - -#: gui/src/options.cpp:5020 -msgid "AIS Targets" -msgstr "crwdns2728:0crwdne2728:0" - -#: gui/src/options.cpp:5027 -msgid "CPA Calculation" -msgstr "crwdns2729:0crwdne2729:0" - -#: gui/src/options.cpp:5038 -msgid "No (T)CPA Alerts if target range is greater than (NMi)" -msgstr "crwdns8170:0crwdne8170:0" - -#: gui/src/options.cpp:5045 -msgid "Warn if CPA less than (NMi)" -msgstr "crwdns2731:0crwdne2731:0" - -#: gui/src/options.cpp:5057 -msgid "...and TCPA is less than (min)" -msgstr "crwdns2732:0crwdne2732:0" - -#: gui/src/options.cpp:5065 -msgid "Lost Targets" -msgstr "crwdns2733:0crwdne2733:0" - -#: gui/src/options.cpp:5074 -msgid "Mark targets as lost after (min)" -msgstr "crwdns2734:0crwdne2734:0" - -#: gui/src/options.cpp:5082 -msgid "Remove lost targets after (min)" -msgstr "crwdns2735:0crwdne2735:0" - -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 -msgid "Display" -msgstr "crwdns2708:0crwdne2708:0" - -#: gui/src/options.cpp:5101 -msgid "Show target COG predictor arrow, length (min)" -msgstr "crwdns2736:0crwdne2736:0" - -#: gui/src/options.cpp:5109 -msgid "Sync AIS arrow length with own ship's COG predictor" -msgstr "crwdns26693:0crwdne26693:0" - -#: gui/src/options.cpp:5119 -msgid "Show target tracks, length (min)" -msgstr "crwdns2737:0crwdne2737:0" - -#: gui/src/options.cpp:5127 -msgid "Suppress anchored/moored targets, speed max (kn)" -msgstr "crwdns8204:0crwdne8204:0" - -#: gui/src/options.cpp:5135 -msgid "Draw AIS realtime prediction, target speed min (kn)" -msgstr "crwdns19726:0crwdne19726:0" - -#: gui/src/options.cpp:5145 -msgid "Allow attenuation of less critical targets if more than ... targets" -msgstr "crwdns8205:0crwdne8205:0" - -#: gui/src/options.cpp:5153 -msgid "Show area notices (from AIS binary messages)" -msgstr "crwdns2739:0crwdne2739:0" - -#: gui/src/options.cpp:5160 -msgid "Show AIS targets real size" -msgstr "crwdns2740:0crwdne2740:0" - -#: gui/src/options.cpp:5167 -msgid "Show names with AIS targets at scale greater than 1:" -msgstr "crwdns2741:0crwdne2741:0" - -#: gui/src/options.cpp:5175 -msgid "Use WPL position messages. Action when received:" -msgstr "crwdns21293:0crwdne21293:0" - -#: gui/src/options.cpp:5178 -msgid "APRS position report" -msgstr "crwdns21295:0crwdne21295:0" - -#: gui/src/options.cpp:5178 -msgid "Create mark" -msgstr "crwdns21297:0crwdne21297:0" - -#: gui/src/options.cpp:5184 -msgid "Rollover" -msgstr "crwdns2743:0crwdne2743:0" - -#: gui/src/options.cpp:5190 -msgid "Enable route/AIS info block" -msgstr "crwdns17746:0crwdne17746:0" - -#: gui/src/options.cpp:5198 -msgid "\"Ship Name\" MMSI (Call Sign)" -msgstr "crwdns2744:0crwdne2744:0" - -#: gui/src/options.cpp:5202 -msgid "[Class] Type (Status)" -msgstr "crwdns2745:0crwdne2745:0" - -#: gui/src/options.cpp:5205 -msgid "SOG COG" -msgstr "crwdns2746:0crwdne2746:0" - -#: gui/src/options.cpp:5208 -msgid "CPA TCPA" -msgstr "crwdns2747:0crwdne2747:0" - -#: gui/src/options.cpp:5213 -msgid "CPA/TCPA Alerts" -msgstr "crwdns2748:0crwdne2748:0" - -#: gui/src/options.cpp:5222 -msgid "Show CPA/TCPA Alert Dialog" -msgstr "crwdns2749:0crwdne2749:0" - -#: gui/src/options.cpp:5241 -msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." -msgstr "crwdns2751:0crwdne2751:0" - -#: gui/src/options.cpp:5250 -msgid "Test AIS Alert Sound" -msgstr "crwdns29124:0crwdne29124:0" - -#: gui/src/options.cpp:5263 -msgid "Suppress Alerts for anchored/moored targets" -msgstr "crwdns12434:0crwdne12434:0" - -#: gui/src/options.cpp:5270 -msgid "Enable Target Alert Acknowledge timeout (min)" -msgstr "crwdns2754:0crwdne2754:0" - -#: gui/src/options.cpp:5294 -msgid "General Options" -msgstr "crwdns2755:0crwdne2755:0" - -#: gui/src/options.cpp:5303 -msgid "Language" -msgstr "crwdns2756:0crwdne2756:0" - -#: gui/src/options.cpp:5318 -msgid "Fonts" -msgstr "crwdns2757:0crwdne2757:0" - -#: gui/src/options.cpp:5354 -msgid "Choose Font..." -msgstr "crwdns2758:0crwdne2758:0" - -#: gui/src/options.cpp:5359 -msgid "Choose Font Color..." -msgstr "crwdns2759:0crwdne2759:0" - -#: gui/src/options.cpp:5363 -msgid "Sample" -msgstr "crwdns12436:0crwdne12436:0" - -#: gui/src/options.cpp:5371 -msgid "Toolbar and Window Style" -msgstr "crwdns2760:0crwdne2760:0" - -#: gui/src/options.cpp:5389 -msgid "Interface Options" -msgstr "crwdns6365:0crwdne6365:0" - -#: gui/src/options.cpp:5395 -msgid "Show Status Bar" -msgstr "crwdns2762:0crwdne2762:0" - -#: gui/src/options.cpp:5400 -msgid "Show Menu Bar" -msgstr "crwdns6314:0crwdne6314:0" - -#: gui/src/options.cpp:5414 -msgid "Show Compass/GPS Status Window" -msgstr "crwdns2763:0crwdne2763:0" - -#: gui/src/options.cpp:5422 -msgid "Enable Toolbar auto-hide" -msgstr "crwdns7660:0crwdne7660:0" - -#: gui/src/options.cpp:5437 -msgid "Play Ships Bells" -msgstr "crwdns2776:0crwdne2776:0" - -#: gui/src/options.cpp:5442 -msgid "Enable Touchscreen interface" -msgstr "crwdns6366:0crwdne6366:0" - -#: gui/src/options.cpp:5446 -msgid "Enable Scaled Graphics interface" -msgstr "crwdns9247:0crwdne9247:0" - -#: gui/src/options.cpp:5459 -msgid "Show Zoom buttons" -msgstr "crwdns18970:0crwdne18970:0" - -#: gui/src/options.cpp:5466 -msgid "Use Inland ECDIS" -msgstr "crwdns26695:0crwdne26695:0" - -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 -msgid "Inland ECDIS Manual" -msgstr "crwdns26697:0crwdne26697:0" - -#: gui/src/options.cpp:5492 -msgid "User Interface scale factor" -msgstr "crwdns7662:0crwdne7662:0" - -#: gui/src/options.cpp:5506 -msgid "Chart Object scale factor" -msgstr "crwdns7663:0crwdne7663:0" - -#: gui/src/options.cpp:5520 -msgid "Ship scale factor" -msgstr "crwdns10538:0crwdne10538:0" - -#: gui/src/options.cpp:5534 -msgid "ENC Sounding factor" -msgstr "crwdns20090:0crwdne20090:0" - -#: gui/src/options.cpp:5548 -msgid "ENC Text Scale" -msgstr "crwdns26699:0crwdne26699:0" - -#: gui/src/options.cpp:5558 -msgid "Mouse wheel zoom sensitivity" -msgstr "crwdns27345:0crwdne27345:0" - -#: gui/src/options.cpp:5809 -msgid "Apply" -msgstr "crwdns2780:0crwdne2780:0" - -#: gui/src/options.cpp:5818 -msgid "Charts" -msgstr "crwdns2782:0crwdne2782:0" - -#: gui/src/options.cpp:5841 -msgid "Connections" -msgstr "crwdns2781:0crwdne2781:0" - -#: gui/src/options.cpp:5843 -msgid "Connect" -msgstr "crwdns26701:0crwdne26701:0" - -#: gui/src/options.cpp:5855 -msgid "Ships" -msgstr "crwdns2783:0crwdne2783:0" - -#: gui/src/options.cpp:5864 -msgid "User Interface" -msgstr "crwdns2784:0crwdne2784:0" - -#: gui/src/options.cpp:5866 -msgid "User" -msgstr "crwdns26703:0crwdne26703:0" - -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 -msgid "Plugins" -msgstr "crwdns2785:0crwdne2785:0" - -#: gui/src/options.cpp:6057 -msgid "User set magnetic variation" -msgstr "crwdns9357:0crwdne9357:0" - -#: gui/src/options.cpp:6507 -msgid "feet" -msgstr "crwdns6610:0crwdne6610:0" - -#: gui/src/options.cpp:6507 -msgid "fathoms" -msgstr "crwdns6612:0crwdne6612:0" - -#: gui/src/options.cpp:6748 -msgid "Add a directory containing chart files" -msgstr "crwdns2786:0crwdne2786:0" - -#: gui/src/options.cpp:6854 -msgid "\n" -" - your ship's length must be > 0" -msgstr "crwdns2792:0crwdne2792:0" - -#: gui/src/options.cpp:6856 -msgid "\n" -" - your ship's beam must be > 0" -msgstr "crwdns2793:0crwdne2793:0" - -#: gui/src/options.cpp:6859 -msgid "\n" -" - your GPS offset from midship must be within your ship's beam" -msgstr "crwdns2794:0crwdne2794:0" - -#: gui/src/options.cpp:6863 -msgid "\n" -" - your GPS offset from bow must be within your ship's length" -msgstr "crwdns2795:0crwdne2795:0" - -#: gui/src/options.cpp:6865 -msgid "\n" -" - your minimum ship icon size must be between 1 and 100 mm" -msgstr "crwdns2796:0crwdne2796:0" - -#: gui/src/options.cpp:6867 -msgid "The settings for own ship real size are not correct:" -msgstr "crwdns2797:0crwdne2797:0" - -#: gui/src/options.cpp:7770 -msgid "The Inland ECDIS Manual is not available locally." -msgstr "crwdns26705:0crwdne26705:0" - -#: gui/src/options.cpp:7773 -msgid "Would you like to visit the iECDIS Manual website for more information?" -msgstr "crwdns26707:0crwdne26707:0" - -#: gui/src/options.cpp:7804 -msgid "Compression will alter chart files on disk.\n" -"This may make them incompatible with other programs or older versions of OpenCPN.\n" -"Compressed charts may take slightly longer to load and display on some systems.\n" -"They can be decompressed again using unxz or 7 zip programs." -msgstr "crwdns9249:0crwdne9249:0" - -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 -msgid "OpenCPN Compress Charts" -msgstr "crwdns9250:0crwdne9250:0" - -#: gui/src/options.cpp:7862 -msgid "No charts found to compress." -msgstr "crwdns9251:0crwdne9251:0" - -#: gui/src/options.cpp:7894 -#, c-format -msgid "compressed %ld charts\n" -"from %.1fMB to %.1fMB\n" -"saved %.1fMB (%.1f%%)" -msgstr "crwdns9252:0%ldcrwdnd9252:0%.1fcrwdnd9252:0%.1fcrwdnd9252:0%.1fcrwdnd9252:0%.1fcrwdne9252:0" - -#: gui/src/options.cpp:8798 -msgid "Enter Group Name" -msgstr "crwdns2800:0crwdne2800:0" - -#: gui/src/options.cpp:8798 -msgid "New Chart Group" -msgstr "crwdns2801:0crwdne2801:0" - -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 -msgid "Select Tide/Current Data" -msgstr "crwdns2802:0crwdne2802:0" - -#: gui/src/options.cpp:9043 -msgid "Texture Compression" -msgstr "crwdns2812:0crwdne2812:0" - -#: gui/src/options.cpp:9044 -msgid "Texture Compression with Caching" -msgstr "crwdns5924:0crwdne5924:0" - -#: gui/src/options.cpp:9046 -msgid "Texture Compression Caching" -msgstr "crwdns2813:0crwdne2813:0" - -#: gui/src/options.cpp:9048 -msgid "Texture Memory Size (MB)" -msgstr "crwdns2814:0crwdne2814:0" - -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 -msgid "Size: " -msgstr "crwdns8055:0crwdne8055:0" - -#: gui/src/options.cpp:9054 -msgid "Rebuild Texture Cache" -msgstr "crwdns5427:0crwdne5427:0" - -#: gui/src/options.cpp:9056 -msgid "Clear Texture Cache" -msgstr "crwdns5428:0crwdne5428:0" - -#: gui/src/options.cpp:9060 -msgid "Polygon Smoothing" -msgstr "crwdns10539:0crwdne10539:0" - -#: gui/src/options.cpp:9061 -msgid "Line Smoothing" -msgstr "crwdns10540:0crwdne10540:0" - -#: gui/src/options.cpp:9063 -msgid "Software OpenGL (restart OpenCPN)" -msgstr "crwdns8056:0crwdne8056:0" - -#: gui/src/options.cpp:9065 -msgid "Use Accelerated Panning" -msgstr "crwdns2811:0crwdne2811:0" - -#: gui/src/options.cpp:9067 -msgid "Texture Settings" -msgstr "crwdns8057:0crwdne8057:0" - -#: gui/src/options.cpp:9074 -msgid "Texture Cache" -msgstr "crwdns8058:0crwdne8058:0" - -#: gui/src/options.cpp:9081 -msgid "Miscellaneous" -msgstr "crwdns8059:0crwdne8059:0" - -#: gui/src/Osenc.cpp:1173 -msgid "S57 Cell Update failed.\n" -"ENC features may be incomplete or inaccurate.\n\n" -"Check the logfile for details." -msgstr "crwdns9700:0crwdne9700:0" - -#: gui/src/Osenc.cpp:1175 gui/src/Osenc.cpp:1183 gui/src/s57chart.cpp:3890 -msgid "OpenCPN Create SENC Warning" -msgstr "crwdns6644:0crwdne6644:0" - -#: gui/src/Osenc.cpp:1180 -msgid "S57 Cell Update failed.\n" -"No updates could be applied.\n" -"ENC features may be incomplete or inaccurate.\n\n" -"Check the logfile for details." -msgstr "crwdns10518:0crwdne10518:0" - -#: gui/src/Osenc.cpp:1677 -msgid "OpenCPN S57 SENC File Create..." -msgstr "crwdns2823:0crwdne2823:0" - -#: gui/src/pluginmanager.cpp:355 -msgid "Plugin is a standard system plugin" -msgstr "crwdns19732:0crwdne19732:0" - -#: gui/src/pluginmanager.cpp:357 -msgid "Plugin is managed by OpenCPN" -msgstr "crwdns19734:0crwdne19734:0" - -#: gui/src/pluginmanager.cpp:359 -msgid "Plugin is not managed by OpenCPN" -msgstr "crwdns19736:0crwdne19736:0" - -#: gui/src/pluginmanager.cpp:363 -msgid "Plugin status unknown" -msgstr "crwdns19738:0crwdne19738:0" - -#: gui/src/pluginmanager.cpp:365 -msgid "Update to managed Plugin is available" -msgstr "crwdns19740:0crwdne19740:0" - -#: gui/src/pluginmanager.cpp:367 -msgid "New managed Plugin installation available" -msgstr "crwdns19742:0crwdne19742:0" - -#: gui/src/pluginmanager.cpp:369 -msgid "Update to installed Plugin is available" -msgstr "crwdns19744:0crwdne19744:0" - -#: gui/src/pluginmanager.cpp:371 -msgid "Plugin is latest available" -msgstr "crwdns19746:0crwdne19746:0" - -#: gui/src/pluginmanager.cpp:622 -msgid "The plugin is not compatible with this version of OpenCPN, and will be uninstalled." -msgstr "crwdns19748:0crwdne19748:0" - -#: gui/src/pluginmanager.cpp:794 -msgid "successfully un-installed" -msgstr "crwdns19750:0crwdne19750:0" - -#: gui/src/pluginmanager.cpp:807 -msgid "Un-Installation complete" -msgstr "crwdns19752:0crwdne19752:0" - -#: gui/src/pluginmanager.cpp:1112 -msgid "Please check system log for more info." -msgstr "crwdns24778:0crwdne24778:0" - -#: gui/src/pluginmanager.cpp:1121 -msgid " successfully installed from cache" -msgstr "crwdns24780:0crwdne24780:0" - -#: gui/src/pluginmanager.cpp:3700 -msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." -msgstr "crwdns21305:0crwdne21305:0" - -#: gui/src/pluginmanager.cpp:3716 -msgid "Plugin Catalog" -msgstr "crwdns19754:0crwdne19754:0" - -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 -msgid "Update Plugin Catalog" -msgstr "crwdns19756:0crwdne19756:0" - -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 -msgid "Import plugin..." -msgstr "crwdns19760:0crwdne19760:0" - -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 -msgid "Settings..." -msgstr "crwdns21307:0crwdne21307:0" - -#: gui/src/pluginmanager.cpp:3754 -msgid "Disabled" -msgstr "crwdns21309:0crwdne21309:0" - -#: gui/src/pluginmanager.cpp:3779 -msgid "Update Plugin Catalog: master" -msgstr "crwdns24638:0crwdne24638:0" - -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 -msgid "OpenCPN Catalog update" -msgstr "crwdns19764:0crwdne19764:0" - -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 -msgid "Unable to copy catalog file" -msgstr "crwdns19766:0crwdne19766:0" - -#: gui/src/pluginmanager.cpp:3885 -msgid "Unable to copy catalog file to cache" -msgstr "crwdns19768:0crwdne19768:0" - -#: gui/src/pluginmanager.cpp:3916 -msgid "Catalog update successful" -msgstr "crwdns19770:0crwdne19770:0" - -#: gui/src/pluginmanager.cpp:3938 -msgid "Select tarball file" -msgstr "crwdns19772:0crwdne19772:0" - -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." -msgstr "crwdns29126:0crwdne29126:0" - -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 -msgid "OpenCPN Plugin Import Error" -msgstr "crwdns19776:0crwdne19776:0" - -#: gui/src/pluginmanager.cpp:3953 -msgid "Incompatible import plugin detected." -msgstr "crwdns19782:0crwdne19782:0" - -#: gui/src/pluginmanager.cpp:3961 -msgid "Error extracting import plugin tarball." -msgstr "crwdns19774:0crwdne19774:0" - -#: gui/src/pluginmanager.cpp:3976 -msgid "Plugin" -msgstr "crwdns29128:0crwdne29128:0" - -#: gui/src/pluginmanager.cpp:3977 -msgid " successfully imported" -msgstr "crwdns29130:0crwdne29130:0" - -#: gui/src/pluginmanager.cpp:3984 -msgid "Active Catalog" -msgstr "crwdns19794:0crwdne19794:0" - -#: gui/src/pluginmanager.cpp:3984 -msgid "Last Catalog" -msgstr "crwdns19796:0crwdne19796:0" - -#: gui/src/pluginmanager.cpp:3999 -msgid "Last change: " -msgstr "crwdns21313:0crwdne21313:0" - -#: gui/src/pluginmanager.cpp:4000 -msgid "Please Update Plugin Catalog." -msgstr "crwdns19800:0crwdne19800:0" - -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 -msgid "Uninstall" -msgstr "crwdns19804:0crwdne19804:0" - -#: gui/src/pluginmanager.cpp:4362 -msgid "Uninstall plugin " -msgstr "crwdns29132:0crwdne29132:0" - -#: gui/src/pluginmanager.cpp:4363 -msgid "Un-Installation" -msgstr "crwdns29134:0crwdne29134:0" - -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 -msgid "Enabled" -msgstr "crwdns19806:0crwdne19806:0" - -#: gui/src/pluginmanager.cpp:4738 -msgid "Upgrade to Version " -msgstr "crwdns20384:0crwdne20384:0" - -#: gui/src/pluginmanager.cpp:4745 -msgid "Install..." -msgstr "crwdns19810:0crwdne19810:0" - -#: gui/src/pluginmanager.cpp:4751 -msgid "Update to " -msgstr "crwdns19812:0crwdne19812:0" - -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 -msgid "Website" -msgstr "crwdns19818:0crwdne19818:0" - -#: gui/src/priority_gui.cpp:65 -msgid "Adjust Comm Priorities" -msgstr "crwdns27283:0crwdne27283:0" - -#: gui/src/priority_gui.cpp:77 -msgid "Priority List" -msgstr "crwdns27285:0crwdne27285:0" - -#: gui/src/priority_gui.cpp:94 gui/src/RoutePropDlgImpl.cpp:929 -msgid "Move Up" -msgstr "crwdns21335:0crwdne21335:0" - -#: gui/src/priority_gui.cpp:95 gui/src/RoutePropDlgImpl.cpp:931 -msgid "Move Down" -msgstr "crwdns21337:0crwdne21337:0" - -#: gui/src/priority_gui.cpp:104 -msgid "Refresh" -msgstr "crwdns27287:0crwdne27287:0" - -#: gui/src/priority_gui.cpp:218 -msgid "Priorities" -msgstr "crwdns27289:0crwdne27289:0" - -#: gui/src/priority_gui.cpp:225 -msgid "Speed/Course" -msgstr "crwdns27291:0crwdne27291:0" - -#: gui/src/priority_gui.cpp:233 -msgid "Mag Variation" -msgstr "crwdns27293:0crwdne27293:0" - -#: gui/src/priority_gui.cpp:237 -msgid "Satellites" -msgstr "crwdns27295:0crwdne27295:0" - -#: gui/src/rest_server_gui.cpp:51 gui/src/rest_server_gui.cpp:70 -#: gui/src/rest_server_gui.cpp:249 gui/src/SendToPeerDlg.cpp:127 -msgid "OpenCPN Server Message" -msgstr "crwdns27251:0crwdne27251:0" - -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "crwdns2939:0crwdne2939:0" - -#: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 -msgid "TideCurrentGraphRollover" -msgstr "crwdns2940:0crwdne2940:0" - -#: gui/src/route_gui.cpp:601 -msgid "Route Transmitted." -msgstr "crwdns27309:0crwdne27309:0" - -#: gui/src/route_gui.cpp:604 -msgid "Error on Route Upload. Garmin GPS not connected" -msgstr "crwdns27311:0crwdne27311:0" - -#: gui/src/route_gui.cpp:606 -msgid "Error on Route Upload. Please check logfiles..." -msgstr "crwdns27313:0crwdne27313:0" - -#: gui/src/routemanagerdialog.cpp:354 -msgid "Routes" -msgstr "crwdns2302:0crwdne2302:0" - -#: gui/src/routemanagerdialog.cpp:377 gui/src/routemanagerdialog.cpp:555 -#: gui/src/routemanagerdialog.cpp:699 gui/src/routemanagerdialog.cpp:893 -#: gui/src/TTYWindow.cpp:65 -msgid "Filter" -msgstr "crwdns8075:0crwdne8075:0" - -#: gui/src/routemanagerdialog.cpp:391 -msgid "Show all routes" -msgstr "crwdns21315:0crwdne21315:0" - -#: gui/src/routemanagerdialog.cpp:430 -msgid "Route Name" -msgstr "crwdns2304:0crwdne2304:0" - -#: gui/src/routemanagerdialog.cpp:432 -msgid "From <-> To" -msgstr "crwdns7653:0crwdne7653:0" - -#: gui/src/routemanagerdialog.cpp:449 gui/src/routemanagerdialog.cpp:639 -#: gui/src/routemanagerdialog.cpp:776 -msgid "&Properties" -msgstr "crwdns2318:0crwdne2318:0" - -#: gui/src/routemanagerdialog.cpp:457 -msgid "&Activate" -msgstr "crwdns2307:0crwdne2307:0" - -#: gui/src/routemanagerdialog.cpp:467 gui/src/routemanagerdialog.cpp:783 -msgid "&Center View" -msgstr "crwdns2308:0crwdne2308:0" - -#: gui/src/routemanagerdialog.cpp:476 -msgid "&Reverse" -msgstr "crwdns2309:0crwdne2309:0" - -#: gui/src/routemanagerdialog.cpp:482 gui/src/routemanagerdialog.cpp:646 -#: gui/src/routemanagerdialog.cpp:789 gui/src/routemanagerdialog.cpp:975 -msgid "&Delete" -msgstr "crwdns2310:0crwdne2310:0" - -#: gui/src/routemanagerdialog.cpp:488 -msgid "&Resequence Waypoints" -msgstr "crwdns24642:0crwdne24642:0" - -#: gui/src/routemanagerdialog.cpp:489 gui/src/routemanagerdialog.cpp:652 -#: gui/src/routemanagerdialog.cpp:801 -msgid "&Export selected..." -msgstr "crwdns2311:0crwdne2311:0" - -#: gui/src/routemanagerdialog.cpp:490 -msgid "&Send to GPS..." -msgstr "crwdns27477:0crwdne27477:0" - -#: gui/src/routemanagerdialog.cpp:491 -msgid "Send to &Peer..." -msgstr "crwdns27479:0crwdne27479:0" - -#: gui/src/routemanagerdialog.cpp:494 -msgid "Resequence" -msgstr "crwdns27481:0crwdne27481:0" - -#: gui/src/routemanagerdialog.cpp:495 gui/src/TrackPropDlg.cpp:990 -msgid "Export" -msgstr "crwdns2874:0crwdne2874:0" - -#: gui/src/routemanagerdialog.cpp:532 gui/src/routemanagerdialog.cpp:676 -msgid "&Delete All" -msgstr "crwdns2313:0crwdne2313:0" - -#: gui/src/routemanagerdialog.cpp:569 -msgid "Show all tracks" -msgstr "crwdns21317:0crwdne21317:0" - -#: gui/src/routemanagerdialog.cpp:613 -msgid "Track Name" -msgstr "crwdns2315:0crwdne2315:0" - -#: gui/src/routemanagerdialog.cpp:615 -msgid "Start Date" -msgstr "crwdns29232:0crwdne29232:0" - -#: gui/src/routemanagerdialog.cpp:617 -msgid "Length" -msgstr "crwdns2316:0crwdne2316:0" - -#: gui/src/routemanagerdialog.cpp:633 -msgid "&Start Track" -msgstr "crwdns2317:0crwdne2317:0" - -#: gui/src/routemanagerdialog.cpp:658 -msgid "Route from Track" -msgstr "crwdns2319:0crwdne2319:0" - -#: gui/src/routemanagerdialog.cpp:666 gui/src/routemanagerdialog.cpp:814 -msgid "Send to &Peer" -msgstr "crwdns26711:0crwdne26711:0" - -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "crwdns27315:0crwdne27315:0" - -#: gui/src/routemanagerdialog.cpp:714 -msgid "Show all marks" -msgstr "crwdns29234:0crwdne29234:0" - -#: gui/src/routemanagerdialog.cpp:752 -msgid "Mark Name" -msgstr "crwdns29236:0crwdne29236:0" - -#: gui/src/routemanagerdialog.cpp:754 -msgid "Distance from own ship" -msgstr "crwdns9254:0crwdne9254:0" - -#: gui/src/routemanagerdialog.cpp:770 -msgid "&New" -msgstr "crwdns2322:0crwdne2322:0" - -#: gui/src/routemanagerdialog.cpp:795 -msgid "&Go To" -msgstr "crwdns2323:0crwdne2323:0" - -#: gui/src/routemanagerdialog.cpp:807 -msgid "&Send to GPS" -msgstr "crwdns2312:0crwdne2312:0" - -#: gui/src/routemanagerdialog.cpp:824 -msgid "Delete All" -msgstr "crwdns2324:0crwdne2324:0" - -#: gui/src/routemanagerdialog.cpp:837 -msgid "I&mport GPX..." -msgstr "crwdns2325:0crwdne2325:0" - -#: gui/src/routemanagerdialog.cpp:849 -msgid "Export All Visible..." -msgstr "crwdns2326:0crwdne2326:0" - -#: gui/src/routemanagerdialog.cpp:882 -msgid "Layers" -msgstr "crwdns2327:0crwdne2327:0" - -#: gui/src/routemanagerdialog.cpp:907 -msgid "Show all layers" -msgstr "crwdns21321:0crwdne21321:0" - -#: gui/src/routemanagerdialog.cpp:943 -msgid "Layer Name" -msgstr "crwdns2328:0crwdne2328:0" - -#: gui/src/routemanagerdialog.cpp:945 -msgid "No. of items" -msgstr "crwdns2329:0crwdne2329:0" - -#: gui/src/routemanagerdialog.cpp:947 -msgid "Layer type" -msgstr "crwdns12448:0crwdne12448:0" - -#: gui/src/routemanagerdialog.cpp:963 -msgid "Create Temporary layer" -msgstr "crwdns12450:0crwdne12450:0" - -#: gui/src/routemanagerdialog.cpp:969 -msgid "Create Persistent layer" -msgstr "crwdns12452:0crwdne12452:0" - -#: gui/src/routemanagerdialog.cpp:989 -msgid "Show WPT names" -msgstr "crwdns2331:0crwdne2331:0" - -#: gui/src/routemanagerdialog.cpp:998 -msgid "List contents" -msgstr "crwdns2332:0crwdne2332:0" - -#: gui/src/routemanagerdialog.cpp:1277 gui/src/routemanagerdialog.cpp:1546 -msgid " - " -msgstr "crwdns2333:0crwdne2333:0" - -#: gui/src/routemanagerdialog.cpp:1403 gui/src/routemanagerdialog.cpp:2259 -#: gui/src/routemanagerdialog.cpp:2725 -msgid "Are you sure you want to delete the selected object(s)" -msgstr "crwdns2334:0crwdne2334:0" - -#: gui/src/routemanagerdialog.cpp:1447 -msgid "Are you sure you want to delete routes?" -msgstr "crwdns2336:0crwdne2336:0" - -#: gui/src/routemanagerdialog.cpp:1627 -msgid "Send Route(s) to OpenCPN Peer" -msgstr "crwdns26713:0crwdne26713:0" - -#: gui/src/routemanagerdialog.cpp:1667 -msgid "Send Waypoint(s) to OpenCPN Peer" -msgstr "crwdns26715:0crwdne26715:0" - -#: gui/src/routemanagerdialog.cpp:1707 -msgid "Send Track(s) to OpenCPN Peer" -msgstr "crwdns26717:0crwdne26717:0" - -#: gui/src/routemanagerdialog.cpp:1874 -msgid "&Merge Selected Tracks" -msgstr "crwdns2339:0crwdne2339:0" - -#: gui/src/routemanagerdialog.cpp:1876 -msgid "Reduce Data..." -msgstr "crwdns2340:0crwdne2340:0" - -#: gui/src/routemanagerdialog.cpp:1878 -msgid "&Copy as text" -msgstr "crwdns2341:0crwdne2341:0" - -#: gui/src/routemanagerdialog.cpp:1907 -msgid "Select the maximum error allowed (in meters)\n" -"after data reduction:" -msgstr "crwdns2342:0crwdne2342:0" - -#: gui/src/routemanagerdialog.cpp:1909 -msgid "Reduce Data Precision" -msgstr "crwdns2343:0crwdne2343:0" - -#: gui/src/routemanagerdialog.cpp:1947 -#, c-format -msgid "The amount of data used by the track\n" -" was reduced by %d%%." -msgstr "crwdns2344:0%dcrwdne2344:0" - -#: gui/src/routemanagerdialog.cpp:2045 -msgid "The currently running Track was not merged.\n" -"You can merge it later when it is completed." -msgstr "crwdns2346:0crwdne2346:0" - -#: gui/src/routemanagerdialog.cpp:2331 -msgid "OpenCPN Converting Track to Route...." -msgstr "crwdns2347:0crwdne2347:0" - -#: gui/src/routemanagerdialog.cpp:2332 -msgid "Processing Waypoints..." -msgstr "crwdns2348:0crwdne2348:0" - -#: gui/src/routemanagerdialog.cpp:2343 -msgid "Done." -msgstr "crwdns2349:0crwdne2349:0" - -#: gui/src/routemanagerdialog.cpp:2365 -msgid "Are you sure you want to delete tracks?" -msgstr "crwdns2350:0crwdne2350:0" - -#: gui/src/routemanagerdialog.cpp:2434 -msgid "Overruled" -msgstr "crwdns12454:0crwdne12454:0" - -#: gui/src/routemanagerdialog.cpp:2698 -#, c-format -msgid " (%lu points)" -msgstr "crwdns29136:0%lucrwdne29136:0" - -#: gui/src/routemanagerdialog.cpp:2756 -msgid "The waypoint you want to delete is used in a route, do you really want to delete it?" -msgstr "crwdns2351:0crwdne2351:0" - -#: gui/src/routemanagerdialog.cpp:2880 -msgid "Are you sure you want to delete waypoints?" -msgstr "crwdns2352:0crwdne2352:0" - -#: gui/src/routemanagerdialog.cpp:2885 -msgid "There are some waypoints used in routes or anchor alarms.\n" -" Do you want to delete them as well?\n" -" This will change the routes and disable the anchor alarms.\n" -" Answering No keeps the waypoints used in routes or alarms." -msgstr "crwdns2353:0crwdne2353:0" - -#: gui/src/routemanagerdialog.cpp:3048 -msgid "Are you sure you want to delete this layer and of its contents?" -msgstr "crwdns2357:0crwdne2357:0" - -#: gui/src/routemanagerdialog.cpp:3052 -msgid "The file will also be deleted from OpenCPN's layer directory." -msgstr "crwdns12456:0crwdne12456:0" - -#: gui/src/routemanagerdialog.cpp:3329 -msgid "(Unnamed Layer)" -msgstr "crwdns2358:0crwdne2358:0" - -#: gui/src/routeman_gui.cpp:71 -msgid "You are trying to delete an active AIS MOB route, are you REALLY sure?" -msgstr "crwdns6373:0crwdne6373:0" - -#: gui/src/route_point_gui.cpp:765 -msgid "The ScaMin value for new waypoints is set to" -msgstr "crwdns27323:0crwdne27323:0" - -#: gui/src/route_point_gui.cpp:766 -msgid "but current chartscale is" -msgstr "crwdns27325:0crwdne27325:0" - -#: gui/src/route_point_gui.cpp:768 -msgid "Therefore the new waypoint will not be visible at this zoom level." -msgstr "crwdns27327:0crwdne27327:0" - -#: gui/src/route_point_gui.cpp:906 -msgid "Waypoint(s) Transmitted." -msgstr "crwdns27317:0crwdne27317:0" - -#: gui/src/route_point_gui.cpp:909 -msgid "Error on Waypoint Upload. Garmin GPS not connected" -msgstr "crwdns27319:0crwdne27319:0" - -#: gui/src/route_point_gui.cpp:911 -msgid "Error on Waypoint Upload. Please check logfiles..." -msgstr "crwdns27321:0crwdne27321:0" - -#: gui/src/routeprintout.cpp:101 gui/src/RoutePropDlg.cpp:352 -#: gui/src/trackprintout.cpp:85 gui/src/TrackPropDlg.cpp:304 -msgid "Leg" -msgstr "crwdns2261:0crwdne2261:0" - -#: gui/src/routeprintout.cpp:104 -msgid "To Waypoint" -msgstr "crwdns2262:0crwdne2262:0" - -#: gui/src/routeprintout.cpp:355 gui/src/trackprintout.cpp:289 -msgid "Elements to print..." -msgstr "crwdns2850:0crwdne2850:0" - -#: gui/src/routeprintout.cpp:371 -msgid "Show Waypoint name." -msgstr "crwdns2851:0crwdne2851:0" - -#: gui/src/routeprintout.cpp:381 gui/src/trackprintout.cpp:303 -msgid "Show Waypoint position." -msgstr "crwdns2852:0crwdne2852:0" - -#: gui/src/routeprintout.cpp:392 gui/src/trackprintout.cpp:314 -msgid "Show course from each Waypoint to the next one. " -msgstr "crwdns2853:0crwdne2853:0" - -#: gui/src/routeprintout.cpp:404 gui/src/trackprintout.cpp:325 -msgid "Show Distance from each Waypoint to the next one." -msgstr "crwdns2854:0crwdne2854:0" - -#: gui/src/routeprintout.cpp:414 -msgid "Show Waypoint description." -msgstr "crwdns2855:0crwdne2855:0" - -#: gui/src/routeprintout.cpp:468 -msgid "Route Print" -msgstr "crwdns2856:0crwdne2856:0" - -#: gui/src/RoutePropDlg.cpp:116 gui/src/TrackPropDlg.cpp:693 -msgid "From" -msgstr "crwdns2857:0crwdne2857:0" - -#: gui/src/RoutePropDlg.cpp:125 gui/src/TrackPropDlg.cpp:702 -msgid "To" -msgstr "crwdns2305:0crwdne2305:0" - -#: gui/src/RoutePropDlg.cpp:164 -msgid "Plan speed" -msgstr "crwdns2279:0crwdne2279:0" - -#: gui/src/RoutePropDlg.cpp:183 -msgid "Enroute" -msgstr "crwdns12464:0crwdne12464:0" - -#: gui/src/RoutePropDlg.cpp:201 -msgid "Departure" -msgstr "crwdns12466:0crwdne12466:0" - -#: gui/src/RoutePropDlg.cpp:237 gui/src/trackprintout.cpp:97 -#: gui/src/trackprintout.cpp:330 -msgid "Time" -msgstr "crwdns12468:0crwdne12468:0" - -#: gui/src/RoutePropDlg.cpp:242 -msgid "Local@PC" -msgstr "crwdns12470:0crwdne12470:0" - -#: gui/src/RoutePropDlg.cpp:243 -msgid "LMT@Location" -msgstr "crwdns12472:0crwdne12472:0" - -#: gui/src/RoutePropDlg.cpp:302 gui/src/TrackPropDlg.cpp:516 -#: gui/src/TrackPropDlg.cpp:751 -msgid "Width" -msgstr "crwdns2861:0crwdne2861:0" - -#: gui/src/RoutePropDlg.cpp:308 -msgid "1 px" -msgstr "crwdns12474:0crwdne12474:0" - -#: gui/src/RoutePropDlg.cpp:308 -msgid "2px" -msgstr "crwdns12476:0crwdne12476:0" - -#: gui/src/RoutePropDlg.cpp:308 -msgid "3 px" -msgstr "crwdns12478:0crwdne12478:0" - -#: gui/src/RoutePropDlg.cpp:308 -msgid "4 px" -msgstr "crwdns12480:0crwdne12480:0" - -#: gui/src/RoutePropDlg.cpp:308 -msgid "5 px" -msgstr "crwdns12482:0crwdne12482:0" - -#: gui/src/RoutePropDlg.cpp:309 -msgid "6 px" -msgstr "crwdns12484:0crwdne12484:0" - -#: gui/src/RoutePropDlg.cpp:309 -msgid "7 px" -msgstr "crwdns12486:0crwdne12486:0" - -#: gui/src/RoutePropDlg.cpp:309 -msgid "8 px" -msgstr "crwdns12488:0crwdne12488:0" - -#: gui/src/RoutePropDlg.cpp:309 -msgid "9 px" -msgstr "crwdns12490:0crwdne12490:0" - -#: gui/src/RoutePropDlg.cpp:309 -msgid "10 px" -msgstr "crwdns12492:0crwdne12492:0" - -#: gui/src/RoutePropDlg.cpp:322 -msgid "To waypoint" -msgstr "crwdns12494:0crwdne12494:0" - -#: gui/src/RoutePropDlg.cpp:332 -msgid "To WP" -msgstr "crwdns21325:0crwdne21325:0" - -#: gui/src/RoutePropDlg.cpp:368 -msgid "Total Distance" -msgstr "crwdns21327:0crwdne21327:0" - -#: gui/src/RoutePropDlg.cpp:381 -msgid "ETE" -msgstr "crwdns2283:0crwdne2283:0" - -#: gui/src/RoutePropDlg.cpp:385 -msgid "ETA" -msgstr "crwdns2282:0crwdne2282:0" - -#: gui/src/RoutePropDlg.cpp:393 -msgid "Next tide event" -msgstr "crwdns2270:0crwdne2270:0" - -#: gui/src/RoutePropDlg.cpp:405 -msgid "ETD" -msgstr "crwdns12496:0crwdne12496:0" - -#: gui/src/RoutePropDlg.cpp:446 gui/src/TrackPropDlg.cpp:892 -msgid "wxFB Website" -msgstr "crwdns2292:0crwdne2292:0" - -#: gui/src/RoutePropDlg.cpp:490 gui/src/RoutePropDlgImpl.cpp:1353 -#: gui/src/TrackPropDlg.cpp:935 gui/src/TrackPropDlg.cpp:1640 -msgid "Links are opened in the default browser." -msgstr "crwdns2296:0crwdne2296:0" - -#: gui/src/RoutePropDlg.cpp:526 gui/src/TrackPropDlg.cpp:575 -#: gui/src/TrackPropDlg.cpp:965 -msgid "Print" -msgstr "crwdns2870:0crwdne2870:0" - -#: gui/src/RoutePropDlg.cpp:534 gui/src/TrackPropDlg.cpp:590 -msgid "Extend" -msgstr "crwdns2872:0crwdne2872:0" - -#: gui/src/RoutePropDlg.cpp:538 gui/src/TrackPropDlg.cpp:584 -#: gui/src/TrackPropDlg.cpp:974 -msgid "Split" -msgstr "crwdns2871:0crwdne2871:0" - -#: gui/src/RoutePropDlgImpl.cpp:89 -msgid "MoTwilight" -msgstr "crwdns2195:0crwdne2195:0" - -#: gui/src/RoutePropDlgImpl.cpp:91 -msgid "Sunrise" -msgstr "crwdns2196:0crwdne2196:0" - -#: gui/src/RoutePropDlgImpl.cpp:93 -msgid "Daytime" -msgstr "crwdns2197:0crwdne2197:0" - -#: gui/src/RoutePropDlgImpl.cpp:95 -msgid "Sunset" -msgstr "crwdns2198:0crwdne2198:0" - -#: gui/src/RoutePropDlgImpl.cpp:97 -msgid "EvTwilight" -msgstr "crwdns2199:0crwdne2199:0" - -#: gui/src/RoutePropDlgImpl.cpp:99 -msgid "Nighttime" -msgstr "crwdns2200:0crwdne2200:0" - -#: gui/src/RoutePropDlgImpl.cpp:407 -msgid "Arrived" -msgstr "crwdns12498:0crwdne12498:0" - -#: gui/src/RoutePropDlgImpl.cpp:804 gui/src/TrackPropDlg.cpp:353 -#: gui/src/TrackPropDlg.cpp:1348 -msgid "Depart From" -msgstr "crwdns2208:0crwdne2208:0" - -#: gui/src/RoutePropDlgImpl.cpp:806 gui/src/TrackPropDlg.cpp:391 -#: gui/src/TrackPropDlg.cpp:775 gui/src/TrackPropDlg.cpp:1350 -msgid "Total distance" -msgstr "crwdns2863:0crwdne2863:0" - -#: gui/src/RoutePropDlgImpl.cpp:807 -msgid "Speed (Kts)" -msgstr "crwdns2211:0crwdne2211:0" - -#: gui/src/RoutePropDlgImpl.cpp:809 gui/src/TrackPropDlg.cpp:1353 -msgid "Departure Time" -msgstr "crwdns8064:0crwdne8064:0" - -#: gui/src/RoutePropDlgImpl.cpp:811 gui/src/TrackPropDlg.cpp:794 -#: gui/src/TrackPropDlg.cpp:1355 -msgid "Time enroute" -msgstr "crwdns2864:0crwdne2864:0" - -#: gui/src/RoutePropDlgImpl.cpp:856 -msgid "Are you sure you want to move Up this waypoint?" -msgstr "crwdns21329:0crwdne21329:0" - -#: gui/src/RoutePropDlgImpl.cpp:857 -msgid "Are you sure you want to move Down this waypoint?" -msgstr "crwdns21331:0crwdne21331:0" - -#: gui/src/RoutePropDlgImpl.cpp:859 -msgid "OpenCPN Move Waypoint" -msgstr "crwdns21333:0crwdne21333:0" - -#: gui/src/RoutePropDlgImpl.cpp:893 -msgid "Are you sure you want to remove this waypoint?" -msgstr "crwdns2274:0crwdne2274:0" - -#: gui/src/RoutePropDlgImpl.cpp:894 -msgid "OpenCPN Remove Waypoint" -msgstr "crwdns2275:0crwdne2275:0" - -#: gui/src/RoutePropDlgImpl.cpp:969 gui/src/TrackPropDlg.cpp:1403 -msgid "&Copy all as text" -msgstr "crwdns2203:0crwdne2203:0" - -#: gui/src/RoutePropDlgImpl.cpp:1091 gui/src/TrackPropDlg.cpp:1294 -msgid "_plus" -msgstr "crwdns2206:0crwdne2206:0" - -#: gui/src/RoutePropDlgImpl.cpp:1166 -msgid "Invalid date/time!" -msgstr "crwdns12500:0crwdne12500:0" - -#: gui/src/RoutePropDlgImpl.cpp:1170 -msgid "Unknown station!" -msgstr "crwdns12502:0crwdne12502:0" - -#: gui/src/RoutePropDlgImpl.cpp:1185 -msgid "Unavailable: " -msgstr "crwdns21339:0crwdne21339:0" - -#: gui/src/RoutePropDlgImpl.cpp:1194 -msgid "Local" -msgstr "crwdns12562:0crwdne12562:0" - -#: gui/src/RoutePropDlgImpl.cpp:1351 gui/src/TrackPropDlg.cpp:1637 -msgid "Links are opened for editing." -msgstr "crwdns2301:0crwdne2301:0" - -#: gui/src/s57chart.cpp:3888 -msgid "S57 Cell Update chain incomplete.\n" -"ENC features may be incomplete or inaccurate.\n" -"Check the logfile for details." -msgstr "crwdns6643:0crwdne6643:0" - -#: gui/src/s57chart.cpp:5793 -msgid "this file is not available" -msgstr "crwdns12506:0crwdne12506:0" - -#: gui/src/s57chart.cpp:5824 -msgid "Period ends: " -msgstr "crwdns19820:0crwdne19820:0" - -#: gui/src/s57chart.cpp:5826 -msgid "Period starts: " -msgstr "crwdns19822:0crwdne19822:0" - -#: gui/src/s57chart.cpp:5828 -msgid "Date ending: " -msgstr "crwdns19824:0crwdne19824:0" - -#: gui/src/s57chart.cpp:5830 -msgid "Date starting: " -msgstr "crwdns19826:0crwdne19826:0" - -#: gui/src/s57chart.cpp:5939 -msgid "(Sector angles are True Bearings from Seaward)
" -msgstr "crwdns2824:0crwdne2824:0" - -#: gui/src/safe_mode_gui.cpp:20 -msgid "

The last opencpn run seems to have failed. Do you want to run\n" -"in safe mode without plugins and other possibly problematic\n" -"features?\n" -"



You may consider visiting the list of known issues.

" -msgstr "crwdns27475:0crwdne27475:0" - -#: gui/src/safe_mode_gui.cpp:38 -msgid "Safe restart" -msgstr "crwdns24784:0crwdne24784:0" - -#: gui/src/SencManager.cpp:157 gui/src/SencManager.cpp:189 -msgid "Preparing vector chart " -msgstr "crwdns24786:0crwdne24786:0" - -#: gui/src/SendToGpsDlg.cpp:102 -msgid "GPS/Plotter Port" -msgstr "crwdns8071:0crwdne8071:0" - -#: gui/src/SendToGpsDlg.cpp:187 -msgid "Prepare GPS for Route/Waypoint upload and press Send..." -msgstr "crwdns8072:0crwdne8072:0" - -#: gui/src/SendToGpsDlg.cpp:191 -msgid "Progress..." -msgstr "crwdns8073:0crwdne8073:0" - -#: gui/src/SendToPeerDlg.cpp:60 -msgid "Objects exists on server. OK to overwrite?" -msgstr "crwdns29138:0crwdne29138:0" - -#: gui/src/SendToPeerDlg.cpp:72 -msgid "Server HTTP response is :" -msgstr "crwdns29140:0crwdne29140:0" - -#: gui/src/SendToPeerDlg.cpp:74 -msgid "Curl transfer error: " -msgstr "crwdns29142:0crwdne29142:0" - -#: gui/src/SendToPeerDlg.cpp:84 -msgid "Server internal error response:" -msgstr "crwdns29144:0crwdne29144:0" - -#: gui/src/SendToPeerDlg.cpp:92 -msgid "Transfer successfully completed" -msgstr "crwdns29146:0crwdne29146:0" - -#: gui/src/SendToPeerDlg.cpp:99 -msgid "Cannot parse server reply" -msgstr "crwdns29148:0crwdne29148:0" - -#: gui/src/SendToPeerDlg.cpp:106 -msgid "Pincode not accepted" -msgstr "crwdns29150:0crwdne29150:0" - -#: gui/src/SendToPeerDlg.cpp:113 -msgid "Server does not support activation" -msgstr "crwdns29152:0crwdne29152:0" - -#: gui/src/SendToPeerDlg.cpp:131 -msgid "A server pin is needed.\n" -"Please enter PIN number from server to pair with this device" -msgstr "crwdns29154:0crwdne29154:0" - -#: gui/src/SendToPeerDlg.cpp:231 -msgid "Detected OpenCPN peer instances" -msgstr "crwdns27329:0crwdne27329:0" - -#: gui/src/SendToPeerDlg.cpp:258 -msgid "Scan again" -msgstr "crwdns27331:0crwdne27331:0" - -#: gui/src/SendToPeerDlg.cpp:269 -msgid "Activate after transfer" -msgstr "crwdns29156:0crwdne29156:0" - -#: gui/src/tcmgr.cpp:684 -msgid "It seems you have no tide/current harmonic data installed." -msgstr "crwdns5922:0crwdne5922:0" - -#: gui/src/TCWin.cpp:86 -msgid "Tide" -msgstr "crwdns6178:0crwdne6178:0" - -#: gui/src/TCWin.cpp:128 -msgid "Prev" -msgstr "crwdns6180:0crwdne6180:0" - -#: gui/src/TCWin.cpp:144 -msgid "Next" -msgstr "crwdns6181:0crwdne6181:0" - -#: gui/src/TCWin.cpp:147 -msgid "LMT@Station" -msgstr "crwdns21341:0crwdne21341:0" - -#: gui/src/TCWin.cpp:254 -msgid "Reference Station :" -msgstr "crwdns6182:0crwdne6182:0" - -#: gui/src/TCWin.cpp:268 -msgid "Data Source :" -msgstr "crwdns6183:0crwdne6183:0" - -#: gui/src/TCWin.cpp:668 -msgid "HW" -msgstr "crwdns6184:0crwdne6184:0" - -#: gui/src/TCWin.cpp:668 -msgid "LW" -msgstr "crwdns6185:0crwdne6185:0" - -#: gui/src/TCWin.cpp:876 -msgid "Today" -msgstr "crwdns6186:0crwdne6186:0" - -#: gui/src/TCWin.cpp:878 gui/src/TCWin.cpp:883 -msgid "Tomorrow" -msgstr "crwdns6187:0crwdne6187:0" - -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 -msgid "ToolTips" -msgstr "crwdns2833:0crwdne2833:0" - -#: gui/src/toolbar.cpp:2305 -msgid "No, I don't want to hide it." -msgstr "crwdns2835:0crwdne2835:0" - -#: gui/src/toolbar.cpp:2309 -msgid "No, and permanently remove the option to hide it." -msgstr "crwdns2836:0crwdne2836:0" - -#: gui/src/toolbar.cpp:2313 -msgid "Yes, hide it." -msgstr "crwdns2837:0crwdne2837:0" - -#: gui/src/toolbar.cpp:2320 -msgid "The Man Over Board button could be an important safety feature.\n" -"Are you sure you want to hide it?" -msgstr "crwdns2838:0crwdne2838:0" - -#: gui/src/toolbar.cpp:2407 -msgid "Choose Toolbar Icons" -msgstr "crwdns8074:0crwdne8074:0" - -#: gui/src/trackprintout.cpp:335 -msgid "Show Time." -msgstr "crwdns24788:0crwdne24788:0" - -#: gui/src/trackprintout.cpp:344 -msgid "Show Speed." -msgstr "crwdns24790:0crwdne24790:0" - -#: gui/src/trackprintout.cpp:400 -msgid "Track Print" -msgstr "crwdns24792:0crwdne24792:0" - -#: gui/src/TrackPropDlg.cpp:310 -msgid "Timestamp" -msgstr "crwdns2868:0crwdne2868:0" - -#: gui/src/TrackPropDlg.cpp:405 gui/src/TrackPropDlg.cpp:785 -msgid "Avg. speed" -msgstr "crwdns2276:0crwdne2276:0" - -#: gui/src/TrackPropDlg.cpp:418 -msgid "Time Enroute" -msgstr "crwdns2213:0crwdne2213:0" - -#: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:460 -#: gui/src/TrackPropDlg.cpp:824 -msgid "Local @ PC" -msgstr "crwdns2217:0crwdne2217:0" - -#: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:466 -msgid "LMT @ Location" -msgstr "crwdns2218:0crwdne2218:0" - -#: gui/src/TrackPropDlg.cpp:449 gui/src/TrackPropDlg.cpp:814 -msgid "Time shown as" -msgstr "crwdns2866:0crwdne2866:0" - -#: gui/src/TrackPropDlg.cpp:520 gui/src/TrackPropDlg.cpp:756 -msgid "1 pixel" -msgstr "crwdns2246:0crwdne2246:0" - -#: gui/src/TrackPropDlg.cpp:520 gui/src/TrackPropDlg.cpp:756 -msgid "2 pixels" -msgstr "crwdns2247:0crwdne2247:0" - -#: gui/src/TrackPropDlg.cpp:521 gui/src/TrackPropDlg.cpp:757 -msgid "3 pixels" -msgstr "crwdns2248:0crwdne2248:0" - -#: gui/src/TrackPropDlg.cpp:521 gui/src/TrackPropDlg.cpp:757 -msgid "4 pixels" -msgstr "crwdns2249:0crwdne2249:0" - -#: gui/src/TrackPropDlg.cpp:521 gui/src/TrackPropDlg.cpp:757 -msgid "5 pixels" -msgstr "crwdns2250:0crwdne2250:0" - -#: gui/src/TrackPropDlg.cpp:522 gui/src/TrackPropDlg.cpp:758 -msgid "6 pixels" -msgstr "crwdns2251:0crwdne2251:0" - -#: gui/src/TrackPropDlg.cpp:522 gui/src/TrackPropDlg.cpp:758 -msgid "7 pixels" -msgstr "crwdns2252:0crwdne2252:0" - -#: gui/src/TrackPropDlg.cpp:522 gui/src/TrackPropDlg.cpp:758 -msgid "8 pixels" -msgstr "crwdns2253:0crwdne2253:0" - -#: gui/src/TrackPropDlg.cpp:523 gui/src/TrackPropDlg.cpp:759 -msgid "9 pixels" -msgstr "crwdns2254:0crwdne2254:0" - -#: gui/src/TrackPropDlg.cpp:523 gui/src/TrackPropDlg.cpp:759 -msgid "10 pixels" -msgstr "crwdns2255:0crwdne2255:0" - -#: gui/src/TrackPropDlg.cpp:533 -msgid "Waypoints" -msgstr "crwdns2256:0crwdne2256:0" - -#: gui/src/TrackPropDlg.cpp:595 gui/src/TrackPropDlg.cpp:985 -msgid "To route" -msgstr "crwdns2873:0crwdne2873:0" - -#: gui/src/TrackPropDlg.cpp:713 -msgid "Display parameters" -msgstr "crwdns2858:0crwdne2858:0" - -#: gui/src/TrackPropDlg.cpp:768 -msgid "Statistics" -msgstr "crwdns2862:0crwdne2862:0" - -#: gui/src/TrackPropDlg.cpp:808 -msgid "Recorded points" -msgstr "crwdns2865:0crwdne2865:0" - -#: gui/src/TrackPropDlg.cpp:830 -msgid "LMT @ Track Start" -msgstr "crwdns2867:0crwdne2867:0" - -#: gui/src/TrackPropDlg.cpp:980 -msgid "Extend track" -msgstr "crwdns12508:0crwdne12508:0" - -#: gui/src/TrackPropDlg.cpp:1353 -msgid "(m/d/y h:m)" -msgstr "crwdns9255:0crwdne9255:0" - -#: gui/src/TrackPropDlg.cpp:1457 -msgid "track" -msgstr "crwdns2879:0crwdne2879:0" - -#: gui/src/TrackPropDlg.cpp:1866 -msgid "--" -msgstr "crwdns2880:0crwdne2880:0" - -#: gui/src/TTYWindow.cpp:73 -msgid "Legend" -msgstr "crwdns6323:0crwdne6323:0" - -#: gui/src/TTYWindow.cpp:84 gui/src/TTYWindow.cpp:181 -msgid "Pause" -msgstr "crwdns6324:0crwdne6324:0" - -#: gui/src/TTYWindow.cpp:88 -msgid "Copy NMEA Debug window to clipboard." -msgstr "crwdns12510:0crwdne12510:0" - -#: gui/src/TTYWindow.cpp:137 -msgid "Message accepted" -msgstr "crwdns6325:0crwdne6325:0" - -#: gui/src/TTYWindow.cpp:145 -msgid "Input message filtered, output message filtered and dropped" -msgstr "crwdns6326:0crwdne6326:0" - -#: gui/src/TTYWindow.cpp:153 -msgid "Input Message filtered and dropped" -msgstr "crwdns6327:0crwdne6327:0" - -#: gui/src/TTYWindow.cpp:160 -msgid "Output Message" -msgstr "crwdns6328:0crwdne6328:0" - -#: gui/src/TTYWindow.cpp:167 -msgid "Information Message or Message with errors" -msgstr "crwdns6329:0crwdne6329:0" - -#: gui/src/TTYWindow.cpp:176 -msgid "Resume" -msgstr "crwdns6330:0crwdne6330:0" - -#: gui/src/udev_rule_mgr.cpp:65 -msgid "\n" -"An OpenCPN dongle is detected but cannot be used due to missing permissions.\n\n" -"This problem can be fixed by installing a udev rules file. Once installed,\n" -"it will ensure that the dongle permissions are OK.\n" -msgstr "crwdns27417:0crwdne27417:0" - -#: gui/src/udev_rule_mgr.cpp:72 -msgid "\n\n" -"On flatpak, this must be done using the manual command instructions below\n" -msgstr "crwdns27419:0crwdne27419:0" - -#: gui/src/udev_rule_mgr.cpp:77 -msgid "\n" -"The device @DEVICE@ exists but cannot be used due to missing permissions.\n\n" -"This problem can be fixed by installing a udev rules file. Once installed,\n" -"the rules file will fix the permissions problem.\n" -msgstr "crwdns29238:0crwdne29238:0" - -#: gui/src/udev_rule_mgr.cpp:84 -msgid "\n\n" -"It will also create a new device called @SYMLINK@. It is recommended to use\n" -"@SYMLINK@ instead of @DEVICE@ to avoid problems with changing device names,\n" -"in particular on laptops.\n" -msgstr "crwdns29240:0crwdne29240:0" - -#: gui/src/udev_rule_mgr.cpp:92 -msgid "Do not show this dialog next time" -msgstr "crwdns27423:0crwdne27423:0" - -#: gui/src/udev_rule_mgr.cpp:94 -msgid "\n" -"Rule successfully installed. To activate the new rule restart the system.\n" -msgstr "crwdns29242:0crwdne29242:0" - -#: gui/src/udev_rule_mgr.cpp:98 -msgid "\n" -"Rule successfully installed. To activate the new rule restart system or:\n" -"- Exit opencpn.\n" -"- Unplug and re-insert the USB device.\n" -"- Restart opencpn\n" -msgstr "crwdns29244:0crwdne29244:0" - -#: gui/src/udev_rule_mgr.cpp:105 -msgid "\n" -"To do after installing the rule according to instructions:\n" -"- Exit opencpn.\n" -"- Unplug and re-insert the USB device.\n" -"- Restart opencpn\n" -msgstr "crwdns27427:0crwdne27427:0" - -#: gui/src/udev_rule_mgr.cpp:113 -msgid "The device @device@ can not be found (disconnected?)" -msgstr "crwdns27429:0crwdne27429:0" - -#: gui/src/udev_rule_mgr.cpp:148 -msgid "Opencpn: device not found" -msgstr "crwdns29246:0crwdne29246:0" - -#: gui/src/udev_rule_mgr.cpp:261 -msgid "Manual command line instructions" -msgstr "crwdns27431:0crwdne27431:0" - -#: gui/src/udev_rule_mgr.cpp:298 -msgid "Review rule" -msgstr "crwdns27433:0crwdne27433:0" - -#: gui/src/udev_rule_mgr.cpp:365 -msgid "Install rule" -msgstr "crwdns27435:0crwdne27435:0" - -#: gui/src/udev_rule_mgr.cpp:370 -msgid "Quit" -msgstr "crwdns27437:0crwdne27437:0" - -#: gui/src/udev_rule_mgr.cpp:395 -msgid "Errors encountered installing rule." -msgstr "crwdns27439:0crwdne27439:0" - -#: gui/src/udev_rule_mgr.cpp:415 -msgid "Manage dongle udev rule" -msgstr "crwdns27441:0crwdne27441:0" - -#: gui/src/udev_rule_mgr.cpp:461 -msgid "Manage device udev rule" -msgstr "crwdns27443:0crwdne27443:0" - -#: gui/src/undo.cpp:81 -msgid "Create Mark" -msgstr "crwdns29248:0crwdne29248:0" - -#: gui/src/undo.cpp:84 -msgid "Delete Mark" -msgstr "crwdns29250:0crwdne29250:0" - -#: gui/src/undo.cpp:87 -msgid "Move Waypoint" -msgstr "crwdns2847:0crwdne2847:0" - -#: gui/src/update_mgr.cpp:420 -msgid "Dismiss" -msgstr "crwdns24794:0crwdne24794:0" - -#: gui/src/initwiz/wiz_ui.cpp:69 -msgid "Select the units and data formats you would like to use." -msgstr "crwdns29282:0crwdne29282:0" - -#: gui/src/initwiz/wiz_ui.cpp:73 -msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " -msgstr "crwdns29284:0crwdne29284:0" - -#: gui/src/initwiz/wiz_ui.cpp:76 -msgid " icon in the main Toolbar." -msgstr "crwdns29286:0crwdne29286:0" - -#: gui/src/initwiz/wiz_ui.cpp:82 -msgid "If you already have charts on your system, you may add them here." -msgstr "crwdns29288:0crwdne29288:0" - -#: gui/src/initwiz/wiz_ui.cpp:85 -msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." -msgstr "crwdns29290:0crwdne29290:0" - -#: gui/src/initwiz/wiz_ui.cpp:90 -msgid "To access the Chart Downloader click on the " -msgstr "crwdns29292:0crwdne29292:0" - -#: gui/src/initwiz/wiz_ui.cpp:93 -msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." -msgstr "crwdns29294:0crwdne29294:0" - -#: gui/src/initwiz/wiz_ui.cpp:97 -msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" -msgstr "crwdns29296:0crwdne29296:0" - -#: gui/src/initwiz/wiz_ui.cpp:345 -#, c-format -msgid "NMEA0183: UDP port %d" -msgstr "crwdns29298:0%dcrwdne29298:0" - -#: gui/src/initwiz/wiz_ui.cpp:356 -#, c-format -msgid "NMEA2000: UDP port %d" -msgstr "crwdns29300:0%dcrwdne29300:0" - -#: gui/src/initwiz/wiz_ui.cpp:444 -#, c-format -msgid "NMEA0183: %s TCP port %d" -msgstr "crwdns29302:0%scrwdnd29302:0%dcrwdne29302:0" - -#: gui/src/initwiz/wiz_ui.cpp:456 -#, c-format -msgid "NMEA2000: %s TCP port %d" -msgstr "crwdns29304:0%scrwdnd29304:0%dcrwdne29304:0" - -#: gui/src/initwiz/wiz_ui.cpp:493 -#, c-format -msgid "GPSd: %s TCP port %d" -msgstr "crwdns29306:0%scrwdnd29306:0%dcrwdne29306:0" - -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." -msgstr "crwdns29308:0crwdne29308:0" - -#: gui/src/initwiz/wiz_ui.cpp:512 -msgid "Scanning USB devices..." -msgstr "crwdns29310:0crwdne29310:0" - -#: gui/src/initwiz/wiz_ui.cpp:516 -msgid "Looking for UDP data feeds..." -msgstr "crwdns29312:0crwdne29312:0" - -#: gui/src/initwiz/wiz_ui.cpp:520 -msgid "Looking for TCP servers..." -msgstr "crwdns29314:0crwdne29314:0" - -#: gui/src/initwiz/wiz_ui.cpp:524 -msgid "Looking for CAN interfaces..." -msgstr "crwdns29316:0crwdne29316:0" - -#: gui/src/initwiz/wiz_ui.cpp:528 -msgid "Looking for GPSD servers..." -msgstr "crwdns29318:0crwdne29318:0" - -#: gui/src/initwiz/wiz_ui.cpp:541 -#, c-format -msgid "SignalK: %s (%s port %d)" -msgstr "crwdns29320:0%scrwdnd29320:0%scrwdnd29320:0%dcrwdne29320:0" - -#: gui/src/initwiz/wiz_ui.cpp:555 -msgid "The system has been scanned for sources of navigation data." -msgstr "crwdns29322:0crwdne29322:0" - -#: gui/src/initwiz/wiz_ui.cpp:558 -msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." -msgstr "crwdns29324:0crwdne29324:0" - -#: gui/src/initwiz/wiz_ui.cpp:562 -msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." -msgstr "crwdns29326:0crwdne29326:0" - -#: gui/src/initwiz/wiz_ui.cpp:567 -msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " -msgstr "crwdns29328:0crwdne29328:0" - -#: gui/src/initwiz/wiz_ui.cpp:571 -msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." -msgstr "crwdns29330:0crwdne29330:0" - -#: gui/src/initwiz/wiz_ui.cpp:578 -msgid "Select a directory containing charts" -msgstr "crwdns29332:0crwdne29332:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:25 -msgid "Units and formats" -msgstr "crwdns29334:0crwdne29334:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:78 -msgid "Degrees, decimal minutes (DD MM.MM)" -msgstr "crwdns29336:0crwdne29336:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:78 -msgid "Decimal degrees (DD.DDDDD)" -msgstr "crwdns29338:0crwdne29338:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:78 -msgid "Degrees, minutes, seconds (DD MM SS)" -msgstr "crwdns29340:0crwdne29340:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:87 -msgid "Show true headings and bearings" -msgstr "crwdns29342:0crwdne29342:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:94 -msgid "Show magnetic headings and bearings" -msgstr "crwdns29344:0crwdne29344:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:118 -msgid "Detected navigation data sources:" -msgstr "crwdns29346:0crwdne29346:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:126 -msgid "Rescan..." -msgstr "crwdns29348:0crwdne29348:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:145 -msgid "Add existing charts" -msgstr "crwdns29350:0crwdne29350:0" - -#: gui/src/initwiz/wiz_ui_proto.cpp:152 -msgid "Add chart directory..." -msgstr "crwdns29352:0crwdne29352:0" - diff --git a/po/opencpn_es_ES.po b/po/opencpn_es_ES.po index 7c9527f032..dd00a84794 100644 --- a/po/opencpn_es_ES.po +++ b/po/opencpn_es_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Derrota sin nombre)" @@ -414,7 +414,7 @@ msgstr "Aeronave SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Ultimo Conocido)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posición" @@ -509,11 +509,11 @@ msgstr "Derecha" msgid "Left" msgstr "Izquierda" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Velocidad" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitud" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Velocidad del viento" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Ayuda a la Navegación" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "Waypoints serán renombrados para reflejar el orden natural, los nombres "¿Quieres renombrar los waypoints?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Acerca de OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "¿Sobrescribir la ruta número 1 del dispositivo Garmin?" msgid "OpenCPN Message" msgstr "Mensaje OpenCPN" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opciones" @@ -2543,7 +2543,7 @@ msgstr "Imprimir Derrota Seleccionada" msgid "Track properties" msgstr "Propiedades Derrota" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "Configuración inicial de OpenCPN" @@ -2556,12 +2556,12 @@ msgstr "Configuración inicial de OpenCPN" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "Plugin API: " msgid "OpenCPN Website" msgstr "Sitio web OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "La documentación de ayuda OpenCPN no está disponible localmente." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "¿Le gustaría visitar el sitio web opencpn.org para obtener más información?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Anulación - de áreaa cancelada siguiendo el Identificador de mensaje" msgid "Undefined (default)" msgstr "Sin definir (por defecto)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nombre Blanco AIS" @@ -3089,7 +3089,7 @@ msgstr "\n" "Por lo tanto, se reiniciará una grabación de pista persistente para este objetivo.\n\n" "¿Quieres detener el seguimiento persistente para este objetivo?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Alerta AIS" @@ -3105,7 +3105,7 @@ msgstr "&Silenciar Alerta" msgid "&Jump To" msgstr "&Ir a" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Crear Waypoint" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Lista Blancos AIS" @@ -3217,38 +3217,38 @@ msgstr "Recuento Blancos" msgid "Undock Target List" msgstr "Desacoplar lista de Blancos" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Grabar derrota" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "La derrota de ese blanco ha sido grabada.\n" "¿Quiere continuar grabando hasta el final de la sesión de OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Consulta Blanco AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Parar Dejar Derrota" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menú" @@ -3302,7 +3302,7 @@ msgstr "Mover Barco Aquí" msgid "Navigate To Here" msgstr "Navegar hasta Aquí" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Modo Rumbo hacia arriba" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Modo de rumbo arriba" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Modo Norte Arriba" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Modo Carta hacia arriba" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Alternar pantalla completa" @@ -3346,7 +3346,7 @@ msgstr "Pegar Derrota" msgid "CM93 Offset Dialog..." msgstr "Diálogo Compensación CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Grupos de Cartas" @@ -3464,7 +3464,7 @@ msgstr "Copiar como KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Eliminar" @@ -3618,18 +3618,18 @@ msgstr "Enviar derrota a instancia de OpenCPN" msgid "Chart Panel Options" msgstr "Opciones del panel de cartas" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Modo de navegación" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Norte Arriba" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Rumbo Arriba" @@ -3637,32 +3637,32 @@ msgstr "Rumbo Arriba" msgid "Heading Up" msgstr "Rumbo arriba" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Modo ir Adelantado" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Opciones Visualización" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Activar Continuidad Cartas" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Mostrar Cuadrícula" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Mostrar Contorno Cartas" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Mostrar Unidades Profundidad" @@ -3682,7 +3682,7 @@ msgstr "Mareas y corrientes" msgid "Show Tide stations" msgstr "Mostrar las estaciones de marea" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Mostrar Corrientes" @@ -3698,8 +3698,8 @@ msgstr "Mostrar Texto" msgid "Show depths" msgstr "Mostrar sondas" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Etiquetas Boyas/Luces" @@ -3707,8 +3707,8 @@ msgstr "Etiquetas Boyas/Luces" msgid "Lights" msgstr "Luces" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Descripciones Luces" @@ -3724,18 +3724,18 @@ msgstr "Mostrar luces de sector visibles" msgid "Show chart data quality" msgstr "Mostrar calidad de datos cartográficos" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Mostrar Categoría" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Estándar" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Todo" @@ -3780,7 +3780,7 @@ msgstr "Usar como catálogo activo" msgid "Latest available catalog:" msgstr "Último catálogo disponible:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "No se pueden descargar datos de la url" @@ -3835,8 +3835,8 @@ msgstr "Fallo: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Contestar \"No\" creará todos los waypoint nuevos para esta ruta." msgid "Merge waypoints?" msgstr "¿Unir waypoints?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Cartel de info Ruta/Etapa" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile requiere que OpenGL esté activado" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Pies" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metros" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Brazas" @@ -4197,7 +4197,7 @@ msgstr "Brazas" msgid "OverZoom" msgstr "Zoom excesivo" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Icono altura de Marea" @@ -4213,7 +4213,7 @@ msgstr "Consulta Blanco AIS" msgid "Show all AIS Targets" msgstr "Mostrar todos los blancos AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Atenuar blancos AIS menos críticos" @@ -4261,9 +4261,9 @@ msgstr "Compensación Usuario X" msgid "User Y Offset" msgstr "Compensación Usuario Y" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metros" @@ -4274,11 +4274,13 @@ msgstr "Esta Etapa" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Leyenda Consola" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Valor Consola" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Título" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Menos" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Editar conexión seleccionada" @@ -4637,12 +4639,12 @@ msgstr "Si activa esa entrada, aplique un filtro en ambas conexiones para evitar msgid "Or consider using a different data port for one of them" msgstr "O considera usar un puerto de datos diferente para uno de ellos" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Alarma OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Información OpenCPN" @@ -4651,17 +4653,17 @@ msgstr "Información OpenCPN" msgid "Sentence Filter" msgstr "Filtro Sentencia" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Seleccionar Todo" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Borrar Todo" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Añadir" @@ -4692,59 +4694,59 @@ msgstr "Una sentencia NMEA tiene generalmente una longitud de 3 caracteres (como msgid "REGEX syntax error: \n" msgstr "Error de sintaxis REGEX: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "General" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filtrar datos NMEA Rumbo y Velocidad" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Periodo Filltro (seg.)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Mostrar ventana depuración NMEA" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Formato subida para Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Usar modo Garmin (host) para subidas" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "Usar demoras magnéticas en sentencias salida APB" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "ID del Aparato NMEA0183" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Ajustar prioridades de comunicación..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "ID del Aparato NMEA0183" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Conexiones de Datos" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "Añadir conexión" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "Editar Conexión..." -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Eliminar Conexión" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Configurar nueva conexión" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Instalar" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Reinstalar" @@ -4810,7 +4812,7 @@ msgstr "Reinstalar" msgid "Update" msgstr "Actualizar" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Desactualizar" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr " Se ha instalado correctamente" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Instalación terminada" @@ -4848,6 +4850,21 @@ msgstr "Instalación terminada" msgid "Installation error" msgstr "Error de instalación" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Marcas" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Cartel AIS" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "Textos de carta" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "Texto Cuadricula" @@ -4860,7 +4877,7 @@ msgstr "Esperando la resolución de la compresión de la carta raster." msgid "OpenCPN Compressed Cache Update" msgstr "Actualizar cacheé comprimido OpenCPN" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distancia a nuestro barco: %4.0f NMi" @@ -4993,7 +5010,7 @@ msgstr "Esta marca es parte de una capa y no se puede editar" msgid "Icon" msgstr "Icono" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "¡Combo!" @@ -5003,7 +5020,7 @@ msgid "Links" msgstr "Enlaces" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5044,22 +5061,22 @@ msgstr "Anillos de distancia" msgid "Number" msgstr "Número" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distancia" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Color" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Ninguno" @@ -5149,16 +5166,16 @@ msgstr "Mostrar sólo a escala" msgid "Tide Station not found" msgstr "Estación de mareas no encontrada" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Definir escala" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Escala Carta" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Persistente" @@ -5190,35 +5207,35 @@ msgstr "Ventana de depuración NMEA" msgid "Cannot load route or waypoint file: " msgstr "No se puede cargar ruta o archivo waypoint: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Fallo al iniciar la interfaz de usuario." -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN no puede iniciarse." -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "No se encontraron los ficheros de configuración necesarios." -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Ver archivo log en" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " para detalles." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Portable(-p) ejecutando desde " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Recuperando ajuste inicial Directorio Cartas desde Registro de Windows" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN Inicializado en %ld ms." @@ -5273,8 +5290,8 @@ msgstr "Tiempo estimado : " msgid "Remaining time : " msgstr "Tiempo restante : " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "Actualizar Cartas OpenCPN" @@ -5282,277 +5299,277 @@ msgstr "Actualizar Cartas OpenCPN" msgid "Anchorage created " msgstr "Fondeadero creado" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Mostrar barra de herramientas" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Ocultar Barra de Herramientas" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "HOMBRE AL AGUA" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " a " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " en " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 NM a lo lo largo de COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Ruta Temporal Hombre al Agua" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Supuesto Punto de 1 Milla" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Hora: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Posición: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Desactivar Dejar Derrota" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Activar Dejar Derrota" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Autoseguimiento" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Modo de rumbo arriba" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Zoom Mayor" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Zoom Menor" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Carta de Escala Mayor" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Carta de Escala Menor" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Salir de OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Navegar" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Mostrar Barra de Cartas" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Mostrar Texto ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Mostrar luces de cartas ENC" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Mostrar sondas de cartas ENC" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Mostrar datos de fondeo de cartas ENC" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Mostrar Calidad de Datos ENC" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Mostrar OpenCPN Navobjects" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Mostrar Mareas" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Cambiar Esquema Color" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Vista" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Mostrar blancos AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Ocultar blancos amarrados" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Mostrar derrotas de blancos AIS" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Mostrar Diálogos Alarmas CPA" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Sonidos Alarmas CPA" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Mostrar advertencias CPA" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Medir Distancia" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Gestor Rutas y Marcas..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Crear Ruta" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Dejar Marca donde Barco" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Dejar Marca en Cursor" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Poner Marca MOB" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preferencias" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Herramientas" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Ventana" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Ayuda OpenCPN" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Ayuda" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Reinicie OpenCPN para activar cambios de idioma o estilo." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Barco" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Modo rotado" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Hubo un problema imprimiendo.\n" "Puede que su impresora no esté correctamente configurada" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Ruta sin nombre)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS HOMBRE AL AGUA" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Barco Propio" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Ruta Temporal AIS Hombre al Agua" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Posición actual del barco" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Posición barco propio: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " Posición MOB: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "ACTUALIZACIÓN DE AIS HOMBRE AL AGUA" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Gestor de Rutas y Marcas" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Imprimir Carta" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Barra Espaciadora)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "Preparar OpenCPN ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC completado." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5560,105 +5577,105 @@ msgstr "Crear una plantilla de configuración privada basada en la configuració "Esta plantilla se guardará, y puede ser seleccionada para su uso posterior en cualquier momento.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Propiedades Extendidas del MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Rastreo" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Rastreo por Defecto" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Siempre Rastrear" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Nunca Rastrear" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorar este MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Manejar este MMSI como baliza SART/PLB(AIS)." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Convertir AIVDM a AIVDO para este MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Este MMSI es de mi seguidor - No alerta CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Un identificador MMSI es generalmente un número de nueve dígitos.\n" "Por favor compruebe sus entradas y cancele si fuera necesario." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Por defecto " -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Siempre" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Nunca" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Editar propiedades del MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Propiedades del MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Modo de Rastreo" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorar" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "Hombre Al Agua" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nombre del barco" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Seguidor" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Nuevo..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Agregar propiedades MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5676,7 +5693,7 @@ msgstr "el dispositivo seleccionado no es accesible; OpenCPN es probable que no " KERNEL == \"ttyS *\", modo = \"0666\"\n" "< div clase = \" notranslate \"> 9 para obtener más información, consulte el archivo LINUX_DEVICES.md en la documentación de la distribución.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5696,1180 +5713,1175 @@ msgstr "\n" " KERNEL == \"ttyS *\", modo = \"0666\"\n" "< div clase = \" notranslate \"> 9 para obtener más información, consulte el archivo LINUX_DEVICES.md en la documentación de la distribución.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Longitud estimación por COG (min):" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Longitud de la estimación de rumbo (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Tipo Icono Barco" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Bitmap a Escala Real" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Vectorial a Escala Real" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Eslora total (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Manga total (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Ajuste GPS desde Proa (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Ajuste GPS desde el Centro (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Tamaño Mínimo Pantalla (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Mostrar círculos de distancia" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distancia entre anillos" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Unidad Distancia" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Millas náuticas" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilómetros" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "Minutos (tiempo)" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Colores de anillos" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Mostrar derota hacia el Waypoint activo" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Estilo" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Sólido" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Punto" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Guión largo" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Guión corto" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Guión punteado" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Color por defecto" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Negro" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Rojo Oscuro" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Verde Oscuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Amarillo Oscuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Azul Oscuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta Oscuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Cian Oscuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Gris Claro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Gris Oscuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Rojo" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Verde" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Amarillo" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Azul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cian" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Blanco" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Derrotas" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Derrota diaria automática a medianoche" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Derrota diaria automática a" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Ordenador" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Resaltar Derrotas" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Color para resaltar" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Precisión Derrota" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Bajo" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Medio" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Alto" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Calcular valores" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Calcular SOG y COG usando los cambios de posición" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Mínimo de segundos entre actualizaciones" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rutas/marcas" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Nuevas rutas" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Ruta activa" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Persistir ruta activa, activar automáticamente al iniciar" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Icono predeterminado de la marca" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Radio del círculo de llegada a waypoint (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Dirigirse al siguiente waypoint de ruta solo con llegar" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "Nuevas Marcas" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "Icono de Marca por defecto" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "Mostrar solo las marcas en una escala gráfica mayor que 1:" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Reemplazar los ajustes para la visibilidad basada en la escala de la carta y mostrar siempre" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "Mostrar círculos de distancia" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Colores anillos distancia waypoint" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Opciones de control" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "Bloquear marcas y waypoints (excepto el diálogo de propiedades de objeto visible)" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Confirmar borrado de derrotas y rutas" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Archivos de cartas" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Carpetas de Cartas Activadas" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Añadir carpeta...." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Eliminar Seleccionados" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Comprimir selección" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Añadir.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Eliminar" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Comprimir" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Migrando cartas.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Control de Actualizaciones" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Explorar cartas y actualizar Base de Datos" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Forzar Reparación de Toda la Base de Datos" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Preparar todas las cartas ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Plantillas" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Estado de la plantilla" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Título de la última plantilla aplicada:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Plantillas guardadas" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Crear configuración..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Borrar configuración seleccionada..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Aplicar Configuración Seleccionada" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Crear configuración" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Problemas al aplicar la configuración seleccionada." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avanzado" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Realinear cartas raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Usar aceleración gráfica (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Opciones de OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Promedio de tiempo para rotación de carta" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "segundos" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Ajustes zoom/escala de carta" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vector" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "Nivel de detalle CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Ancho de la pantalla física" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "automático" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manual:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Visualización carta" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Mostrar Cartas Raster Inclinadas como Norte Arriba" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Con un valor inferior, el mismo nivel de zoom muestra una carta menos detallada.\n" "Con un valor más alto, el mismo nivel de zoom muestra una carta más detallada." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Gráficos" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Barra de cartas" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Mostrar información de la barra de gráficos extendida." -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Mostrar Carta Vectorial" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Estándar Marino" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Profundidad de sondas" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Objetos Información Carta" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Boyas y luces" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Mostrar sectores luz" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Textos de la carta" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Incluir mensajes en idioma nacional" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Solo Texto Importante" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Des/agrupar Texto" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Detalle de la carta" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Reducir detalle a baja escala" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "Reducción de detalle adicional a Pequeña Escala" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Estilo de Gráficos" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Carta en Papel" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplificado" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Límites" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Sencillo" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Con símbolos" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Colores" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Colores" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Colores" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Poca Profundidad" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Profundidad Seguridad" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Gran Profundidad" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Objetos estándar del usuario" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Resetear a STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Mareas && Corrientes" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Juegos de Datos activos" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Añadir Juego de Datos..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Todas las cartas disponibles" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Eliminar Carta" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Todas las Cartas" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nuevo Grupo..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Borrar Grupo" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Conservar escala al alternar entre cartas" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Controles" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Desplazam/zoom suave" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom en cursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Opciones de Visualización" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Opción de la barra de estado" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "ETA vivo en Cursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Velocidad por defecto del barco " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Disposición de mapas" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Barra de Estado" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unidades" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Millas terrestres" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Nudos" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Profundidad" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatura" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Grados, Minutos Decimales" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Grados Decimales" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Grados, Minutos, Segundos" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Rumbos" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Mostrar Verdadero" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Mostrar magnético" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Declinación magnética asumida" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Vel. Viento" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Muestra demoras y rumbos verdaderos" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Muestra demoras y rumbos magnéticos." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Declinación magnética calculada por WMM Plugin" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Para ajustar la declinación magnética manualmente, \n" " debe desactivar el plugin WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Comprobar" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Nombre del archivo de audio:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Seleccionar Fichero Sonido" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Sonidos" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Alarma fondeo" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Reproducir sonido en la alarma fondeo" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Seleccionar sonido de alarma de fondeo" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Reproducir sonido en alarma AIS" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Seleccionar sonido de alarma AIS" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "Alerta SART" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Reproducir sonido en alarma SART" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Seleccionar sonido de alarma SART" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "Alarma DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Reproducir sonido para notificaciones DSC." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Seleccionar sonido de notificaciones DSC" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Configuración dispositivo sonido" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Dispositivo desconocido:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Dispositivo de entrada :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Dispositivo de sonido" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Comando para reproducción de audio:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Blancos AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Cálculos CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "No dar alertas (T)CPA si la distancia a blanco es mayor de (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Aviso si CPA es inferior a (NMi):" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "..y TCPA es inferior a (minutos):" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Blancos Perdidos" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Marcar blancos como perdidos tras (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Eliminar blancos perdidos después de (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Visualización" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Mostrar Predicción de blanco por COG, longitud (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Sincronizar longitud de flecha AIS con predictor COG de la propia nave" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Mostrar derrotas blanco, longitud (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Suprimir blancos atracados/fondeados, velocidad máxima (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Dibuja predicción AIS en tiempo real, velocidad objetivo min (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Permitir atenuación de los blancos menos importantes si hay más de .... blancos" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Mostrar áreas de mensajes (de mensajes binarios AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Mostrar tamaño real blancos AIS" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Mostrar nombres de blancos AIS con escala mayor que 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Usar mensajes de posición WPL. Acción cuando se reciba:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Informe Posición ARPS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Crear marca" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Cartel" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Activar el bloque de información de ruta/AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Nombre Barco\" MMSI (Señal Llamada)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Clase] Tipo (Estado)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Alarmas CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Mostrar Diálogo Alarmas CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Reproducir Sonido Alarmas CPA/TCPA y urgencias DSC/SART." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Probar sonido de alerta AIS" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Suprimir alertas para objetivos anclados/amargos" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Activar T. de espera tras reconocer alarma de blanco (min.)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Opciones Generales" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Idioma" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Fuentes" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Elegir Fuente..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Elegir Color Fuente..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Muestra" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Estilo de Barra de Iconos y Ventana " -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Opciones Interfaz" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Mostrar Barra de Estado" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Mostrar Barra de Menús" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Mostrar ventana Estado Compás/GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Activar auto-ocultar Barra de Herramientas" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Dar toques de campana" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Habilitar interfaz para pantallas táctiles" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Habilitar interfaz con gráficos escalables" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Mostrar herramientas de zoom" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Usar ECDIS Aguas Interiores" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Manual ECDIS Interior" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Factor de escala del Interface de Usuario" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Factor de escala de Objetos en Carta" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Factor escala de barcos" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "Factor tamaño sondas en ENC" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "Factor tamaño Textos ENC" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Sensibilidad Zoom por rueda del ratón" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Aplicar" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Cartas" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Conexiones" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Conectar" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Barcos" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Interfaz usuario" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Usuario" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Plugins" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Declinación magnética definida por usuario" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "pies" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "brazas" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Añadir carpeta con ficheros de cartas" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - tu eslora de barco debe ser > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - tu manga de barco debe ser > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - el ajuste del GPS desde el medio debe estar dentro de la manga del barco" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - el ajuste de GPS desde proa debe estar dentro de la eslora del barco" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - tu tamaño mínimo de icono para el barco debe estar entre 1 y 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Los ajustes de tamaño real del barco propio no son correctos:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "El Manual ECDIS Interno no está disponible localmente." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "¿Quieres visitar el sitio web del Manual de iECDIS para más información?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6879,15 +6891,15 @@ msgstr "La compresión alterará los archivos de cartas en el disco.\n" "Las cartas comprimidas pueden tardar un poco más en cargarse y mostrarse en algunos sistemas.\n" "Pueden ser descomprimidas de nuevo usando los programas unxz o 7 zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Comprimir Cartas" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "No se encontraron cartas para comprimir." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6896,71 +6908,71 @@ msgstr "comprimidas %ld cartas\n" "de %.1fMB a %.1fMB\n" "ahorrado %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Introducir Nombre Grupo" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Nuevo Grupo Cartas" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Seleccionar datos Marea/Corriente" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Compresión de texturas" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Compresión de texturas con almacenamiento en caché" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Caché compresión de texturas" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tamaño memoria de texturas (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Tamaño: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Reconstruir caché de texturas" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Limpiar caché de texturas" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Polígono suavizado" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Suavizado de líneas" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (reiniciar OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Usar aceleración gráfica (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Ajustes de textura" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Caché de texturas" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Misceláneo" @@ -7042,127 +7054,127 @@ msgstr "Por favor, compruebe el registro del sistema para más información." msgid " successfully installed from cache" msgstr " instalado correctamente desde caché" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Estos ajustes podrían desestabilizar OpenCPN y están deshabilitados por defecto. Para activarlos manualmente a pesar de los peligros añade la línea CatalogExpert=1 a la sección [PlugIns] del archivo de configuración." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Lista de plugins" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Actualizar lista de plugins" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importar plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Configuración..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Desactivada" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Actualizar catálogo de plugins: Master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "Actualización del listado de OpenCPN" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "No se puede copiar el archivo de catálogo" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "No se puede copiar el archivo de catálogo a la caché" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Listado actualizado correctamente" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Seleccionar archivo tarball" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Error al extraer metadatos del tarball." -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Error al importar OpenCPN Plugin" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Detectado PlugIn incompatible." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Error al extraer tarball del plugin importado." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Plugin" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "Importado con éxito" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Listado activo" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Último catálogo" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Última modificación: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Por favor, actualice la lista de plugins. " -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Desinstalar" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Desinstalar plugin" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Desinstalación" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Activado" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Actualizar a versión" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Instalar..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Actualizar a " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Sitio web" @@ -7207,10 +7219,6 @@ msgstr "Satélites" msgid "OpenCPN Server Message" msgstr "Mensaje del servidor OpenCPN" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Cartel AIS" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Cartel Gráfico Marea/Corrientes" @@ -7328,12 +7336,6 @@ msgstr "Ruta desde Derrota" msgid "Send to &Peer" msgstr "Enviar a &Pareja" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Marcas" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "Mostrar todas las marcas" @@ -7534,15 +7536,15 @@ msgstr "pero la escala actual es" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Por lo tanto, la nueva marca no será visible en este nivel de zoom." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Marcas(s) transmitidas." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Error en Carga de Waypoint. GPS Garmin no conectado" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Error en carga de marca. Por favor, compruebe los archivos de registro..." @@ -7847,10 +7849,10 @@ msgstr "(Angulos de sector son Demoras Verdaderas desde el Mar)The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

La última ejecución de opencpn parece que falló. ¿Quiere ejecutar\n" "en modo seguro sin plugins y otras posibles características problemáticas?\n" -"



Puede considerar visitar la lista de problemas conocidos.

" +"



Puede considerar visitar la lista de problemas conocidos.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7966,7 +7968,7 @@ msgstr "Hoy" msgid "Tomorrow" msgstr "Mañana" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Info herramienta" @@ -8267,153 +8269,156 @@ msgstr "Mover Waypoint" msgid "Dismiss" msgstr "Descartar" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "Seleccione las unidades y formato de datos que desea utilizar." -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Los ajustes se pueden cambiar en cualquier momento en la caja de herramientas de configuración accesible haciendo clic en el " -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr " en el icono de la barra de herramientas principal." -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "Si ya tiene cartas en su sistema, puede añadirlos aquí." -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "Se pueden obtener cartas adicionales usando el Descargador de estas integrado en la aplicación." -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "Para acceder al Descargador de Cartas haga clic en el " -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr " en el icono de la barra de herramientas y vaya Cartas -> pestaña Descargador de Cartas." -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "

Bienvenido a OpenCPN!

Ha finalizado satisfactoriamente la configuración inicial. Ya puede empezar a usar la aplicación.

" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "NMEA0183: puerto UDP %d" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "NMEA2000: puerto UDP %d" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "NMEA0183: %s puerto TCP %d" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "NMEA2000: %s puerto TCP %d" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "GPSd: %s puerto TCP %d" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." -msgstr "Buscando servidores Signal K..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." +msgstr "Buscando fuentes de datos de navegación, esto puede tardar un poco..." -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "Buscando dispositivos USB..." -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "Buscando fuentes de datos UDP..." -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "Buscando servidores TCP..." -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "Buscando servidores Signal K..." + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "Buscando interfaces CAN..." -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "Buscando servidores GPSD..." -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "SignalK: %s (%s puerto %d)" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "El sistema ha sido escaneado en busca de fuentes de datos de navegación." -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "Las conexiones a las fuentes de datos descubiertas se configurarán automáticamente. Puede desmarcar las que desee ignorar." -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "Ahora puede conectar dispositivos USB adicionales o conectarse a una red diferente y presionar el botón Reescanear para actualizar la lista." -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Los ajustes de conexión se pueden cambiar en cualquier momento en la caja herramientas de configuración accesible haciendo clic en el " -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr " en icono de la barra de herramientas. En ella, vaya a la pestaña Conexiones." -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "Seleccione un directorio que contenga las cartas" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "Unidades y formatos" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "Grados, minutos decimales (DD MM.MM)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "Grados decimales (DD.DDDD)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "Grados, minutos, segundos (DD MM SS)" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "Muestra rumbos y demoras verdaderas" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "Muestra rumbos y demoras de aguja" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "Fuentes de datos de navegación detectadas:" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "Reescanear..." -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "Añadir cartas existentes" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "Añadir directorio de cartas..." - diff --git a/po/opencpn_et_EE.po b/po/opencpn_et_EE.po index a03e14d038..81c2210ff2 100644 --- a/po/opencpn_et_EE.po +++ b/po/opencpn_et_EE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Estonian\n" "Language: et_EE\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(nimetu jälg)" @@ -414,7 +414,7 @@ msgstr "SAR-lennuk" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (viimane teadaolev)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Asukoht" @@ -509,11 +509,11 @@ msgstr "parem" msgid "Left" msgstr "vasak" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Kiirus" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Kõrgus" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Tuule kiirus" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Meresõidu abivahend" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "baas" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "Teepunktid nimetatakse ümber uue järjekorra kaasajastamiseks, nimed ol "Kas soovid teepunktid ümber nimetadaa?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Teave OpenCPN'st" @@ -2499,9 +2499,9 @@ msgstr "Kas kirjutada Garmini seadme teekonna number 1 üle?" msgid "OpenCPN Message" msgstr "OpenCPN'i teade" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Valikud" @@ -2543,7 +2543,7 @@ msgstr "Prindi jälje valitud osa" msgid "Track properties" msgstr "Jälje omadused" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "API plugin: " msgid "OpenCPN Website" msgstr "OpenCPN'i koduleht" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN abi-dokumentatsioon ei ole kohapeal saadaval." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Kas soovid lisateabe saamiseks minna veebilehele opencpn.org?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Tühistamine - tühista ala määratletud teatega seostatud ID alusel" msgid "Undefined (default)" msgstr "Määratlemata (vaikimisi)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS-märgi nimi" @@ -3089,7 +3089,7 @@ msgstr "\n" "Sellisel juhul selle märgi pidev jälje salvestus taaskäivitatakse.\n\n" " Kas soovid hoopis selle jälje pideva jälgimise peatada?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS häire" @@ -3105,7 +3105,7 @@ msgstr "&Vaigista häire" msgid "&Jump To" msgstr "&Liigu asukohta" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Loo teepunkt" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS-märkide loend" @@ -3217,38 +3217,38 @@ msgstr "Märke loendatud" msgid "Undock Target List" msgstr "Märkide nimekirja lahtiühendamine" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Salvesta jälg" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Selle märgi hiljuti haaratud jälg on salvestatud.\n" "Kas soovid salvestamist jätkata kuni praeguse OpenCPN-sessiooni lõpuni?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS-märgi päring" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Peata jälgimine" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menüü" @@ -3302,7 +3302,7 @@ msgstr "Pane laev siia" msgid "Navigate To Here" msgstr "Navigeeri siia" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "kurss-üleval töörežiim" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Suund üleval moodus" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "N-üleval tööreþiim" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Kaart-üleval töörežiim" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Lülita täisekraanile" @@ -3346,7 +3346,7 @@ msgstr "Kleebi jälg" msgid "CM93 Offset Dialog..." msgstr "CM93-nihke dialoog..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Kaartide grupid" @@ -3464,7 +3464,7 @@ msgstr "Kopeeri KML'na" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Kustuta" @@ -3618,18 +3618,18 @@ msgstr "Saada jälg OpenCPN'i partnerile" msgid "Chart Panel Options" msgstr "Kaardipaneeli valikud" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigeerimisrežiim" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "N-üleval" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "kurss üleval" @@ -3637,32 +3637,32 @@ msgstr "kurss üleval" msgid "Heading Up" msgstr "Suund üleval" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "ette-vaate moodus" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Kuvamise valikud" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "luba kaartide kihistamine" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "näita kaardivõrku" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "näita kaardi kontuure" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "näita sügavusühikuid" @@ -3682,7 +3682,7 @@ msgstr "Looded ja hoovused" msgid "Show Tide stations" msgstr "näita loodetejaamu" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "näita hoovusi" @@ -3698,8 +3698,8 @@ msgstr "kuva teksti" msgid "Show depths" msgstr "kuva sügavusi" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "poi/tule silt" @@ -3707,8 +3707,8 @@ msgstr "poi/tule silt" msgid "Lights" msgstr "tuled" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "tule kirjeldus" @@ -3724,18 +3724,18 @@ msgstr "Näita nähtavaid sektoritulesid" msgid "Show chart data quality" msgstr "Näita kaardi andmete kvaliteeti" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Kuva kategooria" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "standartne" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "kõik" @@ -3780,7 +3780,7 @@ msgstr "Kasuta aktiivse kataloogina" msgid "Latest available catalog:" msgstr "Viimane saadavalolev kataloog:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Ei suuda andmeid alla laadida, url" @@ -3835,8 +3835,8 @@ msgstr "Viga: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Vastates 'Ei' luuakse täiesti uued teepunktid selle teekonna jaoks." msgid "Merge waypoints?" msgstr "Mestida teepunktid?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Lõigu lühi-info üleliikudes" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile vajab aktiveeritud OpenGL'i" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "jalad" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "meetrid" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "süllad" @@ -4197,7 +4197,7 @@ msgstr "süllad" msgid "OverZoom" msgstr "Liigsuum" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Üksikasjalik loodete ikoon" @@ -4213,7 +4213,7 @@ msgstr "AIS-märgi päring" msgid "Show all AIS Targets" msgstr "Kuva kõik AIS-märgid" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Summuta vähem kriitilised AIS-märgid" @@ -4261,9 +4261,9 @@ msgstr "Kasutaja X-nihe" msgid "User Y Offset" msgstr "Kasutaja Y-nihe" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "meetrid" @@ -4274,11 +4274,13 @@ msgstr "See lõik" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Konsooli legend" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Konsooli väärtus" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Tiitel" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Vähem" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Muuda valitud ühendust" @@ -4637,12 +4639,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN'i hoiatus" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenPCN'i teave" @@ -4651,17 +4653,17 @@ msgstr "OpenPCN'i teave" msgid "Sentence Filter" msgstr "Teate filter" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Vali kõik" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Puhasta kõik" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Lisa" @@ -4692,59 +4694,59 @@ msgstr "NMEA-teade on harilikult 3 tähemärki pikk (nagu RMC, GGA jne).\n" msgid "REGEX syntax error: \n" msgstr "REGEX süntaksi viga: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Üldine" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "filtreeri NMEA'st kursi ja kiiruse andmed" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Filtri periood (s)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "näita NMEA silumisakent" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "vormista üleslaadimine Furuno GP3X'i jaoks" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "kasuta Garmini GRMN-moodust (host) üleslaadimiseks" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Täpsusta komminikatsiooni eelistused..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Andmeühendused" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Kõrvalda ühendus" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Uue ühenduse konfigureerimine" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Installi" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Installi uuesti" @@ -4810,7 +4812,7 @@ msgstr "Installi uuesti" msgid "Update" msgstr "Uuendus" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Alandada" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr " õnnestunult paigaldatud" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Paigaldamine on lõpetatud" @@ -4848,6 +4850,21 @@ msgstr "Paigaldamine on lõpetatud" msgid "Installation error" msgstr "Paigalduse viga" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Märgid" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS-üleliikumine" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "võrgustiku tekst" @@ -4860,7 +4877,7 @@ msgstr "Ootan rasterkaardi pakkimislõimest väljumist." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN'i tihendatud vahemälu uuendamine" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Vahemaa oma laevast: %4.0f Mm" @@ -4993,7 +5010,7 @@ msgstr "See teepunkt on osa kihist ning seda ei saa redigeerida" msgid "Icon" msgstr "Ikoon" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Mõlemad!" @@ -5003,7 +5020,7 @@ msgid "Links" msgstr "Lingid" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5044,22 +5061,22 @@ msgstr "Vahemaa ringid" msgid "Number" msgstr "Number" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Vahemaa" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Värv" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "mitte ühtegi" @@ -5149,16 +5166,16 @@ msgstr "Näita ainult mõõtkavas" msgid "Tide Station not found" msgstr "Loodejaama pole leitud" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Vali mõõtkava" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Kaardi mõõtkava" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Püsiv" @@ -5190,35 +5207,35 @@ msgstr "NMEA silumisaken" msgid "Cannot load route or waypoint file: " msgstr "Ei suuda teekonna või teepunkti faili laadida: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Kasutajaliidest ei õnnestunud käivitada. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN ei suuda käivituda." -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Ei suudetud leida vajalikke konfiguratsioonifaile." -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Vaata logifaili" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " täpsustamiseks." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Käivitan kaasaskantavat(-p) asukohas " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Otsin algse kaartide konplekti asukoha Windows-i registrist välja" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN käivitati %ld ms." @@ -5273,8 +5290,8 @@ msgstr "Eeldatav aeg:" msgid "Remaining time : " msgstr "Järelejäänud aeg: " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN kaardi uuendamine" @@ -5282,277 +5299,277 @@ msgstr "OpenCPN kaardi uuendamine" msgid "Anchorage created " msgstr "Ankrukoht loodud" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Kuva tööriistariba" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Peida tööriistariba" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "MEES ÜLE PARDA" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 miil piki COG'i" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Ajutine MOB-teekond" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "1 miili oletatav punkt" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Aeg: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Asukoht: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Keela jälgimine" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Võimalda jälgimine" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Automaatne järgimine" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Suund üleval moodus" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Suurenda" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Vähenda" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Suurema mõõtkavaga kaart" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Väiksema mõõtkavaga kaart" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Välju OpenCPN'st" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Navigeeri" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "näita kaardi riba" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Näita ENC-teksti" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Näita ENC'l tulesid" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Näita ENC'l sügavusi" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Näita ENC'l ankrupaiga infot" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Näita ENC-andmete kvaliteeti" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Näita nav.objekte" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Näita loodeid" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Vaheta värviskeemi" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Vaade" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Näita AIS-märke" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Peida sildunud AIS-märgid" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Näita AIS-märkide jälgi" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Näita CPA hoiatuse dialooge" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Mängi CPA alarme maha" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Näita laadimishoiatusi" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Mõõda vahemaad" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Teekonna && märgi haldur..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Loo teekond" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Pane märk paadi juurde" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Pane märk kursori juurde" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Pane MOB-tähis" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Eelistused" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Tööriistad" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Aken" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN'i abi" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "A&bi" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Palun taaskäivita OpenCPN keele- või stiilimuutuste aktiveerimiseks." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "Laev" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Ümberpööratud režiim" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Oli probleem printimisega.\n" "Võib-olla pole määratud printer korralikult seadistatud?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(nimetu teekond)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS Mees üle parda" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Oma laev" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Ajutine AISMOB teekond" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Praegune oma laeva koht" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Oma laeva asukoht: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " MOB asukoht: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS MEES ÜLE PARDA uuendus" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Teekonna & märgi haldaja" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Prindi kaart" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr "(Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "Ettevalmistada OpenCPN ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC valmis." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5560,105 +5577,105 @@ msgstr "Loo praegustel sätetel põhinev isiklik konfiguratsioonimall.\n" "See mall salvestatakse ja seda võib igal ajal valida edasiseks kasutamiseks.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI laiendatud omadused" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Jälgimine" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Vaikimisi jälgimine" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Jälgi alati" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Mitte kunagi jälgida" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Eira seda MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Käsitle seda MMSI'd kui SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Teisenda selle MMSI AIVDM AIVDO'ks" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "See MMSI on mu järgija - CPA-hoiatust pole vaja" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "MMSI Id koosneb üldiselt üheksast numbrist.\n" "Palun kontrolli oma sisestust ja tühista kui vaja." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "vaikimisi" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Alati" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Mitte kunagi" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "MMSI omaduste muutmine" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI omadused" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Jälgimise viis" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Eira" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM-> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Laeva nimi" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Järgija" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Uus..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Lisa MMSI omadused" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5676,7 +5693,7 @@ msgstr "Valitud seade ei ole kättesaadav; OpenCPN ilmselt ei suuda\n" " KERNEL==\"ttyS*\", MODE=\"0666\" loomist uuesti\n\n" "Lisateabe saamiseks vaata faili LINUX_DEVICES.md levitusdokumentides.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5696,1180 +5713,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\" loomist uuesti\n\n" "Lisateabe saamiseks vaata faili LINUX_DEVICES.md levitusdokumentides.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG eeldatav asukoht (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "kursivektori pikkus (miili)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "laeva ikooni tüüp" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "raster tegelikus mõõtkavas" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "vektor tegelikus mõõtkavas" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "üldpikkus (LOA) (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "suurim laius (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS-i nihe vöörist (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS-i nihe laeva miidlis (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "vähim suurus ekraanil (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "kuva ulatuse ringe" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "vahemaa ringide vahel" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "vahemaa ühik" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "meremiilid" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "kilomeetrid" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "vahemaaringide värv" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Näita suunda aktiivsesse teepunkti" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Stiil" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "jäme" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "punktiirjoon" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "pikk joon" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "lühike joon" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "punkt-kriips-joon" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "vaikimisi värv" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "must" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "tumepunane" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "tumeroheline" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "tumekollane" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "tumesinine" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "tumepurpurviolett" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "tume-erksinine" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "helehall" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "tumehall" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "punane" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "roheline" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "kollane" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "sinine" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "purpurviolett" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "erksinine" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "valge" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Jäljed" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automaatne päevase jälje salvestus algab südaööl" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "automaatne päevase jälje salvestus algab" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "arvuti" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "erista jäljed" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Eslletõste värv" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "järgimise täpsus" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "madal" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "keskmine" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "kõrge" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Arvuta väärtused" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "arvuta SOG ja COG peale asukoha muutust" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "min sekundit uuenduste vahel" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Teekonnad/punktid" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Uued teekonnad" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Aktiivne teekond" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Hoia aktiivne teekond alles, automaatselt aktiveeri käivitamisel" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "teepunkti vaikeikoon" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "teepunkti saabumisringi raadius (miili)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "jätka järgmise teekonnapunktiga ainult saabumisringi läbimisel" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "kehtesta kaardiskaalal põhineva nähtavuse sätted ümber ja näita alati" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "teepunkti ulatusringi värvid" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Kontrolli valikud" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "kinnita jälgede ja teekondade kustutamine" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Kaardi failid" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Asukohad" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Lisa asukoht..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Kõrvalda valitud" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Paki valitud kokku" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Lisa.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Eemalda" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Pakkimine" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Migreeri kaardid.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Uuenduste kontroll" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "otsi kaarte ja uuenda andmebaas" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "sunduslik kogu andmebaasi taasloomine" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Valmistada kõik ENC-kaardid ette" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Mallid" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Malli olukord" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Viimati lisatud malli nimetus:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Salvestatud mallid" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Loo konfigur..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Kustuta valitud konfigur..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Rakenda valitud kofiguratsioon" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Loo konfiguratsioon" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Probleem valitud konfiguratsiooni kohaldamisel." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Lisavalikud" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Aja rasterkaardid otseks" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "kasuta graafikakiirendit (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL'i valikud" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Kaardi pööramise keskmine aeg" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "sekundit" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Kaardi suumi/skaala võrdsustamine" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektor" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93-detailide tase" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Tegelik ekraani laius" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "käsitsi:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Kaardi kuvamine" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "näita viltuseid rasterkaarte kui N-üleval" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Sama suumitase, kuid madalama väärtusega, kuvab vähem detailset kaarti.\n" "Sama suumitase suurema väärtusega kuvab rohkem detailset kaarti." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Graafika" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Kaartide nimekiri" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Näita kaartide nimekirja laiendatud informatsiooni." -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vektorkaardi kuvamine" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Laevniku valik" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "sügavuse mõõdistused" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "kaardi info-objektid" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Poid/tuled" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "pikendatud tulesektorid" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Kaardi tekstid" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "rahvuslik tekst kaardil" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "ainult oluline tekst" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "virvarrita tekst" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Kaardi detailid" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "vähendatud detailid väiksel mõõtkaval" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Graafika stiil" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "paberkaart" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "lihtsustatud" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Piirid" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "lihtne" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "lisatud sümbolid" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Värvid" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 värvi" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 värvi" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "madal vesi" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "ohutu sügavus" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "suur sügavus" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Kasutaja standardobjektid" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Lähtesta STANDARDIKS" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Looded && hoovused" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktiivne andmestik" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Lisa andmestik..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Kõik saadaval kaardid" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Eemalda kaart" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Kõik kaardid" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Uus grupp..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Kustuta grupp" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "säilita kaarte vahetades mõõtkava" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Ohjed" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "sujuv panoraamimine / suumimine" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "suumi hiire juurde" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Kuvamise omadused" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Olekuriba valik" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "tegelik ETA kursori juures" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "aluse vaikimisi kiirus " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Kaardi asetuse paigutus" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Olekuriba" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Ühikud" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "maamiil" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "sõlmed" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "mp/h" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Sügavus" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatuur" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Laius/pikkus" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "kraadid, minutite kümnendikud" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "kraadi kümnendikud" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "kraadid, minutid, sekundid" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Suunad" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Näita tõelist" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Näita magnetilist" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Oletatav magneetiline variatsioon" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "kraadi (-W + E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Tuule kiirus" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "näita tegelikke suundi ja kursse" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "näita magnetsuundi ja -kursse." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM-plugina arvutatud magnetiline variatsioon" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Käsitsi magneetilise variatsiooni määramiseks \n" "pead sa keelama WMM-plugina." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Test" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "audiofaili nimi:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Vali helifail" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Helid" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Ankruhäire" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "esita heli ankruhäire korral." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Vali ankruhäire heli" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "esita heli AIS-häire korral." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Vali AIS-häire heli" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART-häire" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "esita heli AIS SART-häire korral." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Vali AIS SART-häire heli" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC-häire" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "esita heli DSC-teavitusel." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Vali DSC-teate heli" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Heliseadme häälestus" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "tundmatu seade:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Sisendseade :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Heliseade" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Audio Play käsk:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS-märgid" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA arvutamine" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "kui vahemaa märgini on rohkem kui (M), siis (T)CPA hoiatusi ei ole" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "hoiata kui CPA on vähem kui (M)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...ja TCPA on vähem kui (min)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Kaotatud märgid" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "märgista märk kaotatuks peale (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "kõrvalda kaotatud märgid peale (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Kuvamine" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "näita märgi COG eeldatavat vektorit pikkusega (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "sünkroniseeri AIS-noole pikkus oma COG eeldatava asukohaga" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "näita märgi jälge, pikkus (minutit)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "pärsi ankrus/sildunud märgid, max kiirus (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr " ennusta AIS reaalajas, märgi kiirus min (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "luba vähem kriitiliste märkide summutamine kui on rohkem kui ... märki" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "näita ala teateid (AIS'i binaarteadetest)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "näita AIS-märgi tegelikku suurust" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "näita nimesid koos AIS-märkidega suuremal mõõtkaval kui 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "kasuta WPL-asukoha teadet. Tegevus vastuvõtmisel:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "ARPS-asukoha ettekanne" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Loo märk" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Liigu üle" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "luba teekonna/AIS-info plokk" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Laev nimi\" MMSI (kutsung)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Klass] tüüp (olek)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA häired" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "näita CPA/TCPA häire dialoogi" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "mängi heli CPA/TCPA häirete ja DSC/SART hädaolukordade korral." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Testi AIS-häire heli" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "vaigista ankurdatud/sildunud märkide häired" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "luba märgi häirele vastamise hilinemine (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Üldised valikud" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Keel" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Kirjamärgid" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Vali täht..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Vali tähe värv..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Näidis" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Tööriistariba ja akna stiil" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Kasutajaliidese suvandid" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "näita olekuriba" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "kuva menüüriba" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "näita kompassi/GPS'i olukorra akent" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "luba tööriistariba automaatne peitmine" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "helista laevakella" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "võimalda puutepinna kasutajaliides" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "võimalda skaleeritud graafikaga kasutajaliides" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Näita suuminuppe" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "kasuta sisevete ECDIS" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Sisevete ECDIS juhend" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Kasutajaliidese mõõtkavategur" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Kaardi objekti mõõtkavategur" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Aluse mõõtkava faktor" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC sügavuse faktor" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC-teksti skaala" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Hiire ratta suurenduse tundlikkus" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Rakenda" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Kaardid" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Ühendused" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Ühendu" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Laevad" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Kasutajaliides" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Kasutaja" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Pluginad" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Kasutaja seatud magneetiline variatsioon" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "jalad" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "süllad" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Lisa kaarte sisaldav asukoht" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - te laeva pikkus peab olema > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - te laeva laius peab olema > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - su GPS'i nihe keskosast peab olema su laeva laiuse piires" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - su GPS'i nihe vöörist peab olema su laeva pikkuse piires" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - su laeva ikooni vähim suurus peab olema 1 and 100 mm vahel" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Oma laeva tegeliku suuruse seaded ei ole õiged:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "SIsevete ECDIS kasutujuhend ei ole kohapeal saadaval." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Kas soovid lisateabe saamiseks minna iECDIS-juhendi veebilehele?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6879,15 +6891,15 @@ msgstr "Tihendamine muudab kaarte kettal.\n" "Tihendatud kaardid võivad mõnedes süsteemides natuke aeglasemalt avatud ja kuvatud saada.\n" "Neid saab uuesti unxz või 7-zip programme kasutades lahti pakkida." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN tihenda kaarte" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Ühtegi kaarti tihendamiseks ei leitud." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6896,71 +6908,71 @@ msgstr "tihendatud %ld kaarte\n" "algsest %.1fMB kuni %.1fMB\n" "säästetud %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Sisesta grupi nimi" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Uus kaardigrupp" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Vali loodete/hoovuse andmed" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Tekstuuri tihendamine" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "tekstuuri pakkimine vahemällu" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Tekstuuri tihendamise vahemällu viimine" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tekstuuri mälu maht (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "suurus: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Loo uuesti tekstuuri vahemälu" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Tühjenda tekstuuri vahemälu" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "hulknurga silumine" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "joone silumine" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Tarkvaraline OpenGL (OpenCPN taaskäivitus)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "kasuta kiirendatud nihutamist" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Tekstuuri sätted" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Tekstuuri vahemälu" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Mitmesugust" @@ -7042,127 +7054,127 @@ msgstr "Palun vaata süsteemi logi lisainformatiooni saamiseks." msgid " successfully installed from cache" msgstr " on vahemälust õnnestunult paigaldatud" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Need sätted võivad OpenCPN'i muuta ebastabiilseks ja on vaikimisi blokeeritud. Ohust hoolimata saab neid käsitsi lubada lisades rea CatalogExpert=1 [PlugIns] jaotuse konfiguatsiooni failis." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Plugina kataloog" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Uuenda plugina kataloogi" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Impordi plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Sätted..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Keelatud" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Uuenda plugina kataloogi: peamine" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN kataloogi uuendamine" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Ei suuda kopeerida kataloogifaili" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Ei suuda kopeerida kataloogifaili vahemällu" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Kataloogi uuendamine õnnestus" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Vali tarball-fail" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Viga meta-andmete väljastamisel arhiivist." -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN plugina importimise viga" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Importimisel avastatud mitteühilduv plugin." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Viga plugina tarball impotimise lahtipakkimisel." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Plugin" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr " on edukalt imporditud" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktiivne kataloog" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Viimane kataloog" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Viimane muutus: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Palun uuenda plugina kataloogi." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Eemalda" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Kustuta plugin " -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Kustutamine" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Lubatud" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Uuenda versioonini " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Paigaldus..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Uuenda " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Veebileht" @@ -7207,10 +7219,6 @@ msgstr "Satelliidid" msgid "OpenCPN Server Message" msgstr "OpenCPN'i serveri teade" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS-üleliikumine" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Hoovuse-loodete graafiku üleliikumine" @@ -7328,12 +7336,6 @@ msgstr "Loo jäljest teekond" msgid "Send to &Peer" msgstr "Saada &partnerile" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Märgid" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7537,15 +7539,15 @@ msgstr "aga praegune kaardiskaala on" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Seetõttu uus teepunkt ei ole nähtav sellel suumi tasemel." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Edastatud teepunkt(id)." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Viga teepunktide üleslaadimisel. Garmini GPS pole ühendatud" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Viga teepunktide üleslaadimisel. Vaata palun logifaili..." @@ -7850,11 +7852,11 @@ msgstr "(Sektori nurgad on tõelised peilingud mere poolt vaadates msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

OpenCPN'i viimane käivitus ebaõnnestus. Kas soovid ta käivitada\n" "turvarežiimis ilma pluginateta ja muude võimalike problemaatiliste\n" "funktsioonideta?\n" -"



Võiksid külastada ka tuntud probleemide nimekirja.

" +"



Võiksid külastada ka tuntud probleemide nimekirja.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7970,7 +7972,7 @@ msgstr "Täna" msgid "Tomorrow" msgstr "Homme" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Nõuanded" @@ -8260,153 +8262,156 @@ msgstr "Teisalda teepunkt" msgid "Dismiss" msgstr "Tühista" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_fi_FI.po b/po/opencpn_fi_FI.po index 651191d989..13dc73ca98 100644 --- a/po/opencpn_fi_FI.po +++ b/po/opencpn_fi_FI.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Finnish\n" "Language: fi_FI\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Nimeämätön jälki)" @@ -414,7 +414,7 @@ msgstr "SAR ilma-alus" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Viimeinen tunnettu)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Sijainti" @@ -509,11 +509,11 @@ msgstr "oikealle" msgid "Left" msgstr "vasemmalle" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Nopeus" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Korkeus" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Tuulen nopeus" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Aid to Navigation" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Perus" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2451,8 +2451,8 @@ msgstr "Reittipisteet nimetään uudelleen niiden järjestyksen mukaan, jolloin "Haluatko nimetä reittipisteet uudelleen?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Tietoja OpenCPN:stä" @@ -2498,9 +2498,9 @@ msgstr "Korvataanko Garmin-laitteen reitti numero 1?" msgid "OpenCPN Message" msgstr "OpenCPN Viesti" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Asetukset" @@ -2542,7 +2542,7 @@ msgstr "Jäljen tulostuksen valinnat" msgid "Track properties" msgstr "Jäljen ominaisuudet" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "OpenCPN alkumääritys" @@ -2555,12 +2555,12 @@ msgstr "OpenCPN alkumääritys" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2658,23 +2658,23 @@ msgstr "Lisäosa API: " msgid "OpenCPN Website" msgstr "OpenCPN nettisivusto" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN:n ohje ei ole käytettävissä paikallisesti." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Avataanko opencpn.org verkkosivu lisätietojen näyttämiseksi?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3074,7 +3074,7 @@ msgstr "Peruuttaminen - Peruutetaan viestin ID linkissä määritelty alue" msgid "Undefined (default)" msgstr "Määrittelemätön (oletus)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS-kohteen nimi" @@ -3088,7 +3088,7 @@ msgstr "\n" "minkä vuoksi tallennus käynnistetään uudelleen.\n\n" "Haluatko sen sijaan lopettaa kohteen jatkuvan jäljen tallennuksen?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS-hälytys" @@ -3104,7 +3104,7 @@ msgstr "&Hiljainen hälytys" msgid "&Jump To" msgstr "&Hyppää" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Luo reittipiste" @@ -3127,7 +3127,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS-kohdeluettelo" @@ -3216,38 +3216,38 @@ msgstr "Kohteiden määrä" msgid "Undock Target List" msgstr "Irroita kohdeluettelo" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Tallenna jälki" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Tämän kohteen tähän asti valmistunut jälki on tallennettu.\n" "Haluatko jatkaa tallennusta OpenCPN:n sulkemiseen saakka?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS-kohdekysely" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Lopeta jälki" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Valikkko" @@ -3301,7 +3301,7 @@ msgstr "Siirrä alus tähän" msgid "Navigate To Here" msgstr "Navigoi tähän" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Kurssi ylös -tila" @@ -3310,8 +3310,8 @@ msgid "Heading Up Mode" msgstr "Suunta ylös -tila" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Pohjoinen ylös -tila" @@ -3320,7 +3320,7 @@ msgid "Chart Up Mode" msgstr "Kartta ylös -tila" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Vaihda koko näytöön" @@ -3345,7 +3345,7 @@ msgstr "Liitä jälki" msgid "CM93 Offset Dialog..." msgstr "CM93 siirtymän valintaikkuna..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Karttaryhmät" @@ -3463,7 +3463,7 @@ msgstr "Kopioi KML-tiedostona" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Poista" @@ -3617,18 +3617,18 @@ msgstr "Lähetä jälki OpenCPN-laitteelle" msgid "Chart Panel Options" msgstr "Karttanäytön asetukset" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigointitila" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Pohj. ylös" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Kurssi ylös" @@ -3636,32 +3636,32 @@ msgstr "Kurssi ylös" msgid "Heading Up" msgstr "Suunta ylös" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Katso eteenpäin -tila" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Näyttöasetukset" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Yhdistä eri kartat näytölle automaattisesti (Chart Quilting)" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Näytä ruudukko" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Näytä karttarajat" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Näytä syvyysyksikkö näytöllä oikealla ylhäällä" @@ -3681,7 +3681,7 @@ msgstr "Vuorovedet ja virrat" msgid "Show Tide stations" msgstr "Näytä vuorovesiasemat" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Näytä virrat" @@ -3697,8 +3697,8 @@ msgstr "Näytä tekstit" msgid "Show depths" msgstr "Näytä syvyydet" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Poiju/Valo otsikot" @@ -3706,8 +3706,8 @@ msgstr "Poiju/Valo otsikot" msgid "Lights" msgstr "Valot" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Valojen kuvaukset" @@ -3723,18 +3723,18 @@ msgstr "Näytä näkyvät sektorivalot" msgid "Show chart data quality" msgstr "Näytä karttatietojen oikeellisuus" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Näyttökategoria" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Vakio" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Kaikki" @@ -3779,7 +3779,7 @@ msgstr "Käytä aktiivisena luettelona" msgid "Latest available catalog:" msgstr "Viimeisin saatavilla oleva luettelo:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Tietoja ei voi ladata URL-osoitteesta" @@ -3834,8 +3834,8 @@ msgstr "Epäonnistui: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4167,28 +4167,28 @@ msgstr "Vastaamalla \"Ei\" luot kaikki uudet reittipisteet tähän reittiin." msgid "Merge waypoints?" msgstr "Yhdistä reittipisteet?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Reittivälien tietoruutu" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile edellyttää että OpenGL on käytössä" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Jalat" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metrit" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Sylet" @@ -4196,7 +4196,7 @@ msgstr "Sylet" msgid "OverZoom" msgstr "Ylizoomaus" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Laajennettu vuorovesi-ikoni" @@ -4212,7 +4212,7 @@ msgstr "AIS-kohdekysely" msgid "Show all AIS Targets" msgstr "Näytä kaikki AIS-kohteet" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Vaimenna vaarattomat AIS-kohteet" @@ -4260,9 +4260,9 @@ msgstr "Käyttäjän X-siirtymä" msgid "User Y Offset" msgstr "Käyttäjän Y-siirtymä" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metriä" @@ -4273,11 +4273,13 @@ msgstr "Tämä reittiväli" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Konsoliteksti" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Konsoliarvo" @@ -4313,12 +4315,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Otsikko" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4347,7 +4349,7 @@ msgid "Less" msgstr "Vähemmän" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Muokkaa valittua kytkentää" @@ -4636,12 +4638,12 @@ msgstr "Jos otat lauseet vastaan tässä kytkennässä, käytä suodatinta molem msgid "Or consider using a different data port for one of them" msgstr "Vaihtoehtoisesti käytä jommassa kummassa eri porttia." -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN:n varoitus" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN tiedot" @@ -4650,17 +4652,17 @@ msgstr "OpenCPN tiedot" msgid "Sentence Filter" msgstr "Lausesuodatin" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Valitse kaikki" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Poista kaikki" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Lisää" @@ -4691,59 +4693,59 @@ msgstr "NMEA-lause on yleensä 3 merkkiä pitkä (kuten RMC, GGA jne.)\n" msgid "REGEX syntax error: \n" msgstr "Lausekkeen (REGEX) syntaksivirhe: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Yleistä" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Suodata NMEA-kurssi- ja -nopeustietoja" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Suodatusaika (s)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Näytä NMEA-tietovirtaikkuna" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Muotoile lähetykset Furuno GP3X:lle" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Käytä Garmin GRMN (Host) -tilaa lähetyksille" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "Käytä magneettisuuntia APB lauseiden lähetyksessä" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "NMEA0183-lähettäjätunnus" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Muokkaa kommunikoinnin prioriteetteja..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "NMEA0183-lähettäjätunnus" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Kytkennät" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "Lisää kytkentä..." -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "Muokkaa kytkentää..." -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Poista kytkentä" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Määritä uusi kytkentä" @@ -4801,7 +4803,7 @@ msgid "Install" msgstr "Asenna" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Asenna uudelleen" @@ -4809,7 +4811,7 @@ msgstr "Asenna uudelleen" msgid "Update" msgstr "Päivitä" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Palauta edellinen" @@ -4839,7 +4841,7 @@ msgid " successfully installed" msgstr " asennettu onnistuneesti" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Asennus on valmis" @@ -4847,6 +4849,21 @@ msgstr "Asennus on valmis" msgid "Installation error" msgstr "Asennusvirhe" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Merkit" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS-kohdetiedot" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "Karttatekstit" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "Ruudukkoteksti" @@ -4859,7 +4876,7 @@ msgstr "Odotetaan rasterikartan pakkaussäikeen loppumista." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN:n karttavälimuistin päivitys" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Etäisyys omasta aluksesta: %4.0f NMi" @@ -4992,7 +5009,7 @@ msgstr "Tämä reittipiste on osa kerrosta eikä sitä voi muokata" msgid "Icon" msgstr "Ikoni" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Yhdistelmä!" @@ -5002,7 +5019,7 @@ msgid "Links" msgstr "Linkit" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5043,22 +5060,22 @@ msgstr "Etäisyysrenkaat" msgid "Number" msgstr "Numero" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Etäisyys" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Väri" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Ei mitään" @@ -5148,16 +5165,16 @@ msgstr "Näytä vain skaalauksella" msgid "Tide Station not found" msgstr "Vuorovesiasemaa ei löytynyt" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Aseta mittakaava" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Kartan mittakaava" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Pysyvä" @@ -5189,35 +5206,35 @@ msgstr "NMEA Debug-ikkuna" msgid "Cannot load route or waypoint file: " msgstr "Reittiä tai reittipistettä ei voi ladata tiedostosta: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Käyttöliittymän alustus epäonnistui. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN:n käynnistäminen ei onnistu." -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Tarvittavia asetustiedostoja ei löytynyt. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Lisätietoja on lokitiedostossa " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " ." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " --[Siirrettävä(-p) suoritetaan osoitteesta " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Haetaan karttojen oletuskansio Windowsin rekisteristä" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN käynnistyi %ld ms:ssa." @@ -5276,8 +5293,8 @@ msgstr "Arvioitu kesto : " msgid "Remaining time : " msgstr "Jäljellä oleva aika: " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN:n karttapäivitys" @@ -5285,277 +5302,277 @@ msgstr "OpenCPN:n karttapäivitys" msgid "Anchorage created " msgstr "Ankkuri luotu " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Näytä työkalupalkki" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Piilota työkalupalkki" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "MIES YLI LAIDAN (MOB)" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 mpk COG:n suuntaan" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Väliaikainen MOB-reitti" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Oletettu 1 mailin kohta" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Aika: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Sijainti: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Lopeta jäljen tallennus" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Aloita jäljen tallennus" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Automaattiseuranta" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Suunta ylös -tila" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Lähennä" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Loitonna" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Suuremman mittakaavan kartta" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Pienemmän mittakaavan kartta" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Poistu OpenCPN:stä" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Navigoi" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Näytä karttapalkki" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Näytä ENC-tekstit" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Näytä ENC-valot" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Näytä ENC-syvyydet" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Näytä ENC ankkurointitiedot" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Näytä ENC-tietojen laatu" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Näytä navigointikohteet" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Näytä vuorovedet" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Vaihda kartan väriteema (päivä/hämärä/yö)" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Näytä" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Näytä AIS-kohteet" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Piilota ankkuroidut AIS-kohteet" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Näytä AIS-kohteiden jäljet" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Näytä CPA-hälytysikkunat" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Soita CPA-hälytykset" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Näytä CPA-varoitukset" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Mittaa matka" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Reittien, jälkien ja merkkienhallinta..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Luo reitti" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Aseta merkki veneen kohdalle" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Aseta merkki kursorin kohdalle" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Aseta MOB-merkki" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Ominaisuudet" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Työkalut" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Ikkuna" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN ohje" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Ohje" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Käynnistä OpenCPN uudelleen kielen tai tyylin vaihtamiseksi." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Alus " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Kierretty-tila" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Tulostusonglema.\n" "Kirjoittimesi asetukset saattavat olla virheelliset?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Nimeämätön reitti)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS, MIES YLI LAIDAN (MOB)" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Oma alus" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Väliaikainen AISMOB-reitti" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Näytä oma alus" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Aluksen sijainti: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " MOB-sijainti: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS, MIES YLI LAIDAN (MOB) PÄIVITYS" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Reittien, jälkien ja merkkien hallinta" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Tulosta kartta" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-välilyönti)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN ENC valmistelu" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC valmis." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5563,105 +5580,105 @@ msgstr "Luo oma nykyisiin asetuksiin perustuva asetusmalli.\n" "Tämä asetusmalli tallennetaan ja voidaan ottaa käyttöön koska tahansa.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI lisäominaisuudet" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Jälki" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Oletusjälki" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Jälki aina käytössä" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Ei koskaan jälkeä" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ohita tämä MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Käsittele tämä MMSI SART/PLB(AIS) MOB:na." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Muunna AIVDM AIVDO:ksi tässä MMSI:ssä" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Tämä MMSI on seuraaja - ei CPA hälytystä" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "MMSI-tunnus on yleensä yhdeksännumeroinen. \n" "Tarkista syöttämäsi MMSI ja peru tarvittaessa." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Oletus" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Aina" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Ei koskaan" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Muokkaa MMSI ominaisuuksia" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI ominaisuudet" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Jälki" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ohita" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Aluksen nimi" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Seuraaja" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Uusi..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Lisää MMSI ominaisuuksia" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5679,7 +5696,7 @@ msgstr "Valittuun laitteeseen ei saada yhteyttä; OpenCPN ei mahdollisesti pysty " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Katso lisätietoja tiedostosta LINUX_DEVICES.md asennusdokumenteista.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5699,1181 +5716,1176 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Katso lisätietoja tiedostosta LINUX_DEVICES.md asennusdokumenteista.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Oman aluksen suuntaviivan pituus (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Suuntaosoittimen pituus (mpk)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Aluksen kuvakkeen tyyppi" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Tosimittakaavan bittikartta" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Tosimittakaavan vektori" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Kokonaispituus (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Kokonaisleveys (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS anturin etäisyys keulasta (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS anturin etäisyys keskilaivasta (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Vähimmäiskoko ruudulla (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Näytä etäisyysrenkaat" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Etäisyysrenkaiden väli" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Etäisyysyksikkö" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Merimailia" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometriä" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "Minuutteja (aika)" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Etäisyysrenkaan väri" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Näytä suunta aktiiviseen reittipisteeseen" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Tyyli" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Kiinteä" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "piste" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Pitkä katkoviiva" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Lyhyt katkoviiva" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Pisteviiva" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Oletusväri" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Musta" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Tummanpunainen" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Tummanvihreä" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Tummankeltainen" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Tummansininen" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Tummanmagenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Tummansyaani" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Vaaleanharmaa" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Tummanharmaa" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Punainen" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Vihreä" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Keltainen" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Sininen" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Syaani" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Valkea" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Jäljet" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automaattinen päivittäinen jälki keskiyöllä" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automaattinen päivittäinen jälki" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Tietokone" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Korosta jäljet" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Korostusväri" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Jäljen tarkkuus" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Harva" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Keski" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Suuri" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Laske arvot" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Laske SOG ja COG sijainnin muutoksista" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Päivitysten välinen minimiaika sekunteina" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Reitit/pisteet" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Uudet reitit" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Aktiivinen reitti" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Säilytä aktiivinen reitti. Aktivoi reitti automaattisesti käynnistyksen yhteydessä" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Reittipisteen oletuskuvake" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Reittipisteympyrän säde (mpk)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Siirry seuraavaan reittipisteeseen vain saavuttaessa" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "Uudet merkit" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "Merkitse oletuskuvake" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "Näytä merkit vain, kun kartan skaalaus on suurempi kuin 1:" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Näytä aina ja ohita kartan skaalaukseen perustuvat näkyvyysasetukset" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "Merkin etäisyysrenkaat" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Reittipisteen etäisyysrenkaiden värit" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Asetukset" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "Lukitse merkit ja reittipisteet (paitsi, kun ominaisuusikkuna on avoinna)" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Vahvista jälkien ja reittien poisto" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Karttatiedostot" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Kansiot" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Lisää kansio..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Poista valitut" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Pakkaa valitut" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Lisää..." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Poista" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Pakkaa" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Kopioidaan karttoja..." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Päivityksen hallinta" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Hae kartat ja päivitä tietokanta" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Pakota tietokannan päivitys" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Valmistele kaikki ENC-kartat" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Asetusmallit" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Valitun asetusmallin tila" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Viimeksi käyttöön otetun asetusmallin otsikko:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Tallennetut asetusmallit" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Luo malli..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Poista valittu malli..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Käytä valittua mallia" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Luo malli" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Mallin käyttöönotossa on ongelma." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Edistyneet" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Oikaise rasterikartat" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Käytä kiihdytettyä grafiikkaa (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL asetukset" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Kartan käännön keskimääräinen aika" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "sekuntia" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Kartan zoomaus/mittakaava -painotus" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Rasteri" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektori" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 yksityiskohtien taso" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Näytön fyysinen leveys" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Automaattinen" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Käsiasetus:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Karttanäkymä" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Näytä rasterikartat pohjoinen ylös -asennossa" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Pienemmällä arvolla sama zoomaustaso näyttää vähemmän yksityiskohtia kartalla.\n" "Suuremmalla arvolla sama zoomaustaso näyttää enemmän yksityiskohtia kartalla." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafiikat" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Karttapalkki" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Näytä laajennetut karttapalkin tiedot." -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vektorikarttanäyttö" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Mariner's Standard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Syvyydet" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Kartan tieto-objektit" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Poijut/valot" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Laajennetut valosektorit" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Karttatekstit" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Kansalliset tekstit kartassa" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Vain tärkeät tekstit" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Selvennä tekstit" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Kartan yksityiskohta" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Vähemmän yksityiskohtia pienessä mittakaavassa" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "Vielä vähemmän yksityiskohtia pienessä mittakaavassa" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafiikkan tyyli" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Paperikartta" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Yksinkertaistettu" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Rajat" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Pelkistetty" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Symbolinen" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Värit" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 väriä" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 väriä" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Matala syvyys" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Turvasyvyys" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Syvävesi" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Käyttäjän valitsemat kohteet" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Palauta standardi" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Vuorovedet && virrat" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktiiviset tietosarjat" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Lisää tietosarja..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Kaikki käytettävissä olevat kartat" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Poista kartta" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Kaikki kartat" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Uusi ryhmä..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Poista ryhmä" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Säilytä mittakaava kartan vaihdossa" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Ohjaukset" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Tasainen vieritys / zoomaus" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoomaa kursorin kohdalla" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Näyttöominaisuudet" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Tilarivin asetukset" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Vaihtuva ETA kursorin kohdalla" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Veneen oletusnopeus " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Näytön asettelu" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Tilarivi" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Yksiköt" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Maamailia" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Solmuja" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Syvyys" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Lämpötila" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Astetta, desimaaliminuuttia" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Desimaaliasteet" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Astetta, minuuttia, sekuntia" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Suuntimat" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Näytä tosi" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Näytä magneettinen" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Oletettu eranto" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "astetta (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Tuulen nopeus " -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Näytä tosisuuntimat ja -kulkusuunnat" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Näytä magneettiset suuntimat ja kulkusuunnat." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM lisäosan laskema eranto" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Jos määrität erannon manuaalisesti,\n" " poista WMM lisäosa." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Testaa" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Äänitiedoston nimi:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Valitse äänitiedosto" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Syvyydet" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Ankkurihälytys" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Soita ääni ankkurihälytyksen yhteydessä." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Valitse ankkurihälytyksen ääni" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Soita ääni AIS-hälytyksen yhteydessä." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Valitse AIS-hälytyksen ääni" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART-hälytys" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Soita ääni AIS SART-hälytyksen yhteydessä." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Valitse AIS SART -hälytyksen ääni" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DCS-hälytys" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Soita ääni DSC-ilmoituksen yhteydessä." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Valitse DCS-viestin ilmoitusääni" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Äänilaitteen asetukset" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Tuntematon laite :" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Syöttölaite:" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Äänilaite" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Äänen soiton komento:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS-kohteet" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA-laskenta" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Älä näytä (T)CPA ilmoituksia, jos kohde on kauempana kuin (mpk)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Varoita, jos CPA pienempi kuin (mpk)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr ".. ja TCPA on vähemmän kuin (min)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Kadotetut kohteet" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Merkitse kohteet kadotetuiksi, kun on kulunut (minuuttia)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Poista kadotetut kohteet, kun on kulunut (minuuttia)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Näyttö" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Näytä kohteen COG-suuntanuoli, pituus (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Synkronoi AIS-suuntaviivan pituus oman aluksen COG-suuntaviivan pituuden kanssa" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Näytä kohteen jälki, pituus (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Piilota ankkuroidut ja kiinnitetyt kohteet, max nopeus (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Piirrä AIS-tosiaikaennuste, kohteen nopeus min (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Salli ei kriittisten kohteiden vaimentaminen, jos kohteita on enemmän kuin" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Näytä alueen tiedotteet (AIS binary viestit)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Näytä AIS-kohteiden todellinen koko" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Näytä AIS-kohteiden nimet, kun mittakaava on suurempi kuin 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Käytä WPL-sijaintiviestejä. Toiminto, kun viesti vastaanotetaan:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS-sijaintiraportti" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Luo merkki" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Tietoruutu" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Näytä reitti-/AIS-tiedot" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Aluksen nimi\" MMSI (Radiotunnus)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Class] tyyppi (tila)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG ja COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA ja TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA -hälytykset" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Näytä CPA/TCPA -hälytysruutu" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Soita ääni CPA/TCPA -hälytyksissä." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Testaa AIS-hälytyksen ääni" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Vaimenna ankkurissa tai laiturissa olevien kohteiden hälytys" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Ota käyttöön kohdehälytyksen aikakatkaisu (minuutteina)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Yleisasetukset" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Kieli" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Kirjasimet" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Valitse kirjasin..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Valitse kirjasinväri..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Esimerkki" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Työkalurivin ja -ikkunan tyyli" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Käyttöliittymän asetukset" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Näytä tilapalkki" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Näytä valikkorivi" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Näytä kompassi-/GPS-tilaikkuna" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Salli työkalurivin automaattinen piilotus" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Soita laivakelloa" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Salli kosketusnäyttöliittymä" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Salli sovitettu graafinen rajapinta" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Näytä zoomauspainikkeet" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Käytä sisävesien ECDIS" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Sisävesien ECDIS-käsikirja" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Käyttöliittymän suurennuskerroin" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Karttamerkkien suurennuskerroin" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Aluksen suurennuskerroin" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC-syvyystietojen suurennuskerroin" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC-tekstien suurennuskerroin" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Hiiren rullan zoomausherkkyys" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Käytä" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Kartat" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Kytkennnät" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Yhdistä" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Alukset" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Käyttö-\n" "liittymä" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Käyttäjä" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Lisäosat" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Käyttäjän määrittämä eranto" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "jalkaa" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "syltä" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Lisää karttatiedostoja sisältävä kansio" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - aluksen pituuden on oltava > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - aluksen leveyden on oltava > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - GPS poikkeama keskilaivasta on oltava aluksen leveyden sisäpuolella" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - GPS etäisyys keulasta on oltava aluksen pituuden aluella" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - aluksen kuvakkeen minimikoon tulee olla välillä 1-100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Oman aluksen todellisen koon asetukset eivät ole oikeat:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Sisävesien ECDIS-käsikirja ei ole paikallisesti saatavilla." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Haluatko lukea lisätietoja iECDIS-käsikirjan verkkosivuilta?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6883,15 +6895,15 @@ msgstr "Pakkaus muuttaa levyllä olevia tiedostoja.\n" "Pakattujen karttojen lataaminen ja näyttäminen voi kestää hieman kauemmin joissakin järjestelmissä. \n" "Ne voidaan purkaa uudelleen käyttäen unxz tai 7-zip -ohjelmia." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN pakkaa karttoja" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Yhtään karttaa ei ole löydetty pakattavaksi." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6900,71 +6912,71 @@ msgstr "pakattu %ld karttoja\n" " %.1fMB %.1fMB\n" "talletettu %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Kirjoita ryhmänimi" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Uusi karttaryhmä" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Valitse vuorovesi-/virtatieto" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Tekstuuripakkaus" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Tekstuuripakkaus välimuistiin" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Tekstuuripakkaus välimuistiin" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tekstuurimuisti (Mt)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Koko: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Uudista tekstuurivälimuisti" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Tyhjennä tekstuurivälimuisti" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Monikulmiotasoitus" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Viivatasoitus" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Ohjelmallinen OpenGL (Käynnistä OpenCPN uudelleen)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Käytä nopeutetua vieritystä" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Tekstuuriasetukset" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Tekstuurivälimuisti" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Sekalaista" @@ -7046,127 +7058,127 @@ msgstr "Katso lisätietoja järjestemän lokista." msgid " successfully installed from cache" msgstr " asennettiin onnistuneesti välimuistista" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Nämä asetukset saattavat tehdä OpenCPN:stä epästabiilin, minkä vuoksi ne on oletuksena poistettu käytöstä. Ottaen huomioon tämän riskin lisää CatalogExpert=1 rivi [PlugIns] osioon asetustiedostossa." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Lisäosaluettelo" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Päivitä lisäosaluettelo" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Tuo lisäosa..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Asetukset..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Poistettu käytöstä" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Päivitä lisäosaluettelo: master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN luettelopäivitys" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Luettelotiedostoa ei voida kopioida" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Luettelotiedostoa ei voida kopioida välimuistiin" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Luettelon päivitys onnistui" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Valitse arkistotiedosto" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Metatietojen purkaminen arkistotiedostosta epäonnistui." -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN lisäosan tuontivirhe" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Epäyhteensopiva hallintalisäosa." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Hallintalisäosan arkistotiedoston purkaminen epäonnistui." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Lisäosa" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "tuonti onnistui" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktiivinen luettelo" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Viimeisin luettelo" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Viimeisin muutos:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Päivitä lisäosaluettelo." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Poista asennus" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Poista lisäosa" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Asennuksen poisto" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Sallittu" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Päivitä versioon" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Asenna..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Päivitä " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Sivusto" @@ -7211,10 +7223,6 @@ msgstr "Satelliitit" msgid "OpenCPN Server Message" msgstr "OpenCPN-laitteen viesti" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS-kohdetiedot" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Vuorovesi/virrat tietoruutu" @@ -7332,12 +7340,6 @@ msgstr "Reitti jäljestä" msgid "Send to &Peer" msgstr "Lähetä &laitteelle..." -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Merkit" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "Näytä kaikki merkit" @@ -7541,15 +7543,15 @@ msgstr "mutta nykyinen kartan skaalaus on" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Tämän vuoksi uusi reittipiste ei ole näkyvissä tällä suurennuksella." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Reittipisteet lähetettiin" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Reittipisteen siirto epäonnistui. Garmin GPS ei ole kytketty" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Reittipisteen siirto epäonnistui. Tarkista lokitiedostot..." @@ -7854,11 +7856,11 @@ msgstr " (Sektorikulmat ovat tosisuuntia mereltä alukseen) msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

OpenCPN on sammunut virheellisesti edellisellä kerralla. Haluatko käynnistää\n" "ohjelman turvatilassa ilman liitännäisiä ja muita mahdollisesti ongelmallisia\n" "ominaisuuksia?\n" -"



Tutustu tarvittaessa luetteloon tunnetuista ongelmista.

" +"



Tutustu tarvittaessa luetteloon tunnetuista ongelmista.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7974,7 +7976,7 @@ msgstr "Tänään" msgid "Tomorrow" msgstr "Huomenna" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Vihjeet" @@ -8273,153 +8275,156 @@ msgstr "Siirrä reittipistettä" msgid "Dismiss" msgstr "Hylkää" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "Valitse yksiköt ja tietomuodot, joita haluat käyttää." -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Voit muuttaa koska vaan mitä tahansa asetuksia avaamalla asetusten ikkunan klikkaamalla " -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr " kuvake päätyökalurivillä." -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "Jos sinulla on jo karttoja asennettuna koneellasi, voit lisätä ne täällä." -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "Voit lisätä karttoja käyttämällä ohjelmaan integroitua Karttalatain -sovellusta." -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "Avaa karttalatain klikkaamalla " -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr " kuvaketta päätyökaluikkunassa ja valitse Kartat -> Karttalatain-välilehti." -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "

Tervetuloa OpenCPN:ään!

Ohjelman alkumääritys on nyt suoritettu. Voit aloittaa sovelluksen käytön.

" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "NMEA0183: UDP-portti %d" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "NMEA2000: UDP-portti %d" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "NMEA0183: %s TCP-portti %d" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "NMEA2000: %s TCP-portti %d" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "GPSd: %s TCP-portti %d" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." -msgstr "Etsitään Signal K -palvelimia..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." +msgstr "Etsitään navigoinnin tietolähteitä. Tämä kestää jonkin aikaa..." -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "Etsitään USB-laitteita..." -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "Etsitään UDP-tietosyötteitä..." -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "Etsitään TCP-palvelimia..." -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "Etsitään Signal K -palvelimia..." + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "Etsitään CAN-yhteyksiä..." -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "Etsitään GPSD-palvelimia..." -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "SignalK: %s (%s portti %d)" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "Järjestelmän navigointitietolähteet on etsitty." -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "Löydettyjen tietolähteiden kytkennät konfiguroidaan automaattisesti. Voit poistaa valinnan niistä tietolähteistä, joita et halua käyttää." -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "Nyt voit liittää toisia USB-laitteita tai yhdistää toiseen verkkoon. Päivitä lista painamalla \"Etsi uudelleen\"." -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Voit muuttaa koska vaan kytkentöjen asetuksia avaamalla asetusten ikkunan klikkaamalla " -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr " kuvaketta päätyökaluikkunassa ja valitse Yhdistä-välilehti." -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "Valitse karttatiedostoja sisältävä kansio" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "Yksiköt ja muodot" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "Asteet, minuutit desimaaleina (DD MM.MM)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "Asteet desimaaleina (DD.DDDDD)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "Asteet, minuutit, sekunnit (DD MM SS)" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "Näytä tosisuuntimat ja -kulkusuunnat" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "Näytä magneettiset suuntimat ja kulkusuunnat" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "Löydetyt navigointitietolähteet:" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "Etsi uudelleen..." -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "Lisää olemassa olevia karttoja" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "Lisää karttakansio..." - diff --git a/po/opencpn_fil_PH.po b/po/opencpn_fil_PH.po index 2a74874342..aac9d8a49d 100644 --- a/po/opencpn_fil_PH.po +++ b/po/opencpn_fil_PH.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Filipino\n" "Language: fil_PH\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Walang pangalang Track)" @@ -414,7 +414,7 @@ msgstr "SAR Aircraft" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Huling Kilala)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posisyon" @@ -509,11 +509,11 @@ msgstr "Kaliwa" msgid "Left" msgstr "Kanan" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Bilis" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitude" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Tulong sa Nabigasyon" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Ayon sa" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Tungkol sa OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Ang Mga Pagpipilian" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "I-Track ang mga Ari-arian" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "Kanselasayon - kanselahin ang lugar na natukoy ng Message Linkage ID" msgid "Undefined (default)" msgstr "Hindi natukoy (default)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Target na pangalan ng AIS" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS Alerto" @@ -3085,7 +3085,7 @@ msgstr "&Alerto sa Katahimikan" msgid "&Jump To" msgstr "&Tumalon sa" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Lumikha ng Waypoint" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS target list" @@ -3197,38 +3197,38 @@ msgstr "Tagabilang ng Target" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Talaan ng Track" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Ang kamakailang nahuling track ng target na ito ay naitala.\n" "Gusto mo bang ipagpatuloy ang pagtatala hanggang sa katapusan ng kasalukuyang sesyon ng OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AISTargetQuery" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Ihinto ang pagsunod" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Pagpipilian" @@ -3282,7 +3282,7 @@ msgstr "Ilipat ang Bangka Dito" msgid "Navigate To Here" msgstr "Pumunta Ka Dito" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Course Up Mode" @@ -3291,8 +3291,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "North Up Mode" @@ -3301,7 +3301,7 @@ msgid "Chart Up Mode" msgstr "Chart Up Mode" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "I-toggle ang boung iskrin" @@ -3326,7 +3326,7 @@ msgstr "Idikit ang Track" msgid "CM93 Offset Dialog..." msgstr "CM93 Offset Dialog..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Mga grupo ng tsart" @@ -3444,7 +3444,7 @@ msgstr "Kopyahin bilang KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Burahin" @@ -3598,18 +3598,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Paraan ng nabigasyon" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Hilagang taas" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Kursong taas" @@ -3617,32 +3617,32 @@ msgstr "Kursong taas" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Paraan ng pagtingin sa unahan" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Mga Pagpipilian sa Display" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Paganahin ang Chart Quilting" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Ipakita ang grid" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Ipakita ang mga Balangkas ng Tsart" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Ipakita ang lalim ng nga yunit" @@ -3662,7 +3662,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Ipakita ang mga Daloy" @@ -3678,8 +3678,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Buoy/Mga label ng liwanag" @@ -3687,8 +3687,8 @@ msgstr "Buoy/Mga label ng liwanag" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Diskripson sa Ilaw" @@ -3704,18 +3704,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Ipakita ang Kategorya" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Pamantayan" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Lahat" @@ -3760,7 +3760,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3815,8 +3815,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4148,28 +4148,28 @@ msgstr "Ang pagsagot ng \"Hindi\" ay lilikha ng lahat ng bagong hangganan para s msgid "Merge waypoints?" msgstr "Pagsamahin ang mga hangganan?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Talampakan" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metros" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Fathoms" @@ -4177,7 +4177,7 @@ msgstr "Fathoms" msgid "OverZoom" msgstr "Nasobraan sa Laki" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "ExtendedTideIcon" @@ -4193,7 +4193,7 @@ msgstr "AIS Target na tanong" msgid "Show all AIS Targets" msgstr "Ipakita ang lahat ng AIS Target" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Ang Attenuate na hindi gaanong kritikal ang mga AIS target" @@ -4241,9 +4241,9 @@ msgstr "User X Offset" msgid "User Y Offset" msgstr "User Y Offset" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metros" @@ -4254,11 +4254,13 @@ msgstr "Ang binting ito" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "I-konsuwelo ang Alamat" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "I-konsuwelo ang Halaga" @@ -4294,12 +4296,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4328,7 +4330,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4617,12 +4619,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Babala ng OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Impormasyong OpenCPN" @@ -4631,17 +4633,17 @@ msgstr "Impormasyong OpenCPN" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Piliin lahat" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Alisin lahat" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Dagdagan" @@ -4667,59 +4669,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Pangkalahata" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4777,7 +4779,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4785,7 +4787,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4815,7 +4817,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4823,6 +4825,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS Gumulong" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4835,7 +4852,7 @@ msgstr "Naghihitay para sa raster tsart kompresyon thread na labasan." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distansya mula sa Nagmamay-ari: %4.0f NMi" @@ -4956,7 +4973,7 @@ msgstr "" msgid "Icon" msgstr "Icon" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4966,7 +4983,7 @@ msgid "Links" msgstr "Mga link" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5007,22 +5024,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distansya" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Kulay" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Wala" @@ -5111,16 +5128,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Masigasig" @@ -5152,35 +5169,35 @@ msgstr "NMEA Debug Window" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5228,8 +5245,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5237,381 +5254,381 @@ msgstr "" msgid "Anchorage created " msgstr "Ang Bunsuran ay nagawa na " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Paganahin ang Tracking" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Kusang Sumusunod" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Palakihin" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Paliitin" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Ipakita ang Bar ng Tsart" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Ipakita ENC na teksto" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Ipakita ang Laki ng Tubig" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Palitan ang Pamamaraan ng Kulay" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Ipakita ang AIS ng mga target" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Lunikha ng Ruta" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Maglagay ng MOB Marker" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Mga Kagustuhan" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "May problema sa printing.\n" "Baka ang iyong ginamit na printer ay hindi maayos ang pagkalagay?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Walang pangalang Ruta)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Sariling Barko" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Route & Mark Manager" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Mag-print ng mga Chart" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI Extended Properties" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Pagsubaybay" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Default na pagsubaybay" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Laging subaybayan" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Hindi kailanmang susubaybayan" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Balewalain ang MMSI na ito" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Hawakan ang MMSI na ito bilang SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "I - convery ang AIVDM sa AIVDO para sa MMSI na ito" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Ang MMSI na ito ay aking Follower - Walang CPA Alert" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Ang isang MMSI Id ay karaniwang isang bilang ng mga siyam na digit.\n" "Pakiusap i-tsek ang iyong entries at i-kansela kung kinakailangan." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Default" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Lagi" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Hinde kailanman" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "I-edit ang MMSI Properties" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Mga ari-arian ng MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Track Mode" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Balewalain" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Pangalang ng barko" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Tagasunod" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Bago..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Magdagdag MMSI na pag-aari" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5622,7 +5639,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5634,1180 +5651,1175 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Haba ng COG Predictor (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Heading Predictor Length (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Uri ng Ship Icon" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Tunay na Scale Bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Tunay na Scale Vector" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Kabuuang Haba (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Kabuuang Lapad (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS Offset mula sa Bow (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS Offset mula sa Midship (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Pinakamababang Sukat ng Screen (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Ipakita ang saklaw ng mga ring" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distansiya sa pagitan ng mga ring" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Yunit ng Layo" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Milyang nauukol sa dagat" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometro" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Saklaw ng kulay ng singsing" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Istilo" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Matatag" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Tuldok" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Mahabang gitling" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Maikling gitling" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Tuldok gitling" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Nakadefault na kulay" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Itim" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Matingkad na Pula" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Matingkad na Berde" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Matingkad na Dilaw" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Matingkad na Asul" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Matingkad na Pula" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Matingkad na Cyan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Bahagyang abo" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Matingkad na abo" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Pula" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Berde" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Dilaw" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Asul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Pula" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cyan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Puti" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Ang mga sumubaybay" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatic Daily Tracks sa hating-gabi" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatic Daily Tracks sa" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Kompyuter" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "I-highlight ang mga track" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Ang pagsubaysabay sa katiyakan" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Mababa" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Katamtaman" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Mataas" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Kalkulahin ang mga halaga" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Kalkulahin ang SOG at COG mula sa mga pagbabago ng posisyon" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Min segundo sa pagitan ng mga update" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Pagdating ng waypoint ng bilog na radius (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Paunang ruta ng waypoint sa pagdating lamang" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Saklaw na mga kulay ng singsing na waypoint" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Ikumpirma ang pagtatanggal ng mga track at ruta" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Mga payl ng tsart" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Mga direktoryo" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Magdagdag ng Direktoryo..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Tanggalin ang Napili" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "I-kopress ang Napili" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Tanggalin" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Kontrol sa pag-Update" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Skan ang mga Tsart at I update ang Database" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Pwersahin ang muling pagtayo ng buong database" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Ihanda ang lahat ng ENC na mga tsart" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Naisulong" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "De-skew Raster Charts" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Gumamit ng Accelerated Graphics (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Chart Rotation Averaging Time" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "segundos" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Pag-zoom ng tsart/pag-iskala ng bigat" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vector" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Pisikal na Lapad ng Iskrin" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Awto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manwal:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Display ng tsart" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Ipakita ang Skewed Raster Charts bilang North-Up" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Sa mababang halaga, ang parehong lebel ng pagpapalapit ay nagpapakita ng mababang detalye sa tsart.\n" "Sa mataas na halaga, sa parehong lebel ng pagpapalapit at nagpapakita ng maraming detalye sa tsart." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grapiks" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Ipakita ang vector na tsart" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Pamantayan ng mga Marino" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Lalim ng pagpatunog" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Mga bagay ng impormasyon ng start" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Buoys/Mga liwanag" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Pinalawak na Sektor ng Ilaw" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Tsart ng mga Teksto" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Pambansang teksto sa tsart" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Mahalagang Teksto Lamang" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "De-cluttered na Teksto" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Detalye ng Tsart" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Bawasan ang Detalye at Maliit na Sukat" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Mga Istilo ng Grapiks" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Tsart na papel" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Pasimplehin" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Mga hangganan" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Karaniwan" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Isinisimbolo" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Mga kulay" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "Dalawang kulay" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "Apat na Kulay" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Mababaw na Lalim" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Lalim ng kaligtasan" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Malalim na lalim" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "I-reset sa STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Taas ng tubig && mga alon" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktibong mga set ng data" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Idagdag ang set ng data..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Lahat ng mga magagamit na tsart" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Alisin ang tsart" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Lahat ng mga tsart" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Bagong pangkat..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Burahin ang pangkat" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Pangalagaan ang scale kapag naglilipat ng mga tsart" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Mga kontrol" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Makinis na pag-pan / pag-zoom" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "I-zoom para ituro" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Ipakita ang mga feature" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Pagpipilian ng katayuan ng bar" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Buhay na ETA sa pagturo" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "I-default ang bilis ng bangka " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Mga yunit" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Batas na mga milya" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Mga buhol" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Lalim" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Degrees, Decimal Minutes" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Decimal na antas" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Degrees, Minutos, Segundos" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Direksyon" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Ipakita na tunay" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Ipinagpalagay magnetic na pagkakaiba-iba" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Ipakita ang mga tamang tindig at mga patutunguhan" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Ipakita ang mga magnetic na tindig at mga patutunguhan." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM Isasak ang nakalkulang magnetic na pagkakaiba-iba" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Para e set ang magnetic variation ng mano-mano,\n" "kailangan mong i-disable ang WMM plugin." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Pumili ng File ng Tunog" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS mga Target" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Pagkalkula ng CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Walang alerto sa (T)CPA kung ang saklaw ng target ay mas malaki pa sa (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Magbabala Kung ang CPA mas Maliit kaysa sa (NMi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...at TCPA ay mas maliit pa sa (min)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Nawala ang mga Target" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Markahan ang traget bilang nawala pagkatapos (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Alisin ang nawalang mga target pagkatapos (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Ipakita" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Ipakita ang target COG predictor arrow, ang have (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Ipakita ang target na mga track, haba (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Supilin ang nakaangkla/nakapugal na mga target, pinakamataas na bilis (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Payagan ang pagpapalambing ng mas mababa sa kritikal na mga target kung higit sa ... mga target" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Ipakita ang mga abiso ng lugar (mula sa mensahe ng AIS binary)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Ipakita ang tunay na laki ng mga AIS target" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Ipakita ang mga pangalan na may AIS target sa sukat na mas mataas kaysa sa 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "I-rollover" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Pangalan ng Barko\" MMSI (Palatandaang Tawag)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Class] Klase (Katayuan)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Mga Alerto sa CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Ipakita ang CPA/TCPA Alert Dialog" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "I-play ang Tunog sa CPA/TCPA Alerts at sa mga emerhensiya ng DSC/SART." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Paganahin ang timeout ng Target Alert Acknowledge (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Mga pangkalahatang opsyon" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Lengguwahe" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Mga Fonts" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Pumili ng Font..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Pumili ng Kulay ng Font..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Toolbar and Window Style" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Mga opsiyon sa interface" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Ipakita ang Status Bar" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Ipakita ang Menu Bar" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Ipakita ang Compass/GPS STATUS Window" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Pagahanin ang Toolbar auto-hide" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Maglaro ng mga Bell ng Barko" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Paganahin ang interface ng Touchscreen" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Paganahin ang interface ng Scale Graphics" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Salik ng pagsukat ng User Interface" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Salik sa pagsukat Chart Object" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Salik ng pagsukat ng barko" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Mag - aplay" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Mga Tsart" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Mga koneksiyon" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Mga barko" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "User Interface" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Mga plugin" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Pagtakda ng user ng pagkakaiba-iba ng magnetic" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "paa" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "mga fathom" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Magdagdag ng isang direktoryo na naglalaman ng mga tsart file" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - ang haba ng iyong barko ay kailangang > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - ang sinag ng iyong barko ay kailangang > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - ang iyong GPS offset mula sa midship ay kailangang nasa loob ng sinag ng iyong barko" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - ang iyong GPS offset mula sa midship ay kailangang nasa loob ng haba ng iyong barko" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - ang pinakamababang sukat ng icon ng iyong barko ay dapat na nasa pagitan ng 1 at 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Ang mga setting para sa tunay na sukat ng sariling barko ay hindi tama:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6817,15 +6829,15 @@ msgstr "Ang pagsisiksik ay babaguhin ang tsart ng mga file sa disk. \n" "Ang nasiksik na mga tsart ay maaaring medyo tumagal ng mas mahaba upang makarga at maipakita sa ilang mga sistema. \n" "Sila ay maaaring bawasan muli gamit ang mga programang unxz o 7 zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Siniksik na mga Tsart" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Walang mga tsart na natagpuan na isiksik." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6834,71 +6846,71 @@ msgstr "isiksik %ld mga tsart\n" "mula sa %.1fMB na %.1fMB\n" "nai-save %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Maglagay ng Pangalan ng Grupo" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Bagong Pangkat ng Tsart" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Pumili ng Tide/Kasalukuyang data" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Pagkakasiksik ng Texture" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Pagkakasiksik ng Texture na may Caching" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Pagkakasiksik ng Texture na may Caching" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Texture Memory Size (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Sukat: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Muling itayo ang Texture Cache" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Linisin ang Texture Cache" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Pagpapakinis ng polygon" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Pagpapakinis ng linya" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "OpenGL na Software (buksang muli ang OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Gumamit ng pinabilis na pag-pan" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Mga setting ng texture" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Cache ng texture" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Iba`t ibang" @@ -6980,127 +6992,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7145,10 +7157,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS Gumulong" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TideCurrentGraphRollover" @@ -7266,12 +7274,6 @@ msgstr "Ruta mula sa Track" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7475,15 +7477,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7788,7 +7790,7 @@ msgstr "(Ang mga anggulo ng sektor ay totoong mga tindig mula sa p msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7904,7 +7906,7 @@ msgstr "Ngayong araw" msgid "Tomorrow" msgstr "Kinabukasan" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Tips ng kasangkapan" @@ -8186,153 +8188,156 @@ msgstr "Ilipat ang waypoint" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_fr_FR.po b/po/opencpn_fr_FR.po index f331bb1dfb..51f435c5a2 100644 --- a/po/opencpn_fr_FR.po +++ b/po/opencpn_fr_FR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Trace sans nom)" @@ -414,7 +414,7 @@ msgstr "Avion de recherche SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr "(Dernier connu)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Position" @@ -509,11 +509,11 @@ msgstr "Droite" msgid "Left" msgstr "Gauche" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Vitesse" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitude" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Vent, Vitesse" @@ -584,7 +584,7 @@ msgstr "Écart de niveau d'eau Réf. : " #: model/src/ais_target_data.cpp:930 model/src/ais_target_data.cpp:1193 msgid "Water level" -msgstr "Niveaux d'eau" +msgstr "Niveau de l'eau" #: model/src/ais_target_data.cpp:940 msgid "Surface current " @@ -605,11 +605,11 @@ msgstr "Houle : Hauteur, période " #: model/src/ais_target_data.cpp:979 msgid "Air Temperatur" -msgstr "Air : Température" +msgstr "Température de l'air" #: model/src/ais_target_data.cpp:980 msgid "Air pressure" -msgstr "Air : Pression" +msgstr "Pression de l'air" #: model/src/ais_target_data.cpp:994 msgid "Relative Humidity" @@ -621,7 +621,7 @@ msgstr "Point de rosée" #: model/src/ais_target_data.cpp:1010 msgid "Water Temperatur" -msgstr "Eau : Température" +msgstr "Température de l'eau" #: model/src/ais_target_data.cpp:1011 msgid "Sea state" @@ -645,7 +645,7 @@ msgstr "Oui" #: model/src/ais_target_data.cpp:1041 msgid "Sea salinity" -msgstr "Mer : Salinité" +msgstr "Salinité de la mer" #: model/src/ais_target_data.cpp:1043 msgid "Ice status" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Aide à la navigation" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -848,7 +848,7 @@ msgstr "Cité du Vatican" #: model/src/ais_target_data.cpp:1435 model/src/ais_target_data.cpp:1439 msgid "Cyprus" -msgstr "Chipre" +msgstr "Chypre" #: model/src/ais_target_data.cpp:1437 model/src/ais_target_data.cpp:1449 msgid "Germany" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mile/h" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "Les WP vont être renommés pour refléter l'ordre naturel, les noms ser " Voulez vous les renommer ?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "À propos d'OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Écraser la route numéro 1 de l'appareil Garmin ?" msgid "OpenCPN Message" msgstr "Message d'OpenCPN" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Options :" @@ -2543,7 +2543,7 @@ msgstr "Trace sélectionnée : Imprimer" msgid "Track properties" msgstr "Propriétés de la trace" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "Configuration initiale d'OCPN" @@ -2556,12 +2556,12 @@ msgstr "Configuration initiale d'OCPN" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "API du plugin : " msgid "OpenCPN Website" msgstr "Site web OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Documentation d'aide pour OpenCPN : indisponible localement." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Voulez-vous visiter le site opencpn.org pour plus d'informations ?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Annulation : Annuler la zone identifiée par le code du message associé msgid "Undefined (default)" msgstr "Indéfini (par défaut)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nom de la cible AIS" @@ -3089,7 +3089,7 @@ msgstr "\n" "Une trace persistante sera donc redémarrée pour cette cible.\n\n" "Voulez-vous plutôt arrêter le suivi persistant pour cette cible ?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Alerte AIS" @@ -3105,7 +3105,7 @@ msgstr "Alerte silencieuse" msgid "&Jump To" msgstr "Aller à" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Waypoint : Créer" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Liste des cibles AIS" @@ -3217,38 +3217,38 @@ msgstr "Nombre de cibles" msgid "Undock Target List" msgstr "Libération des Cibles " -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Trace : Enregistrer" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "La trace de cette cible AIS a été enregistrée.\n" "Voulez-vous continuer à l'enregistrer jusqu'à la fin de la session en cours d'OpenCPN ?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Données de cible AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Ok" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Trace : Arrêter" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3302,7 +3302,7 @@ msgstr "Placer le bateau ici" msgid "Navigate To Here" msgstr "Naviguer jusqu'ici" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "COG vers le haut : Activer" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Proue_en_haut" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Nord vers le haut : Activer" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Mode haut de la carte en haut" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Plein écran : Oui/Non" @@ -3346,7 +3346,7 @@ msgstr "Coller la trace" msgid "CM93 Offset Dialog..." msgstr "CM93 : Gestion des réglages ..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Groupes" @@ -3464,7 +3464,7 @@ msgstr "Format KML : Copier" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Supprimer" @@ -3618,18 +3618,18 @@ msgstr "Envoyer la trace au pair d'OpenCPN" msgid "Chart Panel Options" msgstr "Options d'affichage" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Mode de navigation" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Nord en haut" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "COG vers le haut" @@ -3637,32 +3637,32 @@ msgstr "COG vers le haut" msgid "Heading Up" msgstr "Proue en haut" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Bateau : Voir loin" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Affichage : Voir" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Mosaïque" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Grille" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Bordure" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Profondeur : Unité" @@ -3682,7 +3682,7 @@ msgstr "Marées/Courants :" msgid "Show Tide stations" msgstr "Marées : Stations" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Les courants" @@ -3698,8 +3698,8 @@ msgstr "Texte: Voir" msgid "Show depths" msgstr "Sondes" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Bouées/Feux : Nom" @@ -3707,8 +3707,8 @@ msgstr "Bouées/Feux : Nom" msgid "Lights" msgstr "Feux" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Feux : Particularités" @@ -3724,18 +3724,18 @@ msgstr "Bateau rend secteurs visibles" msgid "Show chart data quality" msgstr "Qualité données cartes : Voir" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Contenu affiché" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Tout" @@ -3780,7 +3780,7 @@ msgstr "Utiliser comme catalogue actif" msgid "Latest available catalog:" msgstr "Dernier catalogue disponible :" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Mise à jour impossible." @@ -3835,8 +3835,8 @@ msgstr "Erreur : " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Répondre «Non» : Les nouveaux waypoint de cette route seront créés. msgid "Merge waypoints?" msgstr "Fusionner les waypoint ?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Données du segment route" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile nécessite l'activation d'OpenGL" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Pieds" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Mètres" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Brasses" @@ -4197,7 +4197,7 @@ msgstr "Brasses" msgid "OverZoom" msgstr "Zoom excessif" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Hauteur de marée ( sous l'indicateur)" @@ -4213,7 +4213,7 @@ msgstr "Données de cible AIS" msgid "Show all AIS Targets" msgstr "Voir toutes les cibles AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Peu critiques : Atténuer" @@ -4261,9 +4261,9 @@ msgstr "Perso. : X" msgid "User Y Offset" msgstr "Perso. : Y" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "mètres" @@ -4274,11 +4274,13 @@ msgstr "Ce segment" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Légende de la console" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Valeur de la console" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Titre" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Moins" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Editer la connexion sélectionnée" @@ -4637,12 +4639,12 @@ msgstr "Si vous activez cette entrée, veuillez appliquer un filtre sur les deux msgid "Or consider using a different data port for one of them" msgstr "Ou envisagez d'utiliser un port de données différent pour l'un d'eux" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Alerte d'OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Informations OpenCPN " @@ -4651,17 +4653,17 @@ msgstr "Informations OpenCPN " msgid "Sentence Filter" msgstr "Filtre de phrases" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Tout sélectionner " -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Sélectionner : rien" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Ajouter" @@ -4691,59 +4693,59 @@ msgstr "Une phrase NMEA est généralement composée de 3 caractères (RMC, GGA. msgid "REGEX syntax error: \n" msgstr "REGEX erreur de syntaxe \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Général" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "NMEA : Filtre des données COG et vitesse" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Période de filtrage (sec.)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Ouvrir la fenêtre montrant les données NMEA" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Format de téléchargement pour Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Utiliser le mode Garmin GRMN (Hôte) en téléchargement" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "NMEA : Pour les phrases NMEA APB, utiliser, en sortie, le cap du compas magnétique au lieu du COG du GPS" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "Identificateur du réseau NMEA0183 actif" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Ajuster les priorités de communication..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "Identificateur du réseau NMEA0183 actif" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Gestion des ports de connexion " -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "Ajouter une connexion..." -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "Éditer la connexion..." -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Supprimer une connexion" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Configurer une nouvelle connexion" @@ -4801,7 +4803,7 @@ msgid "Install" msgstr "Installer" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Réinstaller" @@ -4809,7 +4811,7 @@ msgstr "Réinstaller" msgid "Update" msgstr "Mettre à jour" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Retourner à une version antérieure" @@ -4839,7 +4841,7 @@ msgid " successfully installed" msgstr " Installation réussie" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Installation terminée" @@ -4847,6 +4849,21 @@ msgstr "Installation terminée" msgid "Installation error" msgstr "Erreur d'installation" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Marques" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Info par survol d'une cible AIS" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "Textes des cartes" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "GridText" @@ -4859,7 +4876,7 @@ msgstr "Waiting for raster chart compression thread exit." msgid "OpenCPN Compressed Cache Update" msgstr "Mise à jour du cache compressé OpenCPN" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distance au bateau : %4.0f M" @@ -4992,7 +5009,7 @@ msgstr "Ce waypoint, appartient à une couche, ne peut être édité" msgid "Icon" msgstr "Icône" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Liste déroulante !" @@ -5002,7 +5019,7 @@ msgid "Links" msgstr "Liens" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5043,22 +5060,22 @@ msgstr "Rayon des cercles" msgid "Number" msgstr "Nombre" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Cumul" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Couleur" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Aucun" @@ -5148,16 +5165,16 @@ msgstr "Voir uniquement à l'échelle" msgid "Tide Station not found" msgstr "Station de marée introuvable" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Définir l'échelle" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Échelle de la carte" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Persistant" @@ -5189,35 +5206,35 @@ msgstr "Affichage des phases NMEA" msgid "Cannot load route or waypoint file: " msgstr "Impossible de charger le fichier route ou waypoint : " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Echec de l'initialisation de l'interface utilisateur" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN ne peut pas démarrer" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Les fichiers de configuration nécessaires sont introuvables" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Voyez le fichier log à :" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "Pour plus de détails." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " --[Version portable(-p) exécutée à partir de (ou depuis) " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Récupération du dossier, contenant les cartes, initialement défini dans le registre Windows." -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN est initialisé à %ld ms." @@ -5272,8 +5289,8 @@ msgstr "Durée estimée : " msgid "Remaining time : " msgstr "Durée restante : " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN met à jour la liste des cartes" @@ -5281,277 +5298,277 @@ msgstr "OpenCPN met à jour la liste des cartes" msgid "Anchorage created " msgstr "Mouillage créé" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Barre d'icônes : Voir" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Cacher la barre d'icônes" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "Homme à la mer (MOB)" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " à " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " Activé " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 NM sur le cap du COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Route temporaire de retour au MOB" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Position estimée : 1 mille." -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Temps : " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Position : " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Désactiver la trace" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Trace : Enregistrer" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Centrage automatique" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Proue en_haut " -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Zoomer" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Dézoomer" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Echelle de carte plus grande" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Echelle de carte plus petite" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Fermer OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Naviguer" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Barre des cartes : Voir" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Textes des cartes ENC : Voir" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Feux des cartes ENC : Voir" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Sondes des cartes ENC : Voir" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Informations de mouillage : Voir" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Qualité des données ENC : Voir" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Voir les objets" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Voir les marées" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Choisir l'affichage : Jour / Crépuscule / Nuit / Aube" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "Voir" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Voir les cibles AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Cacher les cibles AIS mouillées" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Traces : Afficher celles des cibles AIS" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Voir les alertes CPA" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Alarmes sonores des CPA" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Afficher les avertissements CPA" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Distances : Mesurer" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Gestionnaire de routes, traces, marques et couches ..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Route : Créer" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Placer une marque sous le bateau" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Placer une marque sous le curseur" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Insérer une marque MOB (Homme à la mer)" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Préférences" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "Outils" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "Fenêtre" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Aide d'OpenCPN" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "Aide" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Redémarrez OpenCPN pour mettre à jour la langue ou changer le style" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Bat. " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Carte : Mode rotation" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Problème d'impression.\n" " Votre imprimante est elle bien configurée ?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Route sans nom)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS HOMME A LA MER" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Utilisateur" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Route temporaire de retour à l'AISMOB" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Bateau présent" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Position du bateau :" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "Position du MOB :" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "Mise à jour de l'AIS HOMME A LA MER" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Gestionnaire de routes, traces, marques et couches" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Imprimer la carte" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Espace)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "Analyser les cartes ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "Analyse terminée." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5559,105 +5576,105 @@ msgstr "Créer un modèle de configuration privé basé sur les paramètres actu "Ce modèle sera sauvegardé, et pourra être sélectionné pour une utilisation ultérieure à tout moment.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Propriétés étendues du MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Suivi" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Suivre par défaut" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Toujours suivre" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Ne jamais suivre" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorer ce MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Considérer ce MMSI comme émis par une balise personnelle de localisation SART (MOB)." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Convertir les phrases AIVDM en AIVDO pour ce MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Ce MMSI est mon follower - Pas d'alerte CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Un MMSI est un numéro, de 9 chiffres.\n" "S'il vous plait, vérifiez ce que vous avez entré et corrigez si nécessaire." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Défaut" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Toujours" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Jamais" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "MMSI : Editer les propriétés" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI : Gestion" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Mode trace" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorer" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB (Homme à la mer)" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM ---> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nom du bateau" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Follower" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Nouveau ..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "MMSI : Ajouter des propriétés" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5675,7 +5692,7 @@ msgstr "The device selected is not accessible; opencpn will likely not be able\n " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5695,1183 +5712,1178 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG : Flèche de prédiction de la route, taille en minutes" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Longueur de la flèche de prédiction (M)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Bateau : Caractéristiques, icône" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Echelle réelle en bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Echelle réelle vectorielle" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Longueur hors tout (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "largeur hors tout (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Distance entre la proue du bateau et l'antenne du GPS (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Distance entre l'axe du bateau et l'antenne du GPS (m, - si côté babord, + si côté tribord)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Taille minimale à l'écran (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Cercles : Voir" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distance entre deux cercles" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Dist. entre 2 cercles : Unité" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Milles marins" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilomètres" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "Minutes (heure)" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Couleur des cercles" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Voir la direction du WP actif" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Style" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Trait plein" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Pointillé" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Tiret long" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Tiret court" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Trait mixte" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Couleur par défaut" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Noir" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Rouge foncé" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Vert foncé" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Jaune foncé" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Bleu foncé" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta foncé" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Cyan foncé" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Gris clair" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Gris foncé" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Rouge" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Vert" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Jaune" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Bleu" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cyan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Blanc" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Traces" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Trace journalière automatique à minuit" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Trace journalière automatique à" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Ordinateur" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Trace : Surligner" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Couleur en surbrillance" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Précision de la trace" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Faible" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Moyenne" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Grande" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Calculer les valeurs" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Calculer SOG & COG en fonction de la position" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Durée (Secondes) entre mises à jour" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Routes/Waypoint" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Routes : Créer" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Route Active" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Route persistante, activer automatiquement au démarrage" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Icône par défaut" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Waypoint de destination : Rayon du cercle d'approche (M)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Arrivée seulement : Anticiper le waypoint " -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "Nouvelles marques" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "Icône par défaut des marques :" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "Voir les waypoint seulement à une échelle plus grande que 1 /" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Réglages de visibilité basée sur l'échelle : Remplacer, Voir toujours" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "Cercles : Voir" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Couleurs des cercles centrés sur les waypoint" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Options générales" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "Verrouiller les waypoint ( sauf si la fenêtre de propriétés de l'un d'eux est ouverte)" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Confirmer la suppression des routes et traces" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Dossiers" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Dossiers actifs des cartes : Chemins" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Dossier : Ajouter ..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Sélection : Retirer" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Sélection : Compresser" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Ajouter ..." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Supprimer" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Compresser" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Cartes, Migrer ..." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Contrôler la mise à jour" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Dossier, Base de données : Analyse, Mise à jour" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Base de données : La reconstruire" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Cartes ENC : Les analyser " -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modifié]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Modèles" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Statut du modèle" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Titre du dernier modèle utilisé :" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Modèles enregistrés" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Modèle nouveau : Créer ..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Modèle choisi : Retirer" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Modèle choisi : Utiliser" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Créer une configuration" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Problème dutilisation de la configuration sélectionnée." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avancées" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Redresser les cartes rasters obliques" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Utiliser la technologie OpenGL\n" "d'accélération graphique" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL : parametrage" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Durée moy. avant rotation des cartes" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "Secondes" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Pondérer qté de détails/niveau de zoom" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vectorielle" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 : Niveau de détails" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Largeur physique de l'écran" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manuel :" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Cartes" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Cartes raster obliques : Voir nord vers le haut." -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "A niveau de zoom égal, pour une valeur :\n" " plus faible, la carte choisie est moins détaillée.\n" " plus forte, la carte choisie est plus détaillée." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Carte graphique" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Barre de carte" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr " Barre de cartes étendue.Voir les informations" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vectorielles" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Objets affichables" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Voir : Sondes" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Cartes : Données sur les objets." -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bouées/feux" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Rollover : Voir secteurs des feux" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Textes des cartes" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Carte : Texte en langue nationale" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Voir : Textes importants seulement" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Désencombrer le texte" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Détail de la carte" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Détails à petite échelle : Réduire" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "Réduction supplémentaire des détails à petite échelle" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Style graphique" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Carte papier" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplifiés" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Limites de zones de cartes" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Pointillées" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Crénelées" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Nombre de zones colorées" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "Couleurs : 2" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "Couleurs : 4" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Faible profondeur" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Profondeur de sécurité" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Eaux profondes" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Objets affichables" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Réinitialiser à \"Standard\"" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Marées-Courants" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Données actives" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Données : Ajouter ..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Tous les dossiers activés de cartes" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Retirer du groupe" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Toutes les cartes" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nouveau groupe" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Supprimer le groupe" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Echelle : Préserver lors d'un changement de carte" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Commandes" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Activer le lissage Panoramique" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoomer en centrant sur le curseur" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Afficher" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Barre d'état\n" "et/ou, plugin Status bar :" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Durée : Bateau à position de la souris" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Vitesse utilisée" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Nombre de panneaux" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Barre d'état" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unités" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Mile terrestre Américain" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Noeud" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "M/h" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Profondeur" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Température" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Degrés, Minutes décimales" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Degrés décimaux" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Degrés, Minutes, Secondes" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Relèvements" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Voir dir. vraie" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Dir. magnétique" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Déclinaison magnétique supposée" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "Deg (- O, + E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Vitesse du vent:" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Relèvements/directions vrais : Voir" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Relèvements/directions mag. Voir." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Complément \"Modèle magnétique mondial\"" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Régler la déclinaison magnétique manuellement, \n" " vous devez désactiver le plugin WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Tester" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Fichier son :" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Son joué : Sélectionner" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Alertes : Sons " -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Alerte de mouillage" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Si alerte mouillage : Jouer le son" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Mouillage : Choisir le son joué " -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Si alerte AIS : Jouer le son" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "AIS : Choisir le son joué" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "Alarme SART" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Si alerte SART : Jouer le son " -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "SART : Choisir le son joué" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "Alarme DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Si alerte DSC : Jouer le son" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "DSC : Choisir le son joué" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Périphérique audio, configuration" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Périphérique inconnu : " -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Périphérique d'entrée :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Périphérique son" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Commande d'action audio :" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Cibles AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA : Calcul du point d'abordage le plus proche" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Aucune alerte (T)CPA si la cible est à une distance supérieure à (M)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Déclencher un avertissement si le CPA est inférieur à... (milles) :" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "... et la durée vers le CPA (TCPA) est inférieure à ... (minutes) :" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Cibles perdues" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Marquer les cibles comme perdues après ... minutes :" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Effacer les cibles perdues après ... minutes" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Affichage" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "COG : Voir les flèches indiquant la route fond, longueur (en minutes)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Synchroniser la longueur des flèches AIS avec le prédicteur COG de votre vaisseau" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Voir les traces, longueur (en minutes)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Supprimer des cibles ancré/amarré, vitesse max (noeuds)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Voir chaque cible AIS en temps réel, vitesse min de la cible (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Permettre l'atténuation des cibles moins critiques s'il y a plus de... cibles" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Voir les avis de zone (à partir des données AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Voir les cibles AIS en taille réelle" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Voir les noms des cibles AIS à une échelle supérieure à 1 /" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Utiliser les coordonnées WPL. Action à réception" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Coordonnées APRS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Nlle marque" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Info par survol d'une cible." -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Activez le bloc info route/AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr " \"Nom du bateau\" MMSI ( Indicatif )" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Classe] Type (Statut)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG / COG (vitesse/cap fond)" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA / TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Alarmes CPA/TCPA (TCPA = Durée avant le CPA)" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Voir la fenêtre de dialogue pour ces alarmes" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Alertes CPA/TCPA , urgences DSC/SART : Activer alerte sonore " -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Alerte AIS : Test" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Pas d'alerte si cible ancrée/amarrée" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Alerte sur cible : Activer délai maxi d’acquittement (mn)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Options générales" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Langue" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Polices" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Choix de police ..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Choix de la couleur de la police ..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Exemple" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Style de la barre d'icônes et de la fenêtre" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Options d'interface" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Barre d'état : Voir" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Barre des menus : Voir" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Indicateurs, Nord de la carte/état du GPS : Voir" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Barre d'icônes : Cacher auto... " -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Cloche de bord : Activer" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Ecran tactile : Activer l'interface" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Interface Utilisateur, Echelles : Activer" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Icônes de zoom : Voir" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Utilisez le système ECDIS V2" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Manuel de l'ECDIS des eaux intérieures" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Interface utilisateur : Zoom" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Objets affichables : Zoom" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Bateau utilisateur : Zoom" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "Cartes vectorielles, sondes : Zoom" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "Échelle du texte de l'ENC" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Sensiblité de la molette de la souris" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Appliquer" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Cartes" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Connexions" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Connecter" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Bateaux" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Personnaliser" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Utilisateur" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Compléments" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Déclinaison magnétique définie par l'utilisateur" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "pieds" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "brasses" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Ajouter un dossier contenant des fichiers de cartes" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - La longueur du bateau doit être > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - La largeur du bateau doit être > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - la position du GPS par rapport à l'axe du bateau ne doit pas être extérieure au bateau." -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - La position du GPS par rapport à la proue doit être <= à la longueur" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - La taille minimale de l'icône du bateau doit être entre 1 et 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Les données pour la taille réelle de votre bateau ne sont pas correctes :" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Le manuel ECDIS intérieur n'est pas disponible localement." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Souhaitez vous visiter le site Web du manuel iECDIS pour plus d'informations?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6881,15 +6893,15 @@ msgstr "La compression va modifier les fichiers de cartes sur le disque. \n" "Les cartes compressées peuvent être un peu plus longues à charger et à afficher sur certains systèmes. \n" "Elles peuvent être décompressées à l’aide d’un programme comme 7Zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Cartes OpenCPN compressées" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Aucune carte trouvée à compresser." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6898,71 +6910,71 @@ msgstr "compressée : %ld cartes\n" "de %.1fMB à %.1fMo\n" "sauvée : %.1fMo (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Entrer un nom de groupe" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Nouveau groupe de cartes" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Données de marées/courants : Choix" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Compression de texture" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Texture : Compression et mise en cache" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr " Texture compressée : Mettre en cache" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Texture : Taille de mémoire (Mb)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Taille : " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Cache de texture : Reconstruire" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Texture : Effacer le cache" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Lissage du polygone" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Lissage de la ligne" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Version OpenGL (Redémarrer OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Cartes : Utiliser le défilement accéléré" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Texture : Réglages" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Cache de la texture" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Divers" @@ -7044,127 +7056,127 @@ msgstr "Veuillez consulter le fichier log du système pour plus d'informations." msgid " successfully installed from cache" msgstr " installé avec succès à partir du cache" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Ces paramètres peuvent déstabiliser OpenCPN et sont désactivés par défaut. En dépit des risques, pour les activer, il faut créer une ligne CatalogExpert=1 dans la section [plugins] du fichier de config." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Catalogue de plugins" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Catalogue de plugins, mettre à jour" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importer un plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Paramètres" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Désactivé" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Catalogue Master de compléments : Mettre à jour" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "Mise à jour du catalogue OpenCPN" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Impossible de copier le fichier catalogue" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Impossible de copier le fichier catalogue dans le cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Mise à jour du catalogue réussie" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Sélectionner une archive" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Erreur lors de l'extraction des métadonnées depuis l'archive" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN : Erreur d'importation du plugin" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Plugin importé incompatible." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Erreur lors de l'extraction de l'archive importée." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Complément" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "importé avec succès." -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Catalogue actif" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Dernier catalogue" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Dernière modif." -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Catalogue de plugins, Mettre à jour." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Désinstaller" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Désinstaller le complément" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Dés-installation" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Activé" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Mettre à jour vers la nouvelle version" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Installer..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Mise à jour vers" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Site web" @@ -7209,10 +7221,6 @@ msgstr "Satellites" msgid "OpenCPN Server Message" msgstr "Serveur de message OpenCPN" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Info par survol d'une cible AIS" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Info marées/courants par survol" @@ -7330,12 +7338,6 @@ msgstr "Trace -> Route" msgid "Send to &Peer" msgstr "Envoyer au &pair" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Marques" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "Afficher toutes les marques" @@ -7539,15 +7541,15 @@ msgstr "mais l'échelle actuelle est" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Par conséquent, le nouveau waypoint ne sera pas visible à ce niveau de zoom." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Waypoint transmis." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Erreur au téléchargement du waypoint. GPS Garmin non connecté" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Erreur d'envoi du waypoint. S'il vous plait, regardez dans les fichiers log ...." @@ -7852,11 +7854,11 @@ msgstr "Les secteurs sont des relèvements vrais à partir de la m msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

Le dernier run d'opencpn semble avoir échoué. Voulez-vous exécuter\n" "en mode sans compléments et autres fonctionnalités\n" "potentiellement problématiques ?\n" -"



Vous pouvez envisager de visiter la liste des problèmes connus.

" +"



Vous pouvez envisager de visiter la liste des problèmes connus.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7972,7 +7974,7 @@ msgstr "Aujourd'hui" msgid "Tomorrow" msgstr "Demain" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Outils de renseignement" @@ -8273,153 +8275,156 @@ msgstr "Waypoint : Déplacer" msgid "Dismiss" msgstr "Abandonner" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "Sélectionnez les unités et les formats de données que vous souhaitez utiliser." -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Tous les paramètres peuvent être modifiés à tout moment dans la Boîte à outils de configuration accessible en cliquant sur le " -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "Icone dans barre d'outils" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "Si vous avez déjà des cartes marines sur votre système, vous pouvez les ajouter ici." -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "D'autres cartes peuvent être obtenues en utilisant \"Téléchargement\" intégré dans l'application." -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "Pour accéder au téléchargement de cartes cliquez sur le " -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr " dans la barre d’outils principale et accédez à l’onglet Cartes -> Téléchargement." -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "

Bienvenue sur OpenCPN!

Vous avez terminé avec succès la configuration initiale. Vous pouvez maintenant commencer à utiliser l'application.

" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "NMEA0183: Port UDP %d" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "NMEA2000: Port UDP %d" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "NMEA0183 : %s port TCP %d" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "NMEA2000 : %s port TCP %d" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "GPS: %s port TCP %d" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." -msgstr "Recherche de serveurs Signal K..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." +msgstr "Recherche de sources de données de navigation, cela peut prendre un certain temps..." -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "Recherche de périphériques USB..." -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "Recherche de flux de données UDP..." -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "Recherche de serveurs TCP en cours..." -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "Recherche de serveurs Signal K..." + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "Recherche des interfaces CAN..." -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "Recherche de serveurs GPSD en cours..." -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "SignalK: %s (port%s %d)" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "Le système a été scanné à la recherche de sources de données de navigation." -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "Les connexions aux sources de données découvertes seront automatiquement configurées. Vous pouvez décocher celles que vous voulez ignorer." -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "Vous pouvez maintenant connecter des périphériques USB supplémentaires ou vous connecter à un autre réseau et appuyer sur le bouton Rescanner pour mettre à jour la liste." -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Tous les paramètres peuvent être modifiés à tout moment dans la Boîte à outils de configuration accessible en cliquant sur le " -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr " dans la barre d'outils principale. Dans la Boîte à outils, accédez à l'onglet Connexions." -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "Ajouter un dossier contenant des fichiers de cartes" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "Unités et formats" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "Degrés, minutes décimales (DD MM.MM)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "Degrés décimaux (DD.DDDDD)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "Degrés, minutes, secondes (DD MM SS)" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "Montrer les relèvements et les directions vrais" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "Montrer les relèvements et les directions magnétiques" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "Sources de données de navigation détectées :" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "Nouveau scan..." -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "Ajouter des cartes marines existantes" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "Ajouter un répertoire de cartes..." - diff --git a/po/opencpn_gl_ES.po b/po/opencpn_gl_ES.po index 31a62ccb5b..59a13094b6 100644 --- a/po/opencpn_gl_ES.po +++ b/po/opencpn_gl_ES.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Galician\n" "Language: gl_ES\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Derrota sen nome)" @@ -414,7 +414,7 @@ msgstr "Aeronave SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Último coñecido)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posición" @@ -509,11 +509,11 @@ msgstr "Dereita" msgid "Left" msgstr "Esquerda" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Velocidade" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitude" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Axuda para a Navegación" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2437,8 +2437,8 @@ msgstr "Os waypoints renomearanse para reflectir a orde natural, os nomes serán "Quere renomear os waypoints?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Acerca de OpenCPN" @@ -2484,9 +2484,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opcións" @@ -2528,7 +2528,7 @@ msgstr "" msgid "Track properties" msgstr "Propiedades da Derrota" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2541,12 +2541,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2644,23 +2644,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "Sitio web de OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Documentación de axuda de OpenCPN Help non dispoñible localmente." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Queres visitar o sitio web opencpn.org para máis información?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3060,7 +3060,7 @@ msgstr "Cancelación - cancelar área seguindo o Identificador de mensaxe ID" msgid "Undefined (default)" msgstr "Sen definir (por defecto)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nome do branco AIS" @@ -3071,7 +3071,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Alerta AIS" @@ -3087,7 +3087,7 @@ msgstr "&Silenciar Alerta" msgid "&Jump To" msgstr "&Ir a" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Crear Waypoint" @@ -3110,7 +3110,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Lista de brancos AIS" @@ -3199,38 +3199,38 @@ msgstr "Número de brancos" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Gravar derrota" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Gravouse a derrota recente deste branco.\n" "Desexa continuar gravando ata o final do uso desta sesión de OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Consulta o obxectivo AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Aceptar" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Deter seguimento da derrota" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menú" @@ -3284,7 +3284,7 @@ msgstr "Movelo barco para aquí" msgid "Navigate To Here" msgstr "Navegar ata Aquí" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Modo rumbo arriba" @@ -3293,8 +3293,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Modo norte arriba" @@ -3303,7 +3303,7 @@ msgid "Chart Up Mode" msgstr "Modo carta cara arriba " #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Cambiar a pantalla completa" @@ -3328,7 +3328,7 @@ msgstr "Pegar Derrota" msgid "CM93 Offset Dialog..." msgstr "Diálogo de desprazamento CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Grupo de cartas" @@ -3446,7 +3446,7 @@ msgstr "Copiar como KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Eliminar" @@ -3600,18 +3600,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "Opcións panel de cartas" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Modo de navegación" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Norte Arriba" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Rumbo Arriba" @@ -3619,32 +3619,32 @@ msgstr "Rumbo Arriba" msgid "Heading Up" msgstr "Proa arriba" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Modo ir por adiantado" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Opcións de visualización" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Activar superposición das cartas" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Amosar enreixado" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Amosar contornos das cartas" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Amosa-las Unidades de Profundidade" @@ -3664,7 +3664,7 @@ msgstr "Mareas e correntes" msgid "Show Tide stations" msgstr "Mostrar estacións de marea" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Amosar as correntes" @@ -3680,8 +3680,8 @@ msgstr "Amosar texto" msgid "Show depths" msgstr "Mostrar sondas" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Etiquetas das Balizas/Luces" @@ -3689,8 +3689,8 @@ msgstr "Etiquetas das Balizas/Luces" msgid "Lights" msgstr "Luces" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Descricións das Luces" @@ -3706,18 +3706,18 @@ msgstr "Mostrar as luces de sector visibles" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Amosar categoría" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Estándar" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Todo" @@ -3762,7 +3762,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3817,8 +3817,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4150,28 +4150,28 @@ msgstr "Se contesta \"Non\" creará todos os waypoints novos para esta ruta." msgid "Merge waypoints?" msgstr "Combinar waypoints?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Info do tramo/ruta ó pasar o rato por cima" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile require que OpenGL estea activado" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Pés" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metros" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Brazas" @@ -4179,7 +4179,7 @@ msgstr "Brazas" msgid "OverZoom" msgstr "Zoom excesivo" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Icona estendida da marea" @@ -4195,7 +4195,7 @@ msgstr "Consulta o branco AIS" msgid "Show all AIS Targets" msgstr "Mostrar todos os brancos AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Atenuar os brancos AIS menos críticos" @@ -4243,9 +4243,9 @@ msgstr "Desprazamento do Usuario X" msgid "User Y Offset" msgstr "Desprazamento do Usuario Y" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metros" @@ -4256,11 +4256,13 @@ msgstr "Este tramo" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Lenda da consola" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Valor da consola" @@ -4296,12 +4298,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Título" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4330,7 +4332,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4619,12 +4621,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Aviso de OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Información OpenCPN" @@ -4633,17 +4635,17 @@ msgstr "Información OpenCPN" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Seleccionar Todo" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Borrar Todo" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Engadir" @@ -4669,59 +4671,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Xeral" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4779,7 +4781,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Reinstalar" @@ -4787,7 +4789,7 @@ msgstr "Reinstalar" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4817,7 +4819,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4825,6 +4827,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Info do AIS ó pasar o rato por encima" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4837,7 +4854,7 @@ msgstr "Esperando a que remate o proceso de compresión da carta raster." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distancia ó noso barco: %4.0f NMi" @@ -4958,7 +4975,7 @@ msgstr "Este waypoint é parte dunha capa e non se pode editar" msgid "Icon" msgstr "Icona" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -4968,7 +4985,7 @@ msgid "Links" msgstr "Ligazóns" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5009,22 +5026,22 @@ msgstr "Aneis de distancia" msgid "Number" msgstr "Número" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distancia" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Cor" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Ningún" @@ -5114,16 +5131,16 @@ msgstr "Amosar soamente a escala" msgid "Tide Station not found" msgstr "Non se encontrou a Estación de Mareas" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Persistente" @@ -5155,35 +5172,35 @@ msgstr "Xanela de depuración NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5231,8 +5248,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5240,277 +5257,277 @@ msgstr "" msgid "Anchorage created " msgstr "Fondeadoiro creado" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Activar seguimento da derrota" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Autoseguimento" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Ampliar" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Alonxar" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Amosar Barra de Cartas" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Amosar texto ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Amosar as mareas" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Cambiar o esquema de cor" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Amosar os brancos AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Crear Ruta" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Poñer unha marca MOB" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preferencias" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Houbo un problema imprimindo.\n" "Pode ser que a súa impresora non estea ben configurada?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Ruta sen nome)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Barco Propio" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Xestor de Rutas e Marcas" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Imprimir Carta" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Espacio)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5518,105 +5535,105 @@ msgstr "Crear un modelo de configuración privada baseado na configuración actu "Este modelo gardarase, e pode ser seleccionado para seu uso posterior en cualquera momento.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Propiedades estendidas do MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "En seguimento" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Seguimento por defecto" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Seguir sempre" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Nunca seguir" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorar este MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Xestionar este MMSI como unha baliza persoal de localización SART (AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Converter AIVDM a AIVDO para este MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Este MMSI é do meu seguidor - Sen alerta de CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "O Identificador MMSI é xeralmente un número de nove díxitos.\n" "Por favor comprobe as súas entradas e cancele se é necesario." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Por defecto" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Sempre" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Nunca" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Editar propiedades do MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Propiedades do MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Modo de seguimento" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorar" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB (Home á auga)" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nome do barco" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Seguidor" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Novo..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Engadir propiedades MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5634,7 +5651,7 @@ msgstr "O dispositivo seleccionado non é accesible; é probable que OpenCPN non " KERNEL == \"ttyS *\", modo = \"0666\"\n" "< div clase = \" notranslate \"> 9 para obter máis información, consulte o arquivo LINUX_DEVICES.md na documentación da distribución.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5654,1180 +5671,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Para máis información, vexa o arquivo LINUX_DEVICES.md nos documentos da distribución.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Lonxitude da predición de COG (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Lonxitude da predición do rumbo (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Tipo de icona do barco" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Bitmap a escala real" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Vectorial a escala real" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Eslora total (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Manga total (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Axuste GPS desde Proa (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Axuste GPS desde o centro (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Tamaño mínimo da pantalla (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Amosar aneis de distancias" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distancia entre aneis" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Unidade de distancia" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Millas náuticas" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Quilómetros" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Cor dos aneis de distancia" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Estilo" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Sólido" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Punto" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Guión longo" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Guión corto" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Guión punteado" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Cor por defecto" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Negro" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Vermello escuro" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Verde escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Amarelo Escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Azul escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Maxenta escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Ciano escuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Luz" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Gris escuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Vermello" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Verde" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Cela" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Azul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Maxenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cancelar" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Branco" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Derrotas" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Derrota diaria automática á medianoite" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Derrota diaria automática a" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Ordenador" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Resaltar derrotas" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Precisión da derrota" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Baixa" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Media" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Alta" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Calcular valores" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Calcular SOG e COG usando os cambios de posición" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Mínimo de segundos entre actualizacións" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rutas/marcas" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Novas rutas" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Icona predeterminada da marca" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Radio do círculo de chegada ó waypoint (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Dirixirse ó seguinte waypoint da ruta só con chegar" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Substituír os asustes para a visibilidade baseada na escala da carta e mostrar sempre" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Cores dos aneis de distancia" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Opcións de control" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Confirmar borrado de derrotas e rutas" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Ficheiros de cartas" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Directorios" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Engadir Directorio..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Eliminar Seleccionados" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Comprimir selección" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Eliminar" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Control de Actualizacións" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Explorar cartas e actualizar a base de datos" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Forzar a reconstrución de toda a base de datos" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Preparar tódalas cartas ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Patróns" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Estado do modelo" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Título do último modelo aplicado:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Modelos gardados" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Crear configuración..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Borrar configuración seleccionada..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Aplicar Configuración Seleccionada" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Crear configuración" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Problemas ó aplicar a configuración seleccionada." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avanzado" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Aliñar cartas raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Usar aceleración gráfica (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Opcións de OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Tempo Promedio para rotación de carta" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "segundos" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Ponderación do Zoom/Escala da carta" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vector" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Anchura da pantalla física" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manual:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Visualización da carta" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Amosa-las cartas raster inclinadas como Norte-Arriba" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Con un valor menor, o mesmo nivel de zoom mostra unha carta menos detallada.\n" " Con un valor maior, o mesmo nivel de zoom mostra unha carta máis detallada." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Gráficos" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Visualización da Carta Vectorial" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Estándar Mariño" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Profundidade de sondas" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Info sobre obxectos da carta" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Balizas e luces" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Sectores de luz estendidos" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Textos da carta" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Texto no idioma nacional" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Só texto importante" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Des/agrupar texto" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Detalle da carta" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Detalle reducido a baixa escala" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Estilo de Gráficos" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Carta de Papel" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplificado" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Límites" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Simple" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Con símbolos" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Cores" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Cores" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Cores" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Pouca Profundidade" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Profundidade de Seguridade" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Augas profundas" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Obxectos estándar do usuario" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Resetear a STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Mareas && Correntes" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Ficheiros de datos activos" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Engadir ficheiro de datos..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Todas as cartas dispoñibles" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Eliminar Carta" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Todas as Cartas" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Novo Grupo..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Borrar Grupo" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Conservar escala cando se alternan cartas" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Controis" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Panorámica / Zoom suave" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom no cursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Opcións de visualización" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Opción da barra de estado" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "ETA en vivo no Cursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Velocidade por defecto do barco " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Disposición de mapas" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Barra de estado" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unidades" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Millas terrestres" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Nós" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Profundidade" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Lonx" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Graos, Minutos Decimais" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Graos Decimais" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Graos, Minutos, Segundos" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Rumbos" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Amosar verdadeiro" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Amosar magnético" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Declinación magnética asumida" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Amosar demoras e rumbos verdadeiros" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Amosar demoras e rumbos magnéticos." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Declinación magnética calculada polo plugin WMM" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Para axustala declinación magnética manualmente, \n" " debe desactivalo plugin WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Seleccionar ficheiro de son" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Dispositivo descoñecido:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Dispositivo de son" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Comando para reprodución de audio:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Brancos AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Cálculos CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Non dar alertas (T)CPA se a distancia ó branco é maior de (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Aviso se o CPA é inferior a (NMi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...e o TCPA é inferior a (minutos)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Brancos perdidos" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Marcar brancos como perdidos despois de (minutos)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Borrar brancos perdidos despois de (minutos)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Visualización" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Amosar frecha de predición COG do branco, lonxitude (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Amosar derrotas do branco, lonxitude (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Agochar brancos fondeados/atracados, vel. máx (nós)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Permitir a atenuación dos brancos menos importantes se hai máis de .... brancos" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Mostrar avisos da zona (a partir das mensaxes binarias do AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Amosar o tamaño real dos brancos AIS" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Mostrar nomes de brancos AIS con escala maior que 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Ó pasar o rato por encima" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Activar o bloque de información de ruta/AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Nome do barco\" MMSI (Distintivo de chamada)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Clase] Tipo (Estado)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Alertas CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Amosa-lo diálogo de alerta CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Reproducir Son en Alarmas CPA/TCPA e en urxencias DSC/SART." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Suprimir Alertas para brancos fondeados/atracados" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Activar retardo para alertas de brancos tralo recoñecemento (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Opcións xerais" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Idioma" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Fontes" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Escoller tipo de letra..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Escoller cor do tipo de letra..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Exemplo" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Estilo da barra de ferramentas e xanela" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Opcións da interface" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Amosar a barra de estado" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Amosar a barra de menú" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Amosar a xanela de estado Compás/GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Activar a ocultación automática da barra de ferramentas" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Facer soar as campás dos barcos" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Habilitar interface para pantallas táctiles" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Activar a interface con gráficos escalables" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Mostrar os botóns de zoom" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Factor de escala da Interface de usuario" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Factor de escala de Obxectos de carta" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Factor escala de barcos" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Aplicar" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Cartas" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Connexións" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Barcos" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Interface de usuario" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Complementos" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Declinación magnética definida polo usuario" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "pés" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "brazas" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Engadir un directorio con ficheiros de cartas" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - A eslora do seu barco debe ser > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - A manga do seu barco debe ser > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - O axuste do GPS dende o medio debe estar dentro da manga do barco" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - O axuste do GPS dende a proa debe estar dentro da eslora do barco" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - o tamaño mínimo da icona do barco debe estar entre 1 e 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Os axustes do tamaño real do seu barco non son correctos:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6837,15 +6849,15 @@ msgstr "A compresión alterará os arquivos de cartas no disco.\n" "As cartas comprimidas poden tardar un pouco máis en cargarse e amosarse nalgunos sistemas.\n" "Poden ser descomprimidas de novo usando os programas unxz ou 7 zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Comprimir Cartas OpenCPN" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Non se atoparon cartas para comprimir." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6854,71 +6866,71 @@ msgstr "comprimidas %ld cartas\n" "de %.1fMB a %.1fMB\n" "aforrado %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Introduza un nome do grupo" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Novo grupo de cartas" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Seleccionar datos da Marea/Corrente" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Compresión de texturas" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Compresión de texturas con memoria de caché" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Memoria de chaché da compresión de texturas" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tamaño da memoria de texturas (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Tamaño: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Reconstruír caché de texturas" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Limpar caché de texturas" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Polígono suavizado" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Suavizado de líñas" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (reiniciar OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Usar panorámica acelerada" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Preferencias de textura" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Caché de texturas" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Miscelánea" @@ -7000,127 +7012,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Catálogo activo" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Último catálogo" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Último cambio: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Por favor, actualice o catálogo de engadidos" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Desinstalar" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Activado" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Actualizar á versión " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Instalar..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Actualizar a " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Sitio web" @@ -7165,10 +7177,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Info do AIS ó pasar o rato por encima" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Info gráfico de mareas e correntes" @@ -7286,12 +7294,6 @@ msgstr "Ruta dende a derrota" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7495,15 +7497,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7808,7 +7810,7 @@ msgstr "(Os sectores angulares son demoras verdadeiras dende o mar msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7924,7 +7926,7 @@ msgstr "Hoxe" msgid "Tomorrow" msgstr "Mañá" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Info ferramenta" @@ -8206,153 +8208,156 @@ msgstr "Mover Waypoint" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_he_IL.po b/po/opencpn_he_IL.po index 3f19aa374d..1a4e9a3b41 100644 --- a/po/opencpn_he_IL.po +++ b/po/opencpn_he_IL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hebrew\n" "Language: he_IL\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(ללא שם מסלול)" @@ -414,7 +414,7 @@ msgstr "מטוסי SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr "(ידוע לאחרונה)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "מיקום" @@ -509,11 +509,11 @@ msgstr "ימינה" msgid "Left" msgstr "שמאל" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "מהירות" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "גובה" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "סיוע לניווט" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "בסיס" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "קמ\"ש" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "מי\"ש" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "אודות OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "אפשרויות" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "הגדרות נתיב" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr ":פלאגין API" msgid "OpenCPN Website" msgstr "אתר של OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "מדריך למשתמש לא זמין כעת ל-OpenCPN." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "האם תרצה לבקר באתר opencpn.org למידע נוסף?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "ביטול - ביטול אזור כפי שזוהה על-ידי מזהה msgid "Undefined (default)" msgstr "לא מוגדר" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "שם יעד של ais" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "התראת AIS " @@ -3085,7 +3085,7 @@ msgstr "&והתראה שקטה" msgid "&Jump To" msgstr "&לקפוץ ל-" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "צור נקודת דרך" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS רשימת מטרות" @@ -3197,37 +3197,37 @@ msgstr "כמות המסומנים" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "הקלטת מסלול" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "לאחרונה מעקב מסלול הוקלט. האם אתה רוצה להמשיך במסלול עד סיום תרגיל בOpenCPN" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AISTargetQuery" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "אישור" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "הפסק מעקב" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "תפריט" @@ -3281,7 +3281,7 @@ msgstr "הזז סירה לכאן" msgid "Navigate To Here" msgstr "נווט לכאן" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "מצב Course Up" @@ -3290,8 +3290,8 @@ msgid "Heading Up Mode" msgstr "Heading Up מצב" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "North Up מצב" @@ -3300,7 +3300,7 @@ msgid "Chart Up Mode" msgstr "Chart Up מצב" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "הפעל/הפסק מצב מסך מלא" @@ -3325,7 +3325,7 @@ msgstr "הדבק נתיב" msgid "CM93 Offset Dialog..." msgstr "דיאלוג קיזוז CM93 ..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "קבוצת מפות" @@ -3443,7 +3443,7 @@ msgstr "העתק כקובץ KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "מחיקה" @@ -3597,18 +3597,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "אפשרויות פאנל תרשים" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "מצב ניווט" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "צפון למעלה" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "קורס למעלה" @@ -3616,32 +3616,32 @@ msgstr "קורס למעלה" msgid "Heading Up" msgstr "לכיוון" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "מצב מבט קדימה" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "אפשרויות תצוגה" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "הפעל תרשים Quilting." -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "הצגה רישתית" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "הצג גבולות מפה" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "הצגת נקודות עומק" @@ -3661,7 +3661,7 @@ msgstr "גאות וזרמים" msgid "Show Tide stations" msgstr "הצג תחנות הגאות" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "הצג דף נוכחי" @@ -3677,8 +3677,8 @@ msgstr "הראה טקסט" msgid "Show depths" msgstr "הצג מעמקים" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "מדבקות מצוף/אור" @@ -3686,8 +3686,8 @@ msgstr "מדבקות מצוף/אור" msgid "Lights" msgstr "אורות" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "תיאורים בהירים" @@ -3703,18 +3703,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "הצגת קטגוריה" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "רגיל" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "הכל" @@ -3759,7 +3759,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3814,8 +3814,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4147,28 +4147,28 @@ msgstr "מענה 'לא' תיצור את כל נקודות הציון החדשו msgid "Merge waypoints?" msgstr "מזג נקודות ציון?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile דורש OpenGL להיות פעיל" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Feet" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "מטרים" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr " לַחדוֹר לְעוֹמֶק" @@ -4176,7 +4176,7 @@ msgstr " לַחדוֹר לְעוֹמֶק" msgid "OverZoom" msgstr "אובר זום" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "ExtendedTideIcon" @@ -4192,7 +4192,7 @@ msgstr "AIS Target Query" msgid "Show all AIS Targets" msgstr "הצג את כול מטרות AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "הנחת יעדי AIS פחות קריטיים" @@ -4240,9 +4240,9 @@ msgstr "User X Offset" msgid "User Y Offset" msgstr "User Y Offset" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "מטרים" @@ -4253,11 +4253,13 @@ msgstr "This Leg" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "מקרא מסוף" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "ערך מסוף" @@ -4293,12 +4295,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "נושא" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4327,7 +4329,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4616,12 +4618,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "אזהרת OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "מידע OpenCPN" @@ -4630,17 +4632,17 @@ msgstr "מידע OpenCPN" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "בחר הכל" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "נקה הכל" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "הוסף" @@ -4666,59 +4668,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "כללי" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4776,7 +4778,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "התקן מחדש" @@ -4784,7 +4786,7 @@ msgstr "התקן מחדש" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "שנמך" @@ -4814,7 +4816,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4822,6 +4824,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AISRollover" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4834,7 +4851,7 @@ msgstr "ממתין ל-raster chart דחיסת יציאה." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr " Ownship: %4.0f NMi מרחק מ- " @@ -4955,7 +4972,7 @@ msgstr "נקודת ציון זו היא חלק משכבה ולא ניתן לער msgid "Icon" msgstr "סמל" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4965,7 +4982,7 @@ msgid "Links" msgstr "קישורים" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5006,22 +5023,22 @@ msgstr "טבעות טווח" msgid "Number" msgstr "מספר" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "מרחק" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "צבע" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "ללא" @@ -5111,16 +5128,16 @@ msgstr "הצג רק בקנה מידה" msgid "Tide Station not found" msgstr "תחנה לא נמצאה" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "קבוע" @@ -5152,35 +5169,35 @@ msgstr "NMEA מסך בדיקת באגים" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5228,8 +5245,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5237,380 +5254,380 @@ msgstr "" msgid "Anchorage created " msgstr "מעגן נוצר" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "הפעל מעקב" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "מעקב אוטומטי" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "הגדל" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "הקטן" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "הצג תרשים" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "הצג טקסט ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "הצג גלים" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "שנה מחלוקת צבע" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "הצג AIS מטרות" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "צור מסלול" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "סימון MOB " -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "העדפות" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "הייתה בעיה בדפוס. \\ N אולי המדפסת הנוכחית שלך אינה מוגדרת כהלכה?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(מסלול ללא שם)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "סירה שלי" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "ניהול נתיב & וסימונים " -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "הדפס מפה" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "צור תבנית תצורה פרטית המבוססת על ההגדרות הנוכחיות. " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI מאפיינים מורחבים" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "מעקב" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "מעקב ברירת מחדל" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "תמיד עקוב" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "לעולם אל תעקוב" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "התעלם מMMSI הזה" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Handle this MMSI as SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "המר AIVDM ל-AIVDO בשביל MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "MMSI הזה הוא עוקב שלי - לי התראת CPN" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "מזהה MMSI הוא בדרך כלל מספר של תשע ספרות.\n" " נא בדוק את הערכים שלך ובטל במידת הצורך." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "ברירת מחדל" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "תמיד" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "לעולם לא" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "ערוך הגדרות MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "הגדרות MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "מצב מסלול" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "התעלם" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "שם הסירה" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "עוקב" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "חדש.." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "הוסף הגדרות MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5628,7 +5645,7 @@ msgstr "The device selected is not accessible; opencpn will likely not be able\n " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5648,1180 +5665,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "אורך מנבא COG (דקות)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "כותרת אורך מנבא (NMI)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "סוג סמל הסירה" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "מפת סיביות של קנה מידה אמיתי" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "וקטור בקנה מידה אמיתי" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "אורך מעל הכל (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "רוחב מעל הכל (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS Offset from Bow (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS Offset from Midship (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "גודל מסך מינימלי (מ\"מ)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "הצג טבעות טווח" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "המרחק בין הטבעות" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "יחידת מרחק" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "מייל ימי" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "קילומטרים" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "טווח טבעת צבע" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "סגנון" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "מלא" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "נקודה" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "מקף ארוך" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "מקף קצר" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "נקודה מקף" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "צבע ברירת מחדל" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "שחור" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "אדום כהה" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "ירוק כהה" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "צהוב כהה" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "כחול כהה" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "מג'נטה כהה" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "ציאן כהה" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "אפור בהיר" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "אפור כהה" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "אדום" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "ירוק" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "צהוב" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "כחול" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "מגנטה" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "ציאן" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "לבן" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "מסלולים" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "מסלולים אוטומטיים מדי יום בחצות" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "אוטומטי מסלולים יומיים ב" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "מחשב" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "סימון רצועות" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "דיוק מעקב" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "נמוך" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "בינוני" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "גבוהה" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "חשב ערכים" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "חישוב SOG ותג\"ג משינויי מיקום" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "מינימום שניות בין עדכונים" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "ניתובים/נקודות" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "נתיבים חדשים" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "סמל ברירת מחדל של נקודת ציון" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "רדיוס מעגל הגעה של נקודת ציון (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "נקודת ציון של מסלול מתקדם בעת ההגעה בלבד" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "עקוף את ההגדרות עבור ניראות מבוססת קנה מידה של תרשים והצג תמיד" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "צבעי טבעת טווח נקודות ציון" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "אפשרויות בקרה" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "אישור מחיקת רצועות ונתיבים" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "קבצי מפות" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "תיקיות" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "הוסף תיקייה.." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "מחק מסומן" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "כווץ מסומן" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "הסר" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "עידכון שליטה" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "עדכן מפות וקובץ מסד נתונים" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "אלץ בנייה מחדש של מסד נתונים" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "הכן את כל מפות ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "[נערך]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "תבניות" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "סטטוס תבנית" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "כותרת תבנית שחלה לאחרונה:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "תבניות שמורות" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "צור קונפיגורציה.." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "מחק קונפיגורציה מסומנת.." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "החל קונפיגורציה נבחרת" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "בנה קונפיגורציה" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "בעיה בהחלת קונפיגורציה נבחרת." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "מתקדם" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "ביטול הטיה של תרשימי רסטר" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "השתמש בהאצת גרפית (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "הגדרות OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "זמן ממוצע של סיבוב מפה" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "שניות" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "שינוי גודל תצוגה של תרשים/שקלול קנה מידה" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "רשת" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "ווקטור" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "רמת פירוט CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "רוחב פיזי של מסך" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "אוטומטי" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "ידני:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "מ\"מ" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "הצגת מפה" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "הצג תרשימי רסטר מוטים כצפון-למעלה" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "עם ערך נמוך יותר, אותה רמת גודל תצוגה מציגה תרשים פחות מפורט.\n" "עם ערך גבוה יותר, אותה רמת גודל תצוגה מציגה תרשים מפורט יותר." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "גרפיקה" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "הצגת ווקטור על גבי המפה" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "תקן מרינר" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "עומק בסביבה" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "אובייקטי מידע תרשים" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "מצופים /אורות" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "סקטורים מוארים מורחבים" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "טקסטים של מפות" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "טקסט לאומי במפה" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "טקסט חשוב בלבד" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "טקסט ללא עומס" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "פירוט המפה" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "הפחת פירוט בקנה מידה קטן" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "סגנון הגרפיקה" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "מפת נייר" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "פישוט" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "גבולות" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "פשוט" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "סימל" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "צבעים" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 צבעים" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 צבעים" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "עומק רדוד" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "עומק בטיחות" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "עומק עמוק" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "אובייקטים סטנדרטיים של משתמש" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "אפס לסטנדרט" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "גאות ושפל וזרמים" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "ערכות נתונים פעילות" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "הוספת ערכת נתונים..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "כול המפות הפעילות" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "מחק מפה" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "כול המפות" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "קבוצה חדשה.." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "מחק קבוצה" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "שמירה על קנה מידה בעת החלפת תרשימים" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "פקדים" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "גלילה רציפה חלקה / שינוי גודל תצוגה" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "זום לעכבר" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "הצגת פיצ'רים" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "הגדרות שורת מצב" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "שידור חיי של הזמן הגעה משוער על הסמן" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "מהירות סירה המוגדרת כברירת מחדל" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "פריסת בד ציור" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "שורת מצב" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "יחידות" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "מיילים של חוקים" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "קשר" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "עומק" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "רוחב/ ואורך" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "מעלות, דקות עשרוניות" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "מעלות עשרוניות" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "מעלות, דקות, שניות" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "מיסבים" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "הצג אמת" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "הצג מגנטי" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "וריאציה מגנטית משוערת" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "מעלות (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "הצג מיסבים וכותרות אמיתיים" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "הצג מסבים וכותרות מגנטיים." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "וריאציה מגנטית מחושבת של תוסף WMM" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "כדי להגדיר את הווריאציה המגנטית באופן ידני,\n" " עליך להשבית את תוסף WMM" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "בחר קובץ קולי" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "מכשיר לא ידוע:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "התקן שמע" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "פקודת הפעל קולית:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS נקודות" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "חישוב CPA " -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "No (T)CPA Alerts if target range is greater than (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "הזהר אם CPA קטן מ- (NMi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "... ו- TCPA קטן מ- (מינימום)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "מטרות אבודות" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "סמן מטרות כאבדות לאחר (מינימום)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "הסר מטרות שאבדו לאחר (מינימום)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "תצוגה" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "הצג מטרה COG מנבא, אורך (דקות)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "הצג מסלולי יעד, אורך (דקות)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "לדכא מעוגנים / מעוגנים מטרות, מהירות מקס (KN)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "צייר AIS בזמן אמת חיזוי, מהירות היעד דקות (KN)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "אפשר attenuation של מטרות פחות קריטיות אם יותר מ ... מטרות" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "הצג הודעות אזור (מתוך הודעות בינאריות AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "הצג AIS מטרות גודל אמיתי" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "הצג שמות עם מטרות AIS בקנה מידה גדול מ 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "להתגלגל" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "הפעל מסלול/ AIS בלוק מידע" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"שם הספינה\" MMSI (סימן שיחה)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[סוג] סוג (סטטוס)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA התראות" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "הצג CPA/TCPA התראה דיאלוג" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "לדחות התראות למטרות מעוגנות / מעוגנות" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Enable Target Alert Acknowledge timeout (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "אפשרויות כלליות" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "שפה" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "גופנים" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "בחר גופן." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "שינוי צבע הגופן." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "דוגמה" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "סרגל הכלים וסגנון החלון" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "הגדרות ממשק" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "הצגת שורת המצב" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "הצג שורת תפריט" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "הצג מצפן / חלון מצב GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "הפעל הסתרה אוטומטית בשורה" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "השמע צלילי סירות" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "הפעל ממשק למסכי מגע" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "הפעלת ממשק גרפי מורחב" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "הצג לחצני שליטה בזום" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "ממשק משתמש בקנה מידה גורם" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "מפת אובייקטים בקנה מידה גורם" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "פקטור סולם הספינה" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "פקטור נשמע ENC " -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "החל" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "מפות" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "חיבורים" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "סירות" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "ממשק משתמש" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "תוספים" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "משתמש להגדיר וריאציה מגנטית" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "feet" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "לַחדוֹר לְעוֹמֶק (fathom)" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "הוסף ספריה המכילה קבצי מפות" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - your ship's length must be > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - your ship's beam must be > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - your GPS offset from midship must be within your ship's beam" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - your GPS offset from bow must be within your ship's length" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - your minimum ship icon size must be between 1 and 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "ההגדרות עבור הספינה שלך גודל אמיתי אינם נכונים:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6831,15 +6843,15 @@ msgstr "Compression will alter chart files on disk.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN לדחוס מפות" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "לא נמצאו מפות לדחוס." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6848,71 +6860,71 @@ msgstr "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "הזן שם קבוצה" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "קבוצת מפות חדשה" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "בחר גאות / נתונים נוכחיים" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "דחיסת טקסטורות" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "דחיסת טקסטורות עם זיכרון מטמון." -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "דחיסת מטמון טקסטורות" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "גדול זיכרון של טקסטורה (ב-מגה בייט MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "גודל" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "תייצר מטמון טקסטורה" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "נקה מטמון טקסטורה" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "מריחת פוליגונים" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "מריחת קווים" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "תוכנה OpenGL (דרוש הפעלה מחדש של התוכנה)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "השתמש בקירוב מואץ" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "הגדרות טקסטורות" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "מטמון טקסטורות" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "שונות" @@ -6991,127 +7003,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "קטלוג תוספים" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "עדכן קטלוג תוספים" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "הוסף תוסף חיצוני.." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "מוגבל להעתיק קובץ מהקטלוג" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "מוגבל להעתיק מהקטלוג לזיכרון המטמון" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "שגיאה בהוספת תוסף לOpenCPN" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "חוסר תאימות בתוסף התגלה." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "קטלוג פעיל" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "קטלוג קודם" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "בבקשה עדכן קטלוג תוספים." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "הסר התקנה" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "אפשר" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "שדרוג גרסה." -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "התקן." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "עדכן ל-" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "אתר אינטרנט" @@ -7156,10 +7168,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AISRollover" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7277,12 +7285,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7480,15 +7482,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7793,7 +7795,7 @@ msgstr "(Sector angles are True Bearings from Seaward)
" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7909,7 +7911,7 @@ msgstr "היום" msgid "Tomorrow" msgstr "מחר" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "רמזים" @@ -8191,153 +8193,156 @@ msgstr "הזז נקודת ציון" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_hi_IN.po b/po/opencpn_hi_IN.po index fd17ce7637..76b607e874 100644 --- a/po/opencpn_hi_IN.po +++ b/po/opencpn_hi_IN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hindi\n" "Language: hi_IN\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(अनाम ट्रैक)" @@ -414,7 +414,7 @@ msgstr "एसएआर विमान" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "एमएमएसऑय" @@ -476,7 +476,7 @@ msgstr " (अंतिम ज्ञात)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "" @@ -509,11 +509,11 @@ msgstr "" msgid "Left" msgstr "" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "ऊंचाई" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "नेविगेशन के लिए सहायता" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "आधार" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "ओपनसीपीएन के बारे में" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "विकल्प" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "ट्रैक गुण" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "OpenCPN वेबसाइट" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "रद्दीकरण - संदेश कड़ी आईडी द msgid "Undefined (default)" msgstr "अपरिभाषित (डिफ़ॉल्ट)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "एआईएस लक्ष्य नाम" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "एआईएस अलर्ट" @@ -3085,7 +3085,7 @@ msgstr "&मौन सचेतक" msgid "&Jump To" msgstr "&पर कूदना" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "वेपॉइंट बनाएं" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "एआईएस लक्ष्य सूची" @@ -3197,38 +3197,38 @@ msgstr "लक्ष्य गणना" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "रिकॉर्ड ट्रैक" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "इस लक्ष्य का हाल ही में ट्रैक किया गया ट्रैक रिकॉर्ड किया गया है। \n" "क्या आप चालू ओपनसीपीएन सत्र के अंत तक रिकॉर्डिंग जारी रखना चाहते हैं?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "एआईएसलक्ष्यसवाल" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "ट्रैकिंग रोकें" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "" @@ -3282,7 +3282,7 @@ msgstr "नाव यहाँ ले जाएँ" msgid "Navigate To Here" msgstr "यहां पर नेविगेट करें" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "कोर्स अप मोड" @@ -3291,8 +3291,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "उत्तर अप मोड" @@ -3301,7 +3301,7 @@ msgid "Chart Up Mode" msgstr "चार्ट अप मोड" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "पूर्णस्क्रीन चालू करें" @@ -3326,7 +3326,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "CM93 ऑफ़सेट डायलॉग..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3444,7 +3444,7 @@ msgstr "केएमएल के रूप में कॉपी करें" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "" @@ -3598,18 +3598,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "नेविगेशन मोड" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "उत्तर ऊपर" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "कोर्स अप" @@ -3617,32 +3617,32 @@ msgstr "कोर्स अप" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "आगे मोड देखें" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "प्रदर्शित विकल्प" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "चार्ट क्विंटिंग सक्षम करें" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "ग्रिड दिखाएं" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "चार्ट आउटलाइन दिखाएं" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "गहराई इकाइयां दिखाएं" @@ -3662,7 +3662,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "धाराएं दिखाएं" @@ -3678,8 +3678,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "बांधना / हल्के रंगों केलेबल" @@ -3687,8 +3687,8 @@ msgstr "बांधना / हल्के रंगों केलेबल" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "लाइट वर्णन" @@ -3704,18 +3704,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "प्रदर्शन श्रेणी" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "" @@ -3760,7 +3760,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3815,8 +3815,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4148,28 +4148,28 @@ msgstr "जवाब 'नहीं' इस मार्ग के लिए स msgid "Merge waypoints?" msgstr "मार्गों को मिलाएं?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "रूट लेगएन्फो रोलओवर" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "" @@ -4177,7 +4177,7 @@ msgstr "" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4193,7 +4193,7 @@ msgstr "एआईएस लक्ष्य प्रश्न" msgid "Show all AIS Targets" msgstr "सभी एआईएस लक्ष्य दिखाएं" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "कम महत्वपूर्ण एआईएस लक्ष्यों को कमजोर करना" @@ -4241,9 +4241,9 @@ msgstr "" msgid "User Y Offset" msgstr "" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "" @@ -4254,11 +4254,13 @@ msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4294,12 +4296,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4328,7 +4330,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4617,12 +4619,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "ओपनसीपीएन चेतावनी" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "ओपनसीपीएन जानकारी" @@ -4631,17 +4633,17 @@ msgstr "ओपनसीपीएन जानकारी" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "सभी का चयन करे" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "सभी साफ करें" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "" @@ -4667,59 +4669,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4777,7 +4779,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4785,7 +4787,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4815,7 +4817,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4823,6 +4825,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4835,7 +4852,7 @@ msgstr "रास्टर चार्ट संपीड़न धागा msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "स्वैच्छिक से दूरी: %4.0f एनएमऑय" @@ -4956,7 +4973,7 @@ msgstr "" msgid "Icon" msgstr "" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4966,7 +4983,7 @@ msgid "Links" msgstr "" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5007,22 +5024,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "" @@ -5111,16 +5128,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "" @@ -5152,35 +5169,35 @@ msgstr "एनएमईए डिबग विंडो" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5228,8 +5245,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5237,381 +5254,381 @@ msgstr "" msgid "Anchorage created " msgstr "लंगर शुल्क बनाया " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "ट्रैकिंग सक्षम करें" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "स्वत: का पालन करें" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "ज़ूम इन" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "ज़ूम आउट" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "चार्ट बार दिखाएं" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "एनएसी पाठ दिखाएं" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "ज्वार दिखाएँ" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "रंग योजना बदलें" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "एआईएस लक्ष्य दिखाएं" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "मार्ग बनाएं" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "मोब मार्कर गिराना" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "प्रिंट करने में कोई समस्या थी\n" " क्या शायद आपका वर्तमान प्रिंटर ठीक से सेट नहीं है?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(अनाम मार्ग)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "रूट और मार्क प्रबंधक" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "प्रिंट चार्ट" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (स्टर्ल -स्पेस)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "एमएमएसआई विस्तारित गुण" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "डिफ़ॉल्ट ट्रैकिंग" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "हमेशा ट्रैक करें" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " कभी ट्रैक न करें" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "इस एमएमएसआई पर ध्यान न दें" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "इस एमएमएसआई को एसएआरटी / पीएलबी (एआईएस) एमओबी के रूप में संभाल लें।" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "इस एमएमएसआई के लिए एआईवीडीओ को एआईवीडीएम में कनवर्ट करें" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "यह एमएमएसआई मेरा अनुसरणकर्ता है - नहीं सीपीए अलर्ट" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "एक एमएमएसआई आईडी आमतौर पर नौ अंकों की संख्या है.\n" "कृपया अपनी प्रविष्टियां जांचें और यदि आवश्यक हो तो रद्द करें।" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "एमएमएसआई गुण संपादित करें" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "एमएमएसआई गुण" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "ट्रैक मोड" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "जहाज़ का नाम" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "" -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "एमएमएसआई गुण जोड़ें" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5622,7 +5639,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5634,1180 +5651,1175 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "कॉग्गिक प्रोजेक्टर लंबाई (मिनट)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "हेडिंग प्रेडिक्टर लम्बाई (एनएमआई)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "शिप आइकन प्रकार" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "रियल स्केल बिटमैप" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "असली स्केल वेक्टर" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "सभी की लंबाई (मी)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "सभी की चौड़ाई (मी)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "बो (एम) से जीपीएस ऑफ़सेट" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "मिडशिप से जीपीएस ऑफ़सेट (मी)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "न्यूनतम स्क्रीन आकार (मिमी)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "रेंज रिंग दिखाएं" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "रिंगों के बीच की दूरी" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "दूरी इकाई" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "नॉटिकल माइल" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "किलोमीटर" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "रेंज रिंग रंग" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "डिफ़ॉल्ट रंग" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "पथ मार्ग" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "आधी रात को स्वचालित दैनिक ट्रैक" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "स्वचालित दैनिक ट्रैक पर" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "कंप्यूटर" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "यु. टी. सी" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "हाइलाइट ट्रैक" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "ट्रैकिंग प्रेसिजन" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "मूल्यों की गणना करें" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "स्थान परिवर्तन से सओजी और सीओजी की गणना करें" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "अपडेट के बीच मिनट सेकंड" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "वेपॉइंट आगमन सर्कल रेडियस (एनएमआई)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "आगमन पर अग्रिम मार्ग का रास्ता केवल" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "वेपॉइंट रेंज अंगूठी रंग" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "पटरियों और मार्गों को हटाने की पुष्टि करें" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "चार्ट फ़ाइलें" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "निर्देशिका जोड़ें..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "चुना हुआ हटाओ" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "चयनित संकुचित करें" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "अद्यतन करें नियंत्रण" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "स्कैन चार्ट और अपडेट डाटाबेस" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "बल पूर्ण डेटाबेस पुनर्निर्माण" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "सभी एनएसी चार्ट तैयार करें" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "डे-स्क्वॉ रास्टर चार्ट्स" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "त्वरित ग्राफिक्स का उपयोग करें (ओपनजीएल)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "चार्ट रोटेशन औसत समय" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "चार्ट ज़ूम / स्केल भार" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "भौतिक स्क्रीन चौड़ाई" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "चार्ट प्रदर्शन" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "विषम रास्टर चार्ट को उत्तर-अप के रूप में दिखाएं" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "कम मूल्य के साथ, एक समान ज़ूम स्तर कम विस्तृत चार्ट दिखाता है.\n" " उच्च मूल्य के साथ, एक ही ज़ूम स्तर अधिक विस्तृत चार्ट दिखाता है." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "वेक्टर चार्ट प्रदर्शन" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "मरिनर स्टैंडर्ड" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "गहराई ध्वनि" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "चार्ट सूचना वस्तुएं" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "बांधना / हल्के रंगों के" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "विस्तारित प्रकाश क्षेत्र" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "चार्ट ग्रंथों" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "चार्ट पर राष्ट्रीय पाठ" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "महत्वपूर्ण पाठ केवल" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "डे-क्लेटेड टेक्स्ट" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "चार्ट विवरण" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "छोटे पैमाने पर विस्तारित विवरण" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "ग्राफिक्स शैली" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "पेपर चार्ट" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "कम गहराई" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "सुरक्षा गहराई" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "दीप की गहराई" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "स्तरपर रीसेट करें" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "ज्वार && धाराओं" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "सक्रिय डेटासेट" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "डेटासेट जोड़ें..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "सभी उपलब्ध चार्ट" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "चार्ट निकालें" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "सभी चार्ट" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "नया समूह..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "समूह हटाएं" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "चार्ट स्विच करते समय पैमाने को संरक्षित करें" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "चिकनी पैनिंग / ज़ूमिंग" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "कर्सर को ज़ूम करें" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "प्रदर्शन सुविधाएँ" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "स्थिति बार विकल्प" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "कर्सर पर लाइव ईटीए" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "डिफ़ॉल्ट नाव स्पीड " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "संविधि मील" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "डिग्री, दशमलव मिनट" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "दशमलव डिग्री" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "डिग्री, मिनट, सेकंड" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "मान लिया गया चुंबकीय भिन्नता" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "सच बियरिंग्स और शीर्षकों दिखाएं" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "चुंबकीय बीयरिंग और शीर्षकों को दिखाएं" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "वमम प्लगइन की गणना चुंबकीय भिन्नता है" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " मैन्युअल रूप से चुंबकीय भिन्नता को सेट करने के लिए,\n" " आपको वमम प्लगइन अक्षम करना होगा" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "ध्वनि फ़ाइल चुनें" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "एआईएस लक्ष्य" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "सीपीए गणना" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "नहीं (टी) सीपीए अलर्ट यदि लक्ष्य श्रेणी (एनएमआई) से अधिक है" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "चेतावनी दें कि सीपीए (एनएमआई) से कम है" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...और टीसीपीए (मिनट) से कम है" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "(मिनट) के बाद खो गए लक्ष्यों को चिह्नित करें" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "(मिनट) के बाद खो गए लक्ष्य हटाएं" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "लक्ष्य कोग भविष्यवक्ता तीर, लंबाई (मिनट) दिखाएं" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "लक्ष्य ट्रैक, लंबाई (मिनट) दिखाएं" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "लंगर /बंधा हुआलक्ष्य को दबाएं, गति अधिकतम (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "कम महत्वपूर्ण लक्ष्यों के क्षीणन की अनुमति दें अगर लक्ष्य ... से अधिक" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "क्षेत्र नोटिस दिखाएं (एआईएस बाइनरी संदेश से)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "एआईएस लक्ष्य वास्तविक आकार दिखाएं" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "1 से अधिक पैमाने पर एआईएस लक्ष्यों के साथ नाम दिखाएँ:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "रोल ओवर" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"शिप का नाम\" एमएमएसआई (कॉल साइन)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Class] प्रकार (स्थिति)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "सीपीए टीसीपीए" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "सीपीए / टीसीपीए अलर्ट" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "सीपीए / टीसीपीए चेतावनी संवाद दिखाएं" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "सीपीए / टीसीपीए अलर्ट और डीएससी / एसआरएटी आपात स्थिति पर ध्वनि चलायें" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "लक्ष्य चेतावनी को सक्षम करें स्वीकार करें समय समाप्ति (न्यूनतम)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "आम विकल्प" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "फोंट्स" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "फ़ॉन्ट चुनें..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "फ़ॉन्ट रंग चुनें..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "टूलबार और विंडो शैली" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "इंटरफ़ेस विकल्प" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "स्थिति बार दिखाएं" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "मेनू बार दिखाएं" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "कम्पास / जीपीएस स्थिति विंडो दिखाएं" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "टूलबार स्वतःछिपाना सक्षम करें" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "शिप बैल्स चलायें" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "टचस्क्रीन इंटरफ़ेस सक्षम करें" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "स्केल किए गए ग्राफ़िक्स इंटरफ़ेस सक्षम करें" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "उपयोगकर्ता इंटरफ़ेस स्केल फैक्टर" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "चार्ट ऑब्जेक्ट स्केल फ़ैक्टर" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "शिप स्केल फैक्टर" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "लागू करें" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "रेखा-चित्र" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "संपर्क" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "जहाजों" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "प्रयोक्ता इंटरफ़ेस" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "प्लगइन्स" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "उपयोगकर्ता सेट चुंबकीय विविधता" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "पैर का पंजा" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "गहराई का माप" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "चार्ट फ़ाइलों वाले निर्देशिका जोड़ें" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " -आपके जहाज की लंबाई होना चाहिए > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " -आपके जहाज की किरणहोना चाहिए > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - मिडशिप से ऑफसेट आपके जीपीएस को आपके जहाज के किरण के भीतर होना चाहिए" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - धनुष से आपके जीपीएस ऑफसेट आपके जहाज की लंबाई के भीतर होना चाहिए" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - आपका न्यूनतम जहाज चिह्न आकार 1 और 100 मिमी के बीच होना चाहिए" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "स्वयं जहाज के आकार की सेटिंग्स सही नहीं हैं:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6817,86 +6829,86 @@ msgstr "संपीड़न डिस्क पर चार्ट फाइ "संकुचित चार्ट कुछ सिस्टम लोड करने और प्रदर्शित करने में थोड़ी अधिक समय लग सकता है\n" "वे unxz या 7 zip प्रोग्रामों का उपयोग करके फिर से असंपीड़ित हो सकते हैं ।" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "ओपनसीपीएन संपीड़न चार्ट" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "संकुचित करने के लिए कोई चार्ट नहीं मिला" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "संकुचित % ld चार्ट% से%.1fMB से %.1fMB \\ n सहेजे गए %.1fMB (%.1f %%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "समूह नाम दर्ज करें" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "नया चार्ट समूह" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "टाइड / वर्तमान डेटा का चयन करें" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "बनावट संपीड़न" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "कैशिंग के साथ बनावट संपीड़न" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "बनावट संपीड़न कैशिंग" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "बनावट मेमोरी आकार (एमबी)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "आकार: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "बनावट कैश के पुनर्निर्माण" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "साफ़ बनावट कैश" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "बहुभुज चिकनाई" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "लाइन चिकनाई" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "सॉफ्टवेयर ओपनजीएल (ओपनसीपीएन को पुनरारंभ करें)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "त्वरित पैनिंग का उपयोग करें" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "बनावट सेटिंग्स" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "बनावट कैश" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "कई तरह का" @@ -6978,127 +6990,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7143,10 +7155,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "ज्वार वर्तमान ग्राफ रोलओवर" @@ -7264,12 +7272,6 @@ msgstr "ट्रैक से रूट" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7473,15 +7475,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7786,7 +7788,7 @@ msgstr "(सेक्टर के सच बियरिंग् msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7902,7 +7904,7 @@ msgstr "" msgid "Tomorrow" msgstr "" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "" @@ -8184,153 +8186,156 @@ msgstr "वेपॉइंट हटो" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_hu_HU.po b/po/opencpn_hu_HU.po index c7e26a6531..4bfa971c48 100644 --- a/po/opencpn_hu_HU.po +++ b/po/opencpn_hu_HU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Hungarian\n" "Language: hu_HU\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Névtelen nyomvonal)" @@ -414,7 +414,7 @@ msgstr "Kereső-mentő repülőgép" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Utolsó ismert)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Pozíció" @@ -509,11 +509,11 @@ msgstr "Jobb" msgid "Left" msgstr "Bal" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Sebesség" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Szélesség" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Hajózási jelzés" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Alap" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2437,8 +2437,8 @@ msgstr "Az útpontokat átnevezem az természetes sorrend szerint. A nevek '001' "Át akarod nevezni az útpontokat?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Az OpenCPN-ről" @@ -2484,9 +2484,9 @@ msgstr "Felülírjam a Garmin eszköz 1-es útvonalát?" msgid "OpenCPN Message" msgstr "OpenCPN üzenet" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Beállítások" @@ -2528,7 +2528,7 @@ msgstr "Kiválasztott nyomvonal nyomtatása" msgid "Track properties" msgstr "Nyomvonal tulajdonságok" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2541,12 +2541,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2644,23 +2644,23 @@ msgstr "Plugin API: " msgid "OpenCPN Website" msgstr "OpenCPN honlap" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Az OpenCPN súgója lokálisan nem elérhető." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Fel szeretnéd keresni az opencpn.org weblapot további információért?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3060,7 +3060,7 @@ msgstr "Törlés - csatolt üzenetben leírt területek törlése" msgid "Undefined (default)" msgstr "Nem definiált (alapértelmezett)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS Target Neve" @@ -3071,7 +3071,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS Riasztás" @@ -3087,7 +3087,7 @@ msgstr "Figyelmeztetés némítása" msgid "&Jump To" msgstr "Ugrás ide" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Útpont létrehozása" @@ -3110,7 +3110,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS célpont lista" @@ -3199,38 +3199,38 @@ msgstr "Célpont szám" msgid "Undock Target List" msgstr "Target lista leválasztása" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Nyomvonal mentése" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Ennek a célpontnak az eddigi nyomvonala fel van véve.\n" "Folytatni akarod a felvételt az OpenCPN jelenlegi használatának végéig?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS Cél Lekérdezés" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Rendben" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Nyomkövetés leállítása" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menü" @@ -3284,7 +3284,7 @@ msgstr "Hajó mozgatása ide" msgid "Navigate To Here" msgstr "Ide navigálni" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Irány fent mód" @@ -3293,8 +3293,8 @@ msgid "Heading Up Mode" msgstr "Irány fent mód" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Észak fent mód" @@ -3303,7 +3303,7 @@ msgid "Chart Up Mode" msgstr "Térkép fent mód" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Teljes képernyő váltás" @@ -3328,7 +3328,7 @@ msgstr "Nyomvonal beillesztés" msgid "CM93 Offset Dialog..." msgstr "CM93 offszet beállítások" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Térkép csoportok" @@ -3446,7 +3446,7 @@ msgstr "Másolás KML-ként" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Törlés" @@ -3600,18 +3600,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "Térkép panel beálltások." -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigáció mód" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Észak fent" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Irány fent" @@ -3619,32 +3619,32 @@ msgstr "Irány fent" msgid "Heading Up" msgstr "Irány fent" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Előretekintő mód" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Megjelenítési beállítások" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Térkép összefűzés engedélyezése" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Rács mutatása" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Térkép körvonalak mutatása" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Mélység mértékegység mutatása" @@ -3664,7 +3664,7 @@ msgstr "Árapály és áramlatok" msgid "Show Tide stations" msgstr "Árapály állomások mutatása" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Áramlatok mutatása" @@ -3680,8 +3680,8 @@ msgstr "Szöveg mutatása" msgid "Show depths" msgstr "Mélység mutatása" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Bója/fény címkék" @@ -3689,8 +3689,8 @@ msgstr "Bója/fény címkék" msgid "Lights" msgstr "Fények" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Fények leírása" @@ -3706,18 +3706,18 @@ msgstr "Látható szektor fények mutatása" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Megjelenítési kategória" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Mind, kivéve" @@ -3762,7 +3762,7 @@ msgstr "Akvív katalógusként használ" msgid "Latest available catalog:" msgstr "Lgefrissebb elérhető katalógus:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Nem tölthető le adat az urlről" @@ -3817,8 +3817,8 @@ msgstr "Sikertelen:" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4150,28 +4150,28 @@ msgstr "Nem' válasz esetén új útpontok jönnek létre ugyanazon a helyen." msgid "Merge waypoints?" msgstr "Összefésüljem az útpontokat?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile használatához az OpenGL-t engedélyezni kell" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "láb" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "méter" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "öl" @@ -4179,7 +4179,7 @@ msgstr "öl" msgid "OverZoom" msgstr "Túlnagyítás" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "ExtendedTideIcon" @@ -4195,7 +4195,7 @@ msgstr "AIS célpont lekérdezése" msgid "Show all AIS Targets" msgstr "Minden AIS célpont mutatása" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Kevésbé kritikus AIS targetek elrejtése" @@ -4243,9 +4243,9 @@ msgstr "Felhasználói X eltolás" msgid "User Y Offset" msgstr "Felhasználói Y eltolás" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "méter" @@ -4256,11 +4256,13 @@ msgstr "Ez a szakasz" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Konzol felirat" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Konzol érték" @@ -4296,12 +4298,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Cím" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4330,7 +4332,7 @@ msgid "Less" msgstr "Kevesebb" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4619,12 +4621,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN figyelmeztetés" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN információ" @@ -4633,17 +4635,17 @@ msgstr "OpenCPN információ" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Minden kijelölése" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Minden törlése" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Hozzáad" @@ -4669,59 +4671,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Általános" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Új kapcsolat beállítása" @@ -4779,7 +4781,7 @@ msgid "Install" msgstr "Telepít" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Újratelepítés" @@ -4787,7 +4789,7 @@ msgstr "Újratelepítés" msgid "Update" msgstr "Frissít" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Visszaállás korábbi verzióra" @@ -4817,7 +4819,7 @@ msgid " successfully installed" msgstr " sikeresen telepítve" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "A telepítés kész" @@ -4825,6 +4827,21 @@ msgstr "A telepítés kész" msgid "Installation error" msgstr "Hiba a telepítés során" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AISfelirat" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4837,7 +4854,7 @@ msgstr "Raszteres térkép tömörítésének befejezésére vár." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN tömörített gyorsítótár frissítés" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Saját hajótól való távolság: %4.0f NMi" @@ -4958,7 +4975,7 @@ msgstr "Az útvonapont része egy rétegnek és nem szerkeszthető" msgid "Icon" msgstr "Kép" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4968,7 +4985,7 @@ msgid "Links" msgstr "Hivatkozások" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5009,22 +5026,22 @@ msgstr "Távolság gyűrűk" msgid "Number" msgstr "Szám" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Távolság" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Szín:" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Semmi" @@ -5113,16 +5130,16 @@ msgstr "Csak adott méretaránynál mutassa" msgid "Tide Station not found" msgstr "Árapály állomás nem találhtó" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Méretarány beállítása" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Térkép méretarány" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Tartós" @@ -5154,35 +5171,35 @@ msgstr "NMEA nyomkövető ablak" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5230,8 +5247,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5239,277 +5256,277 @@ msgstr "" msgid "Anchorage created " msgstr "Horgonyzóhely létrehozva " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Nyomkövetés bekapcsolása" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Automatikus követés" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Nagyítás" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Kicsinyítés" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Térkép fejléc mutatása" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "ENC szöveg mutatása" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Árapály mutatása" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Szín-séma váltása" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "AIS célpontok mutatása" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Útvonal létrehozása" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Ember A Vízben jel lerakása" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Beállítások" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Nem sikerült a nyomtatás.\n" "Lehet, hogy a nyomtató nincs jól beállítva?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Névtelen útvonal)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Saját hajó" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Útvonalak és jelek kezelése" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Térkép nyomtatása" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Szóköz)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5517,105 +5534,105 @@ msgstr "Privát konfigurációs sablon készítése az aktuális beállítások "A sablon el lesz mentve és készőbb bármikor használtahtó.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI kiterjesztett tuladjonságok" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Nyomkövetés" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Alapértelmezett nyomkövetés" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Mindig kövesse" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "Sose kövesse" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Hagyja figyelmen kívül ezt az MMSI-t" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Kezelje ez az MMSI-t mint SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Konvertálja az AIVDM-et AIVDO-ra ennél az MMSI-nél" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Ez ez MMSI követ engem - nincs CPA riasztás" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Az MMSI Id rendszerint 9 számjegyből áll.\n" "Ellenőrizt és töröld, ha szükséges." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Alap" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Mindig" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Soha" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "MMSI tulajdonságok szerkesztése" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI Tulajdonságok" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Nyömvonal mód." -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Mellőz" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB (Ember a vízben)" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Hajó neve" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Követő" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Új..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "MMSI tulajdonság hozzáadása" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5633,7 +5650,7 @@ msgstr "A kiválasztott eszköz nem elérheő, OpenCPN valószínűleg nem lesz "\n" "További információért keresd a LINUX_DEVICES.md fájlt a rendszer dokumentációk között.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5653,1179 +5670,1174 @@ msgstr "\n" "\n" "További információért keresd a LINUX_DEVICES.md fájlt a rendszer dokumentációk között.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG előrejelzés hossza (perc):" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Irány előrejelző hossza (tmf)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Hajó ikon típusa" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Valós méretarányú bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Valós méretarányú vektor" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Teljess hossz (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Teljes szélesség (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS eltolás az orrtól (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS eltolás a középvonaltól (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Minimális képernyőméret (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Távolság gyűrűk mutatása" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Gyűrűk közötti távolság" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Távolság egység" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Tengeri mérföld" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilométer" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Távolság gyűrűk színe" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Mutassa az irányt az aktív útvonalpont felé" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Stílus:" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Szilárd" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Pont" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Hosszú vonás" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Rövid vonás" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Pont vonás" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Alapszín" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Fekete" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Sötétpiros" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Sötétzöld" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Sötét-sárga" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Sötétkék" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Sötét-magenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Sötétlila" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Sötétszürke" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Sötétszürke" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Vörös" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Zöld" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Sárga" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Kék" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Lila" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Fehér" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Nyomvonalak" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatikus napi nyomvonalak éjfélkor" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatikus napi nyomvonalak ekkor" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Számítógép" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Nyomvonal kiemelése" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Nyomvonal pontosság" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Alacsony" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Közepes" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Magas" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Értékek számítása" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "SOG és COG értékekek számítása a pozícióváltozásokból" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Frissítések közötti minimális másodperc" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Útvonal/Pontok" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Új útvonalak" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Útvonalpont alapértelmezett ikon" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Útvonalpont érkezési kör sugara (tmf)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Következő útvonalpontra léptetés csak megérkezéskor" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "A méretaránytól függő láthatóság felülbírálata, hogy mindig látahtó legyen" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Útvonalpont távolsággyűrű színek" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Vezérlési beállítások" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Erősítsd meg a nyomvonalak és útvonalak törlését" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Térkép fájlok" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Könyvtárak" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Könyvtár hozzáadása..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Kiválasztottak törlése" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Kijelöltek tömörítése" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Hozzáad.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Eltávolít" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Tömörít" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Térképek migrálása..." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Frissítés" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Térképek átnézése és adatbázis frissítése" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Teljes adatbázis újraépítés kényszerítése" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Minden ENC térkép előkészítése" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "[Módosított]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Sablonok" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Sablon státusz" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Utoljára alkalmazott sablon neve:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Mentett sablonok" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Konfiguráció létrehozása..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Kiválasztott konfiguráció törlése..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Kiválasztott konfiguráció alkalmazása" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Konfiguráció létrehozása" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Nem sikerült a kiválasztott konfigurációt alkalmazni" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Haladó" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Raszteres térképek kiegyenesítése" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Grafikus gyorsítás használata (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL beállítások" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Térkép forgatási idő átlagolása" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "másodperc" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Térkép zoom/méretarány súlyozása" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raszter" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektor" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 részletességi szint" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Fizikai képernyő szélesség" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Automatikus" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Kézi" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Térkép kijelző" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Torzított raszter térképeket észak fent módon jeleníti meg" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Kisebb éréknél az azonos nagyítás kevesebb részetet mutat a térképen.\n" "Nagyobb értéknél azonos nagyítás több részletet mutat." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafika" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vektoros tékép kijelzés" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Mariner's Standard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Mélység adatok" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Térkép informcáiós objektumok" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bóják / fények" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Kiterjesztett fény szektorok" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Térkép szövegek" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Nemzeti szövegek a térképen" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Csak a fontos szövegek" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Szöveg kitisztázása" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Térkép részletesség" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Csökkentett részletesség kis méretaránynál" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafika stílus" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Papír térkép" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Egyszerűsített" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Határok" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Sima" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Szimbólumos" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Színek" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 színű" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 színű" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Sekély" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Biztonságos" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Mély" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Szabványos objektumok használata" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Visszaállítás STANDARD-ra" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Árapály és áramlatok" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktív adatok" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Adatok hozzáadása..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Minden elérhető térkép" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Térkép eltávolítása" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Minden térkép" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Új csoport..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Csoport törlése" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Lépték megtartása térkép váltáskor" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Vezérlők" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Folyamatos görgetés / zoomolás" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Kurzorhoz nagyítás" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Elemek megjelenítése" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Állapotsor opciók" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Aktuális ETA a kurzornál" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Alapértelmezett hajó sebesség" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Kép elrendezése" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Állapotsor" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Mértékegységek" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Mérföld" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Csomó" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mérföld per óra" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Mélység" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Hőmérséklet" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Farenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Szél./Hossz." -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Fok, tizedes percek" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Tizedes fokok" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Fok, perc, másodperc" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Iránylatok" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Valós mutatása" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Mágneses mutatása" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Feltételezett mágneses variáció" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "fok (-Ny, +K)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Valós iránylatok és irányok mutatása" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Mágneses iránylatok és irányok mutatása" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM plugin által számolt mágneses variáció" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "A mágneses variáció kézi beállításához kapcsold ki a WMM plugint!" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Teszt" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Audió fájl neve:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Hang fájl kiválasztása" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Hangok" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Horgonyőr" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Hang lejátszása horgonyőr riasztásnál." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Horgonyőr riasztás hang kiválasztása" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Hang lejátszása AIS riasztásnál." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "AIS riasztás hang kiválasztása" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART Riasztás" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Hang lejátszása AIS SART riasztásnál." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "AIS SART riasztás hang kiválasztása" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC riasztás" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Hang lejátszása DSC értesítésnél." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Válasszon DSC értesítés hangot" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Ismeretlen eszköz:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Beviteli eszköz:" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Hangeszköz" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Audio Play parancs:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS célpontok" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA számítás" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Ne számítson (T)CPA-t, ha a célpont távolsága nagyobb mint (tmf)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Figyelmeztetés, ha a CPA kevesebb mint (tmf)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr " .. és a TCPA kevesebb mint (perc)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Eltűnt célpontok" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Célpont eltűntnek nyilvánítása ennyi idő után (perc)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Eltűnt célpontok eltávolítása (perc)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Megjelenítés" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "COG előrejelző nyíl mutatása, hossz (perc)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Célpont nyomvonalának mutatása, hossz (perc)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Veszteglő/kikötött célpontok elnyomása, max sebesség (csomó)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Valósidejű AIS predikciók rajzolása, minimális célpont sebesség (csomó)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Kevésbé kritikus célpontok rejtése, ha több mint ... céélpont van" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Területi közlemények mutatása (AIS bináris üzenetekből)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "AIS célpontok mutatása valós méretben" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Nevek mutatása az AIS célpontokkal ha a méretarány nagyobb, mint 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "WPL pozíció üzenetek használata. Vételük esetén végrehajtandó:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS pozíció jelentés" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Jel létrehozása" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Görgetés" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Útvonal/AIS infó engedélyezése" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Hajó neve\" MMSI (hívónév)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Osztály] Típus (Állapot)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA risztás" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "CPA/TCPA riasztás dialógus mutatása" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Hangjelzés CPA/TCPA risztás esetén" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Risztás elnyomása veszteglő célpontok esetében" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Célpont riasztás visszaigazolás időzítés engedélyezése (perc)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Általános beállítások" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Nyelv" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Betűtípus" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Betűtípus választása..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Betűtípus választása..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Minta" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Eszköztár és ablak stílus" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Felület beállításai" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Állapotsor mutatása" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Menüsor megjelenítése" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Kompassz/GPS státusz ablak mutatása" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Eszköztár automatikus elrejtése" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Hajóharang kongatása" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Érintőképernyő engedélyezése" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Átméretezett grafikus felület engedélyezése" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Zoom gombok megjelenítése" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Felhasználói felület méretaránya" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Térkép objektumok méretaránya" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Hajó méretaránya" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC mélység faktor" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Alkalmaz" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Térképek" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Kapcsolatok" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Hajók" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Felhasználói felület" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Modulok" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Beállított mágneses variáció használata" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "láb" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "öl" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Térkép állományokat tartalmazó könyvtárak hozzáadása" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - hajód hosszának > 0 kell lennie." -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - hajód szélességének > 0 kell lennie." -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - a GPS eltolásnak a középvonaltól a szélességen belül kell lennie." -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - a GPS eltolásnak az orrtól a hosszon belül kell lennie." -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - a minimális hajó ikon méretnek 1 és 100 mm között kell lennie" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "A saját hajó valós méreteinek beállításai nem jók" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6835,15 +6847,15 @@ msgstr "A tömörítés megváltozttja a lemezen lévő térkép állományokat. "A tömörített térképek egyes rendszereken lassabb töltődnek be és jelenítődnek meg.\n" "Újra ki lehet őket tömöríteni az unxz vagy a 7zip programmal." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN térképek tömörítése" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Nincs tömöríthető térkép" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6852,71 +6864,71 @@ msgstr "betömörített %ld térképet\n" "%.1fMB-ról %.1fMB-ra\n" "megtakarítás %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Csoport nevének megadása" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Új térkép csoport" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Árapály és áramlat adatok kiválasztása" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Textúratömörítés" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Textúratömörítés gyorsítótárazással" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Textúratömörítés gyorsítótárazás" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Textúra memória méret (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Méret:" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Textúra gyorsítótár újraépítése" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Textúra gyorsítótár törlése" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Poligon simítás" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Vonal simítás" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Szoftver OpenGL (OpenCPN újraindul)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Grafikus gyorsítás használata (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Textúra beállítások" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Textúra gyorsítótár" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Egyebek" @@ -6998,127 +7010,127 @@ msgstr "További nformációért nézd meg a naplóűllományt!" msgid " successfully installed from cache" msgstr " sikeresen telepítve a gyorsítótárból" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Ezek a beállítások instabillá tehetik az OpenCPN-t és ezért alaphelyzetben le vannak tiltva. Ha ezen veszély ellenére enegedélyzni akarod, akkor add a CatalogExpert=1 sort a konfigurációs fájl [PlugIns] szakaszába." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Plugin katalógus" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "A plugin katalógus frissítése" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Plugin importálása ..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Beállítások..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Letiltva" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "A plugin mester-katalógus frissítése" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN katalógus frissítés" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "A katalógus fájl másolása sikertelen" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "A katalógus fájl gyorsítótárba másolása sikertelen" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Katalógus frissítése sikeres" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Válaszd ki a tar fájlt." -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN Plugin import hiba" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Inkompatibilis plugin" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Hiba történt a plugin inport tar fájl kibontásakor." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktív katalógus" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Utolsó katalógus" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Utolsó módosítás:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Frissitsd a plugin katalógust." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Eltávolitás" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Engedélyezve" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Frissítés erre a verzóra" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Telepítés..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Frissítés" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Weboldal" @@ -7163,10 +7175,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AISfelirat" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TideCurrentGraphRollover" @@ -7284,12 +7292,6 @@ msgstr "Útvonal nyomvonalból" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7490,15 +7492,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7803,7 +7805,7 @@ msgstr "(Szektor szögek valós irányok a víz felé)
" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7919,7 +7921,7 @@ msgstr "Ma" msgid "Tomorrow" msgstr "Holnap" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Eszköz súgók" @@ -8201,153 +8203,156 @@ msgstr "Útpont mozgatása" msgid "Dismiss" msgstr "Bezárás" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_id_ID.po b/po/opencpn_id_ID.po index 5b2119c77c..a3315236e7 100644 --- a/po/opencpn_id_ID.po +++ b/po/opencpn_id_ID.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Indonesian\n" "Language: id_ID\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Jalur tanpa nama)" @@ -414,7 +414,7 @@ msgstr "Pesawat SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Terakhir Diketahui)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posisi" @@ -509,11 +509,11 @@ msgstr "Kanan" msgid "Left" msgstr "Kiri" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Kecepatan" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Ketinggian" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Bantuan untuk Navigasi" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Pangkalan" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Tentang OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Pilihan" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "Melacak properti" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "Pembatalan - batalkan area seperti yang teridentifikasi oleh pesan Linka msgid "Undefined (default)" msgstr "Tidak dijelaskan (kelalaian)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nama target AIS" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Siaga AIS" @@ -3085,7 +3085,7 @@ msgstr "&Peringatan diheningkan" msgid "&Jump To" msgstr "&Melompat ke" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Membuat titik arah" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Daftar target AIS" @@ -3197,38 +3197,38 @@ msgstr "Jumlah target" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Catatan jalur" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Jalur yang baru saja diambil dari target ini telah dicatat.\n" "Apakah anda ingin terus mencatat sampai akhir sesi OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Permintaan Sasaran AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Berhenti melacak" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3282,7 +3282,7 @@ msgstr "Pindahkan Perahu Disini" msgid "Navigate To Here" msgstr "Arahkan Ke sini" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Mode Haluan Atas" @@ -3291,8 +3291,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Mode Utara" @@ -3301,7 +3301,7 @@ msgid "Chart Up Mode" msgstr "Mode Grafik atas" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Beralih Layar Penuh" @@ -3326,7 +3326,7 @@ msgstr "Tempel Jalur" msgid "CM93 Offset Dialog..." msgstr "Mengimbangi dialog CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Kelompok grafik" @@ -3444,7 +3444,7 @@ msgstr "Salin sebagai KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Hapus" @@ -3598,18 +3598,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Mode Navigasi" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Ke Utara" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Atas Kursus" @@ -3617,32 +3617,32 @@ msgstr "Atas Kursus" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Melihat cara selanjutnya" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Pilihan tampilan" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Mengaktifkan bagan Quilting" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Tampilkan Kotak" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Tampilkan bagan garis" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Tampilkan Unit Kedalaman" @@ -3662,7 +3662,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Tampilkan Sekarang" @@ -3678,8 +3678,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Pelampung/lampu tanda" @@ -3687,8 +3687,8 @@ msgstr "Pelampung/lampu tanda" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Gambaran cahaya" @@ -3704,18 +3704,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Tampilan kategori" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standar" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Semua" @@ -3760,7 +3760,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3815,8 +3815,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4148,28 +4148,28 @@ msgstr "Menjawab 'Tidak' akan menciptakan semua titik arah baru untuk jalur ini. msgid "Merge waypoints?" msgstr "Menggabungkan titik temu?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Project testing" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Kaki" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Meter" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Memahami" @@ -4177,7 +4177,7 @@ msgstr "Memahami" msgid "OverZoom" msgstr "Lebih besar" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Translation" @@ -4193,7 +4193,7 @@ msgstr "AIS Tujuan Pertanyaan" msgid "Show all AIS Targets" msgstr "Tampilkan semua AIS tujuan" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Atenuasi kurang kritis target AIS" @@ -4241,9 +4241,9 @@ msgstr "Mengimbangi X pengguna" msgid "User Y Offset" msgstr "Mengimbangi Y pengguna" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "meter" @@ -4254,11 +4254,13 @@ msgstr "Kaki ini" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Konsol legenda" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Nilai konsol" @@ -4294,12 +4296,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4328,7 +4330,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4617,12 +4619,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Peringatan OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Informasi OpenCPN" @@ -4631,17 +4633,17 @@ msgstr "Informasi OpenCPN" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Pilih Semua" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Bersihkan Semua" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Tambah" @@ -4667,59 +4669,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Umum" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4777,7 +4779,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4785,7 +4787,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4815,7 +4817,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4823,6 +4825,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AISRollover" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4835,7 +4852,7 @@ msgstr "Menunggu grafik raster benang kompresi keluar." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Jarak dari kapal: %4.0f NMi" @@ -4956,7 +4973,7 @@ msgstr "" msgid "Icon" msgstr "Ikon" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4966,7 +4983,7 @@ msgid "Links" msgstr "Tautan" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5007,22 +5024,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Jarak" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Warna" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Tidak ada" @@ -5111,16 +5128,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Gigih" @@ -5152,35 +5169,35 @@ msgstr "Tampilan jendela Debug NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5228,8 +5245,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5237,381 +5254,381 @@ msgstr "" msgid "Anchorage created " msgstr "Anchorage diciptakan " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Aktifkan Pelacakan" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Otomatis diikuti" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Memperbesar" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Memperkecil" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Tampilkan bagan balok" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Tampilkan teks ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Pasang Tampilkan" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Mengubah skema warna" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Tampilkan AIS target" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Membuat Rute" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Drop MOD Penanda" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Pereferensi" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Ada masalah pada proses pencetakan.\n" "Mungkin pencetak anda saat ini tidak diatur dengan benar?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Jalur yang tidak dikenal)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Kapal sendiri" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Manajer Rute & Mark" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Mencetak bagan" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Properti Extended MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Pelacakan" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Pelacakan default" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Selalu lacak" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Jangan pernah melacak" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Abaikan MMSI ini" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Menangani ini MMSI sebagai SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Mengubah AIVDM ke AIVDO untuk MMSI ini" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "MMSI ini adalah Follower - No BPA Alert" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Id MMSI umumnya berjumlah sembilan digit.\n" " Silakan periksa entri Anda dan batalkan jika perlu." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Bawaan" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Selalu" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Tidak pernah" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Sunting pengaturan MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Pengaturan MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Mode lintasan" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Abaikan" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nama kapal" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Pengikut" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Baru..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Tambahkan pengaturan MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5622,7 +5639,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5634,1180 +5651,1175 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Panjang Prediktor COG (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Judul Predictor Length (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Jenis ikon kapal" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Skala nyata Bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Menunjukkan skala sebenarnya" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Panjang atas semua (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Lebar atas semua (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS keluar dari busur (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS keluar dari tengah pelayaran (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Layar ukuran minimal (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Menunjukkan berbagai batas" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Jarak antara batas" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Satuan unit" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Mil laut" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometer" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Jarak lingkaran warna" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Gaya" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Padat" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Titik" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Tanda pisah yang panjang" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Tanda pisah yang pendek" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Tanda pisah titik" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Warna bawaan" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Hitam" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Merah Gelap" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Hijau Gelap" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Kuning Gelap" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Biru Tua" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta Gelap" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Cyan Gelap" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Abu-abu Muda" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Abu-abu gelap" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Merah" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Hijau" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Kuning" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Biru" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Biru" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Putih" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Lintasan" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatic Daily Tracks pada tengah malam" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Trek Harian Otomatis di" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Komputer" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Sorot lintasan" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Pelacakan presisi" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Rendah" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Medium" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Tinggi" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Menghitung nilai" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Menghitung SOG dan COG dari perubahan posisi" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Minimal detik di antara pembaruan" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Waypoint Arrival Circle Radius (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Titik temu jalur awal pada saat kedatangan saja" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Jarak lingkaran warna pada titik arah" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Konfirmasikan penghapusan lintasan dan jalur" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Bagan berkas" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Direktori" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Tambahkan Direktori..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Hapus yang dipilih" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Meringkaskan yang dipilih" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Menghapus" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Memperbarui kontrol" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Scan Charts dan Update Database" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Memaksa kembali penyimpanan data yang sudah penuh" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Persiapkan semua bagan ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Maju" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "De-skew grafik raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Gunakan Accelerated Graphics (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Bagan Rotasi Rata-Rata Waktu" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "detik" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Perbesar bagan/bobot skala" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektor" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Lebar Layar Fisik" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Otomatis" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manual:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Tampilan bagan" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Tampilkan Sketsa Raster Charts sebagai North-Up" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Dengan nilai yang lebih rendah, tingkat pembesaran yang sama menunjukkan bagan yang kurang rinci.\n" "Dengan nilai yang lebih tinggi, tingkat pembesaran yang sama menunjukkan bagan yang lebih rinci." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafis" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Tampilan Grafik Vektor" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Standar pelayaran" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Kedalaman Suara" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Bagan informasi objek" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Pelampung/lampu" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Bidang lampu yang diperpanjang" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Bagan teks" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Teks nasional pada bagan" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Hanya teks penting" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Teks berantakan" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Rincian bagan" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Mengurangi Detail pada Skala Kecil" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Gaya Grafis" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Kertas grafik" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Disederhanakan" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Batas" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Sederhana" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Dilambangkan" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Warna" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Warna" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Warna" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Kedalaman Dangkal" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Kedalaman yang aman" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Kedalaman" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Setel ulang ke STANDAR" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Pasang surut air laut & pasang" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Dataset Aktif" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Tambahkan Dataset..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Semua bagan yang tersedia" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Menghapus bagan" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Semua bagan" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Grup Baru..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Hapus Grup" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Pertahankan skala saat beralih grafik" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Kendali" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Halus mendulang / menanjak" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Untuk Perbesar cursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Fitur tampilan" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Opsi Status Bar" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Hidup di ETA Kursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Kecepatan Perahu " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unit" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Undang-undang mil" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Knot" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Kedalaman" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lintang/bujur" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Derajat, desimal menit" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Desimal derajat" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Derajat, menit, detik" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Hubungan" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Menunjukkan benar" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Diasumsikan perbedaan magnetik" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Tunjukkan bantalan dan judul yang benar" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Tunjukkan bantalan dan judul magnetik." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Aplikasi tambahan WMM menghitung perbedaan magnetik" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Untuk mengatur perbedaan magnetik secara manual,\n" " anda harus menonaktifkan aplikasi tambahan WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Pilih berkas suara" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Sasaran AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Perhitungan CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Tidak ada peringatan CPA(T) jika kisaran sasaran lebih besar dari (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Memperingatkan jika CPA kurang (NMi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...dan TCPA berjarak kurang dari (minimal)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Target yang hilang" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Tandai target hilang setelah (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Hapus target yang hilang setelah (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Tampilan" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Tampilkan panah prediksi prediktor COG, panjang (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Tampilkan trek target, panjang (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Menekan target berlabuh / ditambatkan, kecepatan maks (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Izinkan pelemahan target yang kurang penting jika lebih dari ... target" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Tampilkan pemberitahuan area (dari pesan biner AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Tampilkan AIS menargetkan ukuran sebenarnya" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Tunjukkan nama dengan target AIS pada skala lebih besar dari 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Berputar" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Nama Kapal\" MMSI (Call Sign)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Class] tipe (status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Tanda BPA / TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Tampilkan Dialog Lansiran BPA / TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Mainkan Sound on CPA / TCPA Alerts dan DSC / SART emergencies." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Aktifkan Target Alert Mengakui timeout (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Pilihan umum" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Bahasa" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Huruf-huruf" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Pilih Huruf..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Pilih Warna Huruf..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Toolbar dan Gaya Jendela" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Pilihan Antarmuka" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Tampilkan Bar Status" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Tampilkan Menu Bar" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Tampilkan Jendela Status Kompas / GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Aktifkan Toolbar secara otomatis" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Mainkan Ships Bells" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Aktifkan antarmuka layar sentuh" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Aktifkan antarmuka Scaled Graphics" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Faktor skala User Interface" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Faktor ukuran Chart Object" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Faktor skala kapal" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Menerapkan" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Grafik" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Koneksi" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Kapal" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Antarmuka pengguna" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Tambahan" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Pengguna mengatur perbedaan magnetik" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "kaki" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "mengerti" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Tambahkan sebuah penyimpan data yang berisi berkas bagan" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - panjang kapal anda harus > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - balok kapal anda harus > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - GPS kamu mengimbangi dari tengah perjalanan anda harus berada dalam kapal balok" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - GPS kamu mengimbangi dari busur harus anda harus berada dalam jarak kapal anda" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - ukuran tanda kapal minimal anda harus antara 1 dan 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Pengaturan untuk ukuran kapal sebenarnya tidak benar:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6817,15 +6829,15 @@ msgstr "Kompresi akan mengubah file grafik pada disk.\n" " Grafik terkompresi mungkin memerlukan waktu sedikit lebih lama untuk dimuat dan ditampilkan pada beberapa sistem.\n" " Mereka dapat didekompresi lagi dengan menggunakan program zip unxz atau 7." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Menekan bagan OpenCPN" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Bagan tidak ditemukan untuk ditekan." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6834,71 +6846,71 @@ msgstr "dikompresi %ld grafik\n" "dari %.1fMB untuk %.1fMB\n" "disimpan %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Masukkan nama kelompok" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Kelompok bagan baru" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Pilih Tide/Current Data" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Tekstur Kompresi" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Tekstur Kompresi dengan Caching" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Kompresi Tekstur Caching" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Ukuran Memori Tekstur (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Ukuran: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Bangun kembali Tekstur Cache" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Bersihkan Tekstur Cache" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Poligon smoothing" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Menghaluskan garis" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "OpenGL perangkat lunak (restart OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Gunakan Dipercepat Panning" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Pengaturan Tekstur" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Tekstur Cache" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Miscellaneous" @@ -6980,127 +6992,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7145,10 +7157,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AISRollover" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7266,12 +7274,6 @@ msgstr "Jalur dari lintasan" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7475,15 +7477,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7788,7 +7790,7 @@ msgstr "(sudut sektor merupakan bantalan dari menuju ke laut)The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7904,7 +7906,7 @@ msgstr "Hari ini" msgid "Tomorrow" msgstr "Besok" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Keterangan alat" @@ -8186,153 +8188,156 @@ msgstr "Memindahkan titik arah" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_is_IS.po b/po/opencpn_is_IS.po index 19620f3463..29a605ed5d 100644 --- a/po/opencpn_is_IS.po +++ b/po/opencpn_is_IS.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Icelandic\n" "Language: is_IS\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "" @@ -414,7 +414,7 @@ msgstr "" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr "" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Staðsetning" @@ -509,11 +509,11 @@ msgstr "Hægri" msgid "Left" msgstr "Vinstri" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Hraði" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Hæð" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/t" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "" @@ -2435,8 +2435,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Um OpenCPN" @@ -2482,9 +2482,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Valkostir" @@ -2526,7 +2526,7 @@ msgstr "" msgid "Track properties" msgstr "Slóðar stillingar" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2539,12 +2539,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2641,23 +2641,23 @@ msgstr "Forritunarviðmóts Viðbót: (API)" msgid "OpenCPN Website" msgstr "Heimasíða OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN hjálpargögnin eru ekki fáanleg á staðnum." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Viltu fara á opencpn.org vefsíðuna til að fá frekari upplýsingar?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3057,7 +3057,7 @@ msgstr "" msgid "Undefined (default)" msgstr "" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "" @@ -3068,7 +3068,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS aðvörun" @@ -3084,7 +3084,7 @@ msgstr "" msgid "&Jump To" msgstr "&Hoppa til" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "" @@ -3107,7 +3107,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "" @@ -3196,37 +3196,37 @@ msgstr "" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Í lagi" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Valmynd" @@ -3280,7 +3280,7 @@ msgstr "" msgid "Navigate To Here" msgstr "" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "" @@ -3289,8 +3289,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "" @@ -3299,7 +3299,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3324,7 +3324,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3442,7 +3442,7 @@ msgstr "Afrita sem KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Eyða" @@ -3596,18 +3596,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Norður upp" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Stefna upp" @@ -3615,32 +3615,32 @@ msgstr "Stefna upp" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Sýna möskva" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "" @@ -3660,7 +3660,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Sjá hafstrauma" @@ -3676,8 +3676,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Bauja/ljósmerki" @@ -3685,8 +3685,8 @@ msgstr "Bauja/ljósmerki" msgid "Lights" msgstr "Ljós" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "" @@ -3702,18 +3702,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Staðlað" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Allt" @@ -3758,7 +3758,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3813,8 +3813,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4146,28 +4146,28 @@ msgstr "" msgid "Merge waypoints?" msgstr "" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Fet" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metrar" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "" @@ -4175,7 +4175,7 @@ msgstr "" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4191,7 +4191,7 @@ msgstr "" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4239,9 +4239,9 @@ msgstr "" msgid "User Y Offset" msgstr "" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metrar" @@ -4252,11 +4252,13 @@ msgstr "Þessi leggur" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4292,12 +4294,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Titill" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4326,7 +4328,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4615,12 +4617,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN aðvörun" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN upplýsingar" @@ -4629,17 +4631,17 @@ msgstr "OpenCPN upplýsingar" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Velja allt" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Hreinsa allt" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Bæta við" @@ -4665,59 +4667,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Almennt" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4775,7 +4777,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4783,7 +4785,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4813,7 +4815,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4821,6 +4823,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4833,7 +4850,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -4954,7 +4971,7 @@ msgstr "" msgid "Icon" msgstr "Tákn" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4964,7 +4981,7 @@ msgid "Links" msgstr "" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5005,22 +5022,22 @@ msgstr "" msgid "Number" msgstr "Númer" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Fjarlægð" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Litur" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Ekkert" @@ -5109,16 +5126,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "" @@ -5150,35 +5167,35 @@ msgstr "" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5226,8 +5243,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5235,379 +5252,379 @@ msgstr "" msgid "Anchorage created " msgstr "" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Stækka" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Minnka" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Sýna ENC texta" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Sjá sjavarföll" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Eigið skip" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Prenta kort" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Sjálfgefið" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Alltaf" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Aldrei" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI eiginleikar" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Skipsnafn" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Ný..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5618,7 +5635,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5630,1259 +5647,1254 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Sjálfgefinn litur" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Svart" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Dökk rautt" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Dökk grænt" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Dökkblátt" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Ljósgrátt" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Rautt" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Grænt" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Gult" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blátt" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Hvítt" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Tölva" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Kortaskrár" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Möppur" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Bæta við möppu..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Fjarlægja valið" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Þjappa völdu" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Fjarlægja" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Sniðmát" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Vistuð sniðmát" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Sjálfvirkt" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Handvirkt:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Baujur/ljós" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Korta tekstar" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Einfaldað" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Venjulegt" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Litir" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Litir" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Litir" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Fjarlægja kort" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Öll kort" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Einingar" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Hnútar" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Dýpi" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lengd/Breidd" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "gráður (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Veldu hljóðskrá" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Óþekkt tæki:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA útreikningur" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA aðvaranir" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Tungumál" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Letur" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Velja letur..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Velja leturslit..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Sýnishorn" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Virkja" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Kort" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Tengingar" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Skip" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Notenda viðmót" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Viðbætur" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "fet" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Stærð: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "" @@ -6959,127 +6971,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7124,10 +7136,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7245,12 +7253,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7448,15 +7450,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7759,7 +7761,7 @@ msgstr "" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7875,7 +7877,7 @@ msgstr "Í dag" msgid "Tomorrow" msgstr "Á morgun" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "" @@ -8156,153 +8158,156 @@ msgstr "" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_it_IT.po b/po/opencpn_it_IT.po index f3ca4634da..5e73882106 100644 --- a/po/opencpn_it_IT.po +++ b/po/opencpn_it_IT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Traccia senza nome)" @@ -414,7 +414,7 @@ msgstr "aerei (SAR)" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Ultima Nota)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posizione" @@ -509,11 +509,11 @@ msgstr "Destra" msgid "Left" msgstr "Sinistra" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Velocità" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altezza" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Aiuto alla Navigazione" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "mt/s" @@ -2452,8 +2452,8 @@ msgstr "I WP verranno rinominati per riflettere l'ordine naturale, i nomi sarann " Vuoi rinominare i WP? " #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Su OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Sovrascrivere il percorso del dispositivo Garmin numero 1?" msgid "OpenCPN Message" msgstr "Messaggio OpenCPN" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opzioni" @@ -2543,7 +2543,7 @@ msgstr "Stampa la traccia scelta" msgid "Track properties" msgstr "Proprietà Traccia" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "API del plugin: " msgid "OpenCPN Website" msgstr "Sito web OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Il manuale di aiuto di OpenCPN non è disponibile localmente." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Vuoi visitare il sito opencpn.org per ottenere maggiori informazioni?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Annullamento - area di annullamento come identificato dall'ID di messagg msgid "Undefined (default)" msgstr "Indefinito (default)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nome Target AIS" @@ -3089,7 +3089,7 @@ msgstr "\n" "Una registrazione di traccia persistente verrà quindi riavviata per questo obiettivo.\n\n" "Vuoi invece interrompere il tracciamento persistente per questo obiettivo?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Avviso AIS" @@ -3105,7 +3105,7 @@ msgstr "Silenzio Alert" msgid "&Jump To" msgstr "Vai a" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Crea Waypoint" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Lista Target AIS" @@ -3217,38 +3217,38 @@ msgstr "Target acquisiti" msgid "Undock Target List" msgstr "Sgancia Lista target " -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Registra il Tracciato" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Il tracciato recentemente acquisito per questa target è stato registrato. \n" "Desideri continuare la registrazione fino alla fine della sessione OpenCPN corrente?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Interroga Target AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Interrompi tracciamento" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menù" @@ -3302,7 +3302,7 @@ msgstr "Barca : Muovi qui" msgid "Navigate To Here" msgstr "Naviga fino a qui" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Modalità 'Rotta in Alto'" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Modalità di ripresa " #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Modalità 'Nord in Alto'" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Visualizza 'Carta in Alto'" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Attiva/disattiva schermo intero" @@ -3346,7 +3346,7 @@ msgstr "Incolla Tracciato" msgid "CM93 Offset Dialog..." msgstr "Aggiusta Offset CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Gruppi di Carte" @@ -3464,7 +3464,7 @@ msgstr "Copia come KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Elimina" @@ -3618,18 +3618,18 @@ msgstr "Invia traccia a OpenCPN Paio" msgid "Chart Panel Options" msgstr "Opzioni Visualizzazione Carta" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Modalità Navigazione" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "'Nord in alto'" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "'Rotta in alto'" @@ -3637,32 +3637,32 @@ msgstr "'Rotta in alto'" msgid "Heading Up" msgstr "Prua della barca in alto" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Modalità 'Più Spazio Avanti' (Look Ahead)" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Opzioni vedere barca propria" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Abilita Mosaico Carte (taglio e sovrapposizione)" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Mostra la griglia Lat/Lon" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Mostra i bordi delle carte" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Mostra l'unità di misura della profondità" @@ -3682,7 +3682,7 @@ msgstr "Maree e correnti" msgid "Show Tide stations" msgstr "Mostra stazioni di marea" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Mostra/Nascondi le Correnti" @@ -3698,8 +3698,8 @@ msgstr "Mostra testo" msgid "Show depths" msgstr "Mostra profondità" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Descrizione Boe/Luci" @@ -3707,8 +3707,8 @@ msgstr "Descrizione Boe/Luci" msgid "Lights" msgstr "Luci" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Descrizioni Fari" @@ -3724,18 +3724,18 @@ msgstr "Faro : Mostra settore visibili" msgid "Show chart data quality" msgstr "Qualità dati delle carte" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Contenuto visualizzato" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Tutto" @@ -3780,7 +3780,7 @@ msgstr "Usa come catalogo attivo" msgid "Latest available catalog:" msgstr "Ultimo catalogo disponibile:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Impossibile scaricare i dati dall'url" @@ -3835,8 +3835,8 @@ msgstr "Fallimento: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Rispondendo 'No' si creeranno nuovi Waypoints per questa Rotta." msgid "Merge waypoints?" msgstr "Unisci Waypoints?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "InfoTrattoRottaRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile richiede che OpenGL sia abilitato" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Piedi (0.305m)" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metri" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Fathoms (1 F=1.83m)" @@ -4197,7 +4197,7 @@ msgstr "Fathoms (1 F=1.83m)" msgid "OverZoom" msgstr "OverZoom" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "IconaMareaEstesa" @@ -4213,7 +4213,7 @@ msgstr "Interroga Target AIS" msgid "Show all AIS Targets" msgstr "Visualizza tutti i target AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Attenuare i target AIS meno critici" @@ -4261,9 +4261,9 @@ msgstr "Offset X" msgid "User Y Offset" msgstr "Offset Y" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metri" @@ -4274,11 +4274,13 @@ msgstr "Tratto" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "LegendaConsole" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "ValoriConsole" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Titolo" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Meno" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Modifica la connessione selezionata" @@ -4637,12 +4639,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Avviso OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN Info" @@ -4651,17 +4653,17 @@ msgstr "OpenCPN Info" msgid "Sentence Filter" msgstr "Filtro Stringa" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Seleziona tutto" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Cancella tutto" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Aggiungi" @@ -4692,59 +4694,59 @@ msgstr "Una stringa o messaggio NMEA è generalmente lunga tre caratteri (es. RM msgid "REGEX syntax error: \n" msgstr "Errore di sintassi REGEX: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Generale" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filtra i dati di Rotta e Velocità da NMEA" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Periodo del Filtro (Secondi)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Mostra la finestra con i dati GPS/NMEA" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Formato dati per Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Usa Garmin GRMN (Host) Mode per caricare Punti/WP e Rotte." -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Regola le priorità di comunicazione..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Connessione Dati" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Rimuovi Connessione" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Configura nuova connessione" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Installa" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Reinstalla" @@ -4810,7 +4812,7 @@ msgstr "Reinstalla" msgid "Update" msgstr "Aggiorna" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Downgrade" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr " installati con successo!" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Installazione completa" @@ -4848,6 +4850,21 @@ msgstr "Installazione completa" msgid "Installation error" msgstr "Errore di installazione" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Segnalatori" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Rollover" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "GrigliaTesto" @@ -4860,7 +4877,7 @@ msgstr "In attesa di uscita dal thread di compressione delle carte raster." msgid "OpenCPN Compressed Cache Update" msgstr "Aggiornare Cache compressa di OpenCPN" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distanza dalla propria unità: %4.0f NM" @@ -4993,7 +5010,7 @@ msgstr "Questo waypoint fa parte di un livello e non può essere modificato" msgid "Icon" msgstr "Icona" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -5003,7 +5020,7 @@ msgid "Links" msgstr "Links" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5044,22 +5061,22 @@ msgstr "Raggio cerchio" msgid "Number" msgstr "Numero" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distanza" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Colore" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Nessuno" @@ -5149,16 +5166,16 @@ msgstr "Mostra solo in scala" msgid "Tide Station not found" msgstr "Stazione di marea non trovata" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Imposta scala" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Scala carta" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Persistente" @@ -5190,35 +5207,35 @@ msgstr "Finestra di Debug NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Fallita l'inizializzazione dell'interfaccia." -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN non può iniziare. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "I file di configurazione non sono stati trovati" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Leggi il log file in" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "per dettagli." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Portable(-p) in esecuzione da" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Selezione iniziale delle Cartelle con Carte dal Registro di Windows" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN inizializzato in %ld ms." @@ -5273,8 +5290,8 @@ msgstr "Tempo stimato :" msgid "Remaining time : " msgstr "Tempo restante :" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN Aggiornamento Carte" @@ -5282,277 +5299,277 @@ msgstr "OpenCPN Aggiornamento Carte" msgid "Anchorage created " msgstr "Ancoraggio creato" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Mostra barra degli strumenti" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Nascondi barra degli strumenti" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "UOMO A MARE" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " a " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " on " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "Un miglio da Uomo a Mare, in direzione COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Rotta Uomo a Mare" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Punto a 1 Miglio" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Ora: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Posizione: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Disattiva Tracking" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Attiva Tracking" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Attiva/Disattiva l'inseguimento automatico della posizione" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Modalità di ripresa " -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Zoom +" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Zoom -" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Carta a Scala Maggiore" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Carta a Scala Minore" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Esci da Opencpn" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Naviga" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Visualizza Barra Carte" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Mostra il Testo sulle carte ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Mostra Fari ENC" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Mostra Profondità ENC" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Mostra Informazioni Ancoraggio ENC" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Mostra qualità dati ENC" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Visualizza Navobjects" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Mostra/Nascondi le Maree" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Cambia lo Schema dei colori (giorno...notte)" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Visione" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Mostra/Nascondi Target AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Nascondi ormeggiata target AIS" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Mostra Target AIS traccia" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Mostra Alert Dialog CPA" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Suona Allarme CPA" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Mostra avvisi CPA" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Misura Distanza" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Gestore Rotta && Segnalatori..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Crea una Rotta" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Inserinsci Segnalatore al Natante" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Inserisci Segnalatore al Cursore" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "UOMO A MARE: Aggiungi Punto!" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preferenze" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Strumenti" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Finestra" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Aiuto OpenCPN" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Guida" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Riavviare OpenCPN per attivare la lingua selezionata (Restart OpenCPN)" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Posizione: " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Modo Rotato" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "C'è stato un problema di stampa.\n" "Controllare la configurazione della stampante." -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Rotta senza nome)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "UOMO A MARE AIS" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Propria nave" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Rotta Temporanea AIS UAM" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Propria unità (presente)" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Posizione di Propria unità:" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " Posizione MOB: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AGGIORNAMENTO AIS UOMO A MARE" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Gestione Rotte e Segnalatori" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Stampa la Carta" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Spazio)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "Analizzare tutti le carte ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "Analisi completata." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5560,105 +5577,105 @@ msgstr "Crea un modello di configurazione privato basato sulle impostazioni corr "Questo modello verrà salvato, e può essere selezionato per un ulteriore utilizzo in qualsiasi momento.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Proprietà estese MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Tracking" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Tracking predefinito" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Traccia sempre" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Non tracciare mai" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignora questo MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Gestisci questo MMSI come MOB SART/PLB(AIS)." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Converti AIVDM in AIVDO per questo MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Questo MMSI è il mio Follower - Nessun avviso CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Un Identificativo MMSI è generalmente un numero di nove cifre. \n" "Si prega di controllare l'inserimento." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Predefinito" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Sempre" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Mai" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Modifica le proprietà MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Proprietà MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Modalità tracciato" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignora" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM-> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nome della nave" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Follower" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Nuovo..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Aggiungi proprietà MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5676,7 +5693,7 @@ msgstr "Il dispositivo selezionato non è accessibile; opencpn probabilmente non " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Per ulteriori informazioni, vedere il file LINUX_DEVICES. md nella socumentazione della tua versione LINUX.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5696,1181 +5713,1176 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Per ulteriori informazioni, vedere il file LINUX_DEVICES. md nella socumentazione della tua versione LINUX.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Lunghezza delle frecce predizione COG (Minuti)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Lunghezza dello Stimatore di Direzione (MN)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Tipo di Icona per la barca propria" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Scala Reale (Bitmap)" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Scala Reale (Vettoriale)" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Lunghezza barca fuori tutto (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Larghezza barca fuori tutto (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Distanza dalla Prua della Antenna GPS (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Distanza dal Centrobarca (negativa a SX) della Antenna GPS (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Minima dimensione icona sullo schermo (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Mostra raggio cerchio" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distanza tra i cerchi" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Unità Distanza" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Miglia Nautiche" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Chilometri" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Intervallo dei colori per i cerchi" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Mostra la direzione del Waypoint attivo" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Stile" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Solido" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "A punti" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "A tratti lunghi" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "A tratti corti" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "A tratto-punto" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Automatico" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Nero" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Rosso scuro" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Verde scuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Giallo scuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Blu scuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta scuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Ciano scuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Grigio chiaro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Grigio scuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Rosso" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Verde" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Giallo" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blu" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Rosso" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Ciano" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Bianco" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Tracce" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Tracce Automatiche Giornaliere a mezzanotte" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Tracce Automatiche Giornaliere a" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Computer" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Evidenzia Tracce" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Evidenzia Colore" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Precisione Traccia" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Bassa" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Media" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Alta" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Calcolare i valori" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Calcola SOG e COG dai cambiamenti di posizione" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Minuti e secondi tra gli aggiornamenti" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rotte/Punti" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Nuove Rotte" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Icona di default per Waypoint" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Raggio del Cerchio di Arrivo al Waypoint (Miglia)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Avanza il Waypoint di rotta solamente all'arrivo" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Ignora le impostazioni per la visibilità basata sulla scala dele carte nautiche e mostra sempre" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Colore dei raggio cerchio su Waypoint" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Opzioni di controllo" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Chiedi conferma cancellazione Rotte e Tracce" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Files Carte" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Elenco dei percorsi per le cartelle scelte" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Aggiungi Cartella..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Rimuovi Selezione" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Comprimi i file selezionati" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Aggiungi.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Rimuovi" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Comprimi" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Migra carte.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Controllo aggiornamenti al Database Carte" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Database : Scansiona cartelle, aggiorna" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Database : Forza ricostruzione" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Prepara le carte ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modificato]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Modelli" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Stato del modello" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Titolo dell'ultimo modello applicato:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Modelli salvati" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Crea Configurazione..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Elimina Configurazione Selezionata..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Utilizzare il modello scelto" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Crea Configurazione" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Modello scelto: Problema usandolo" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avanzate" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Raddrizzamento mappe Raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Usa Accelerazione Grafica (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Opzioni OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Tempo medio di rotazione carte" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "Secondi" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Livello dettaglio con zoom" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vettoriali" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "Livello di Dettaglio CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Larghezza schermo fisico" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Automatico" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manuale:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Vedere Carta" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Mostra le Carte Raster ruotate in modalità 'Nord in Alto'" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "A stesso livello di zoom :\n" "Con un valore inferiore, mostra un a carta meno dettagliata.\n" "Con un valore più alto, mostra una carta più dettagliata." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafica" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Carte vettoriale" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Oggetti S-57/ENC" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Mostra Profondità" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Informazioni Punto" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Boe/Fari" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Faro con settori" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Testi Carta" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Mostra Testo Nazionale" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Solo testo importante" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "De-sovrapponi Testo" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Dettagli Carta" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Meno Dettaglio a piccola scala" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Stili di grafica" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Mappa Cartacea" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Semplificati" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Bordi delle Aree" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Semplici" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "A simboli" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Numero Colori" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Colori" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Colori" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Profondità Bassa" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Profondità Sicura" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Profondità Alta" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Oggetti Standard Utente" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Reset per \"Standard\"" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Maree && Correnti" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "File Maree e Correnti Caricati" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Aggiungi File..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Tutte le Carte Disponibili" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Rimuovi Carta" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Tutte le Carte" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nuovo Gruppo..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Elimina Gruppo" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Mantenere scala con cambio carta" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Controlli" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Migliora Pan/Zoom" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom sul cursore" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Vedere" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Opzioni Barra di Stato" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "ETA dal vivo al Cursore" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Velocità standard della Barca " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Layout Tela" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Barra di Stato" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unità di misura" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Miglia terrestri" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Nodi" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "mi/h" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Profondità" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatura" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Gradi, Minuti e decimi di minuto" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Gradi e decimi di grado" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Gradi, Minuti, Secondi" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Direzione" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Mostra Vero" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Vedere magnetico" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Variazione magnetica presunta" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W + E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Mostra rilevamente e prora vera" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Mostra rilevamenti e prora magnetici." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Variazione magnetica calcolata del Plugin WMM" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Per impostare la variazione magnetica manualmente,\n" " devi disabilitare il plugin di WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Tester" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "File audio:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Seleziona il suono" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Suoni" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Allarme Ancoraggio" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Se allerta Ancoraggio: riproduce l'audio." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Seleziona suono per Ancoraggio" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Se allerta AIS: riproduce l'audio" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Seleziona suono per AIS" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "Avviso SART" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Se allerta SART: riproduce l'audio" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Seleziona suono per SART" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "Avviso DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Se allerta DSC: riproduce l'audio." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Seleziona suono per DSC" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Dispositivo sconosciuto:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Dispositivo d'ingresso" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Dispositivo audio" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Comando di azione audio:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Target AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Calcolo CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Nessun Avviso (T)CPA se la distanza del target è maggiore di (NM)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Avverti se il CPA è minore di (Miglia)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr " ...e il TCPA è minore di (Minuti)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Target Persi" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Segna i target come persi dopo (Minuti)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Rimuovi i Target persi dopo (Minuti)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Vedere" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Mostra le frecce COG dei Target, lunghezza (Minuti)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Sincronizza la lunghezza della freccia AIS con il predittore COG della propria nave" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Mostra le Tracce dei Target, lunghezza (Minuti)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Soprrimi target ancorati/ormeggiati, velocità massima (nodi)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Disegna la predizione in tempo reale di AIS, velocità minima target (nodi)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Permetti l'attenuazione di target meno critici se più di ... obiettivi" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Mostra area info (dal messaggio binario AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Mostra Target AIS a Dimensione Reale" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Mostra nomi dei Target AIS con scala maggiore di" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Usa messaggi di posizione WPL. Azione quando ricevuto:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Report Posizione APRS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Crea segno" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Rollover" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Abilita blocco informazioni route/AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Nome Nave\" MMSI (CallSign)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Classe] Tipo (Stato)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Allerta CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Mostra la finestra di allerta CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Abilita allarme sonoro per allerta CPA/TCPA ed Emergenze DSC/SART" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Sopprimi gli avvisi per target ancorati/ormeggiati" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Abilita il Timeout per riconoscimento allarme (Minuti)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Opzioni Generali" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Seleziona Lingua (Select Language)" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Caratteri" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Scegli Carattere..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Scegli Colore Carattere..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Esempio" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Toolbar e Stile Finestre" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Opzioni di interfaccia" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Mostra la barra di stato (in basso)" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Visualizza barra dei Menu" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Mostra finestra di stato Bussola/GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Nascondi automaticamente Barra degli Strumenti" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Rintocchi Campana ogni mezz'ora, uno alle 0:30, 4:30, 8:30, 12:30, 16:30, 20:30" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Abilitare l'interfaccia Touchscreen" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Interfaccia utente: Zoom " -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Mostra pulsanti Zoom" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Usa ECDIS interno V2" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Manuale ECDIS Interno" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Fattore di scala di interfaccia utente" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Fattore di scala Oggetto Carta" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Fattore scala nave" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC Fattore sonoro" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "Scala del testo" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Sensibilità della rotella del mouse" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Applica" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Carte" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Connessioni" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Collega" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Imbarcazioni" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Interfaccia" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Utente" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "PlugIns" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Declinazione magnetica da utente" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "piedi" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "braccia" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Aggiungi una Cartella contenente Carte Nautiche" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - lunghezza barca deve essere > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - larghezza barca deve essere > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - posizione GPS dal Centrobarca deve essere entro la larghezza barca" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - posizione GPS dalla Prua deve essere entro la lunghezza barca" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - minima dimensione icona barca tra 1 e 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Configurazioni incorrette per la dimensione barca propria:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Il manuale ECDIS non è disponibile localmente." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Vuoi visitare il sito opencpn.org per ottenere il ECDIS manuale?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6880,15 +6892,15 @@ msgstr "La compressione modificherà i file della carta sul disco.\n" "I Carte compressi potrebbero impiegare un tempo leggermente più lungo per caricare e visualizzare su alcuni sistemi.\n" "Sono nuovamente decompressi utilizzando i programmi unxz o 7 zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Carte OpenCPN compresse " -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Nessun carte trovato da comprimere." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6897,71 +6909,71 @@ msgstr "compresso %ld carte\n" "da %.1fMB a %.1fMB\n" "salvato %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Immetti Nome Gruppo" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Nuovo Gruppo di Carte" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Seleziona Dati Maree/Correnti" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Compressione texture" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Compressione delle texture con la cache" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Memorizzazione nella cache di Compressione texture" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Dimensione di memoria texture (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Dimensione: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Ricostruire la Cache delle Texture" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Cancellare la Cache delle Texture" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "levigare il poligonoo" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Leviga linea" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (riavviare OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Usa Accelerazione Grafica (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Impostazioni texture" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Texture Cache" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Varie" @@ -7043,127 +7055,127 @@ msgstr "Prega : di controllare il registro di sistema per ulteriori informazioni msgid " successfully installed from cache" msgstr " installato correttamente dalla cache" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Queste impostazioni potrebbero destabilizzare OpenCPN e per impostazione predefinita sono disabilitate. Per nonostante i pericoli abilitarli manualmente aggiungere un CatalogExpert=1 riga nella sezione [PlugIns] nel file di configurazione." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Catalogo dei Plugin" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Aggiorna Catalogo Plugin" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importa plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Impostazioni..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Disattivato" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Aggiorna Catalogo Plugin: master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "Aggiornamento catalogo OpenCPN" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Impossibile copiare il file catalogo" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Impossibile copiare il file del catalogo nella cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Aggiornamento catalogo riuscito" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Seleziona archivio" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Errore di Importazione plugin Opencpn" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Riscontrato plugin incompatibile." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Errore durante l'estrazione dell'archivio importato." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "catalogo attivo" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Ultimo Catalogo" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Ultima modifica: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Si prega di aggiornare il catalogo" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Disinstalla" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Attivato" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Aggiorna alla versione " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Installa..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Aggiorna a" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Sito Web" @@ -7208,10 +7220,6 @@ msgstr "Satelliti" msgid "OpenCPN Server Message" msgstr "Messaggio Server Opencpn" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Rollover" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TideCurrentGraphRollover" @@ -7329,12 +7337,6 @@ msgstr "&Rotta da Traccia" msgid "Send to &Peer" msgstr "Invia al &paio" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Segnalatori" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7535,15 +7537,15 @@ msgstr "ma la scala della carta attuale è" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Pertanto il nuovo waypoint non sarà visibile a questo livello di zoom." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Waypoint trasmessi." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Errore sul caricamento di Waypoint. GPS Garmin non collegato" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Errore nel caricamento dei Waypoint. Si prega di controllare i file di registro (log)..." @@ -7848,11 +7850,11 @@ msgstr "(Gli angoli dei settori sono Rilevamenti Veri visti dal ma msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

L'ultima esecuzione di opencpn sembra aver fallito. Vuoi eseguire\n" "in modalità provvisoria senza plugin e altre funzioni\n" "potenzialmente problematiche?\n" -"



Puoi considerare la possibilità di visitare la lista di problemi conosciuti.

" +"



Puoi considerare la possibilità di visitare la lista di problemi conosciuti.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7967,7 +7969,7 @@ msgstr "Oggi" msgid "Tomorrow" msgstr "Domani" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Descrizioni comandi" @@ -8257,153 +8259,156 @@ msgstr "Muovi Waypoint" msgid "Dismiss" msgstr "Ignora" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_ja_JP.po b/po/opencpn_ja_JP.po index ca43da70fe..cf15173917 100644 --- a/po/opencpn_ja_JP.po +++ b/po/opencpn_ja_JP.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Japanese\n" "Language: ja_JP\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(無名の航跡)" @@ -414,7 +414,7 @@ msgstr "捜索救助航空機" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (前回)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "位置" @@ -509,11 +509,11 @@ msgstr "右" msgid "Left" msgstr "左" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "速度" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "標高" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "航行援助" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "ベース" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "時速(キロメートル)" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "秒速(メートル)" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "OpenCPNについて" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "オプション" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "航跡 プロパティ" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2643,23 +2643,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "OpenCPNのウェブサイト" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN のヘルプ文書は日本語に対応していません。" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "さらに情報が必要ならウェブサイト opencpn.org へ" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3059,7 +3059,7 @@ msgstr "キャンセル - メッセージ リンク ID によってキャンセ msgid "Undefined (default)" msgstr "未定義 (既定値)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS船名" @@ -3070,7 +3070,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS の警告" @@ -3086,7 +3086,7 @@ msgstr "無音警報" msgid "&Jump To" msgstr "移動" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "通過点の作成" @@ -3109,7 +3109,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS ターゲット リスト" @@ -3198,38 +3198,38 @@ msgstr "ターゲット数" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "航跡を記録" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "このターゲットの航跡が記録されています \n" " 現在の OpenCPN セッションが終了するまで記録を継続しますか?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AISターゲットの情報取得" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "航跡記録停止" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "メニュー" @@ -3283,7 +3283,7 @@ msgstr "ここに移動" msgid "Navigate To Here" msgstr "ここへナビゲート" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "コースアップモード" @@ -3292,8 +3292,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "ノースアップモード" @@ -3302,7 +3302,7 @@ msgid "Chart Up Mode" msgstr "チャートアップモード" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "フルスクリーンの切り替え" @@ -3327,7 +3327,7 @@ msgstr "航跡の貼り付け" msgid "CM93 Offset Dialog..." msgstr "CM93 オフセットダイアログ." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "海図グループ" @@ -3445,7 +3445,7 @@ msgstr "KML としてコピー" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "削除" @@ -3599,18 +3599,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "航行モード" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "ノースアップ" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "コースアップ" @@ -3618,32 +3618,32 @@ msgstr "コースアップ" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "前方監視モード" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "表示オプション" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "海図の結合を有効" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "グリッドを表示" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "海図の外枠を表示" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "水深の単位を表示" @@ -3663,7 +3663,7 @@ msgstr "潮汐と潮流" msgid "Show Tide stations" msgstr "潮汐観測所表示" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "海・潮流を表示" @@ -3679,8 +3679,8 @@ msgstr "テキストを表示" msgid "Show depths" msgstr "水深を表示" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "ブイ/ライト ラベル" @@ -3688,8 +3688,8 @@ msgstr "ブイ/ライト ラベル" msgid "Lights" msgstr "ライト" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "灯火の説明" @@ -3705,18 +3705,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "表示カテゴリ" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "スタンダード" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "すべて" @@ -3761,7 +3761,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3816,8 +3816,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4149,28 +4149,28 @@ msgstr "「いいえ」と答えると、このルートに新しいウェイポ msgid "Merge waypoints?" msgstr "通過点を統合しますか。" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "ルート区間情報のロールオーバー" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTileはOpenGLが有効である必要があります" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "フィート" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "メートル" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Fathoms" @@ -4178,7 +4178,7 @@ msgstr "Fathoms" msgid "OverZoom" msgstr "オーバーズーム" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "潮汐アイコンを拡張" @@ -4194,7 +4194,7 @@ msgstr "AIS情報の入手" msgid "Show all AIS Targets" msgstr "すべての AIS船を表示" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "重要度の低い AIS船を隠す" @@ -4242,9 +4242,9 @@ msgstr "ユーザー X オフセット" msgid "User Y Offset" msgstr "ユーザー Y オフセット" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "メートル" @@ -4255,11 +4255,13 @@ msgstr "指定の区間" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "コンソール記号" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "コンソールの値" @@ -4295,12 +4297,12 @@ msgstr "到着予想時間@有効速度による" msgid "ETA @SOG" msgstr "到着予想時間@対地速度による" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "タイトル" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4329,7 +4331,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4618,12 +4620,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN 警告" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN の情報" @@ -4632,17 +4634,17 @@ msgstr "OpenCPN の情報" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "全て選択" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "全てクリア" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "追加" @@ -4668,59 +4670,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "一般" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4778,7 +4780,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4786,7 +4788,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4816,7 +4818,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4824,6 +4826,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS情報表示機能" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4836,7 +4853,7 @@ msgstr "ラスター チャート圧縮処理の終了を待っています。" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "自船からの距離: %4.0f 海里" @@ -4957,7 +4974,7 @@ msgstr "このウェイポイントは レイヤーの一部であるため、 msgid "Icon" msgstr "アイコン" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4967,7 +4984,7 @@ msgid "Links" msgstr "リンク" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5008,22 +5025,22 @@ msgstr "レンジリング" msgid "Number" msgstr "番号" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "距離" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "色" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "なし" @@ -5113,16 +5130,16 @@ msgstr "縮尺により表示" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "継続します" @@ -5154,35 +5171,35 @@ msgstr "NMEA デバッグ ウィンドウ" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5230,8 +5247,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5239,277 +5256,277 @@ msgstr "" msgid "Anchorage created " msgstr "錨地の作成 " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "航跡を有効にする" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "自動追尾" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "拡大" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "縮小" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "海図バーを表示" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "電子海図にテキストを表示" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "潮汐を表示" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "配色の変更" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "AIS 船を表示" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "ルート作成" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "MOB(海中転落者)マーカーを置く" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "設定" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "印刷に関して問題があります。 \n" "プリンターは正しく設定されていますか?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(無名のルート)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "自船" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "ルート と マーク マネージャー" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "海図を印刷" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-スペース)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5517,105 +5534,105 @@ msgstr "現在の設定で独自の設定テンプレートを作成します。 "このテンプレートは保存され、以降、選択利用されます。\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI 拡張プロパティ" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "追跡" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "追跡を元に戻す" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "常に追跡" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " 今後追跡しない" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "この MMSI を無視します" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "このMMSI を SART/PLB(AIS) MOB として処理します" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "MMSIのためAIVDMをAIVDO に変換" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "指定したMMSIのCPA警報は必要ありません" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "MMSI Idは、一般的に9桁の番号です。\n" "入力内容を確認し、必要に応じてキャンセルしてください。" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "初期状態" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "常時" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "今後しない" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "MMSI プロパティを編集" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI プロパティ" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "追跡 モード" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "無視" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "船名" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "フォロワー" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "新規..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "MMSI プロパティを追加" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5626,7 +5643,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5638,1180 +5655,1175 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "対地針路ベクトルの長さ (分)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "船速ベクトル (海里)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "船のアイコンの種類" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "リアル スケール ビットマップ" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "リアル スケールのベクター" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "全長(m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "全幅(m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "船首からGPSアンテナまでの距離(m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "中央からGPSアンテナまでの距離(m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "最小画面サイズ (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "レンジリングを表示" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "リング間の距離" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "距離の単位" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "海里" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "キロメートル" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "レンジリングの色" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "スタイル" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "ソリッド" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "ドット" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "ロングダッシュ" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "ショートダッシュ" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "ドット・ダッシュ" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "デフォルトの色" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "黒" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "暗い赤" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "暗い緑" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "暗い黄" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "暗い青" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "暗い赤紫" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "暗い青緑" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "明るい灰" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "暗い灰" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "赤" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "緑" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "黄" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "青" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "赤紫" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "青緑" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "白" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "航跡" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "日々の航跡記録を午前0時に自動開始" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "日々の航跡記録の自動開始時刻" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "コンピュータ" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "世界時" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "地方平時" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "航跡のハイライト" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "航跡の精度" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "低" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "中" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "高" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "値を計算" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "対地速度と対地コースを位置の変化から計算" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "更新間隔の分秒" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "ルート/ポイント" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "新しいルート" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "ウェイポイントのデフォルトアイコン" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "通過点の到着円の半径 (海里)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "高度な通過点へのルート 到着時のみ" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "chartscale based visibility and show alwaysで設定を上書きします。" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "通過点を示す範囲円の色" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "コントロールオプション" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "追跡とルートの削除を確認" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "海図ファイル" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "ディレクトリ" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "ディレクトリの追加." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "選択項目を削除" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "選択して圧縮" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "削除" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "コントロールの更新" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "海図スキャンとデータベースの更新" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "強制的に完全なデータベースの再構築" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "全電子海図について準備します" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [修正済み]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "テンプレート" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "気温の状態" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "前回適用されたテンプレートのタイトル:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "テンプレートを保存" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "設定ファイルを生成..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "選択された設定を削除" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "選択された設定を適用" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "設定ファイルを生成" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "選択された設定には問題があります" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "高度な設定" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "ラスターチャートの歪み補正" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "アクセラレータを使う (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGLの設定" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "海図の回転の平均時間" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "秒" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "海図のズーム/スケール、重み付け" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "ラスター" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "ベクター" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "物理画面の幅" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "自動" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "手動" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "海図表示" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Skewedラスターチャートを北を上として表示" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "低い値では、同じズームレベルはあまり詳しくない図を示します。\n" " より高い値で、同じズームレベルは、より詳しい図を示します。" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "グラフィックス" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "ベクトル チャートの表示" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "航海士向け標準" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "水深" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "海図情報 物標の情報" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "ブイ/ライト" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "拡張灯火セクター" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "海図上の文字" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "National text on chart" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "重要なテキストのみ" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "整頓されていないテキスト" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "海図の詳細" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "小スケールの詳細を削減" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "グラフィック スタイル" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "紙海図" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "簡易化" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "境界" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "簡易的な" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "シンボル化" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "カラー" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2色" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4色" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "浅水域の表示" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "安全水域の表示" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "深水域の表示" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "標準にリセット" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "潮汐と海・潮流" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "アクティブなデータセット" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "データセットを追加" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "全ての利用可能な海図" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "海図を削除" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "全ての海図" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "新しいグループ." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "グループを消去" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "海図の切り替え時に尺度を維持" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "コントロール" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "滑らかなパン/ズーム" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "カーソル位置にズーム" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "表示機能" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "ステータスバーのオプション" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "カーソルでのETA表示" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "既定の船速 " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "作図領域の配置" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "単位" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "法定マイル" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "ノット" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "時速(マイル)" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "深さ" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "緯度/経度" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "度、十進化分" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "10 進の度" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "度、分、秒" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "方位" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "真針路を表示" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "磁方位を表示" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "想定される自差" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "度 (-W、+ E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "方位と船首方位を真方位で表示" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "方位と船首方位を磁方位で表示" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM プラグインはmagnetic variationを計算" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " 自差を手動で設定するには \n" " WMMプラグインを無効にする必要があります" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "サウンドファイルの選択" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "未知のデバイス" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "サウンドデバイス" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "音声再生コマンド" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS ターゲット" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA 計算" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "指定した距離(海里)以上では、(T)CPA警報なし" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "CPAが〜海里以下で警報" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "... TCPA が (分) 未満" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "目標消失" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "AIS情報が受信されなくなってから〜分後に消失表示" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "目標が消失後、削除するまで(分)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "画面表示" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "AIS船の対地ベクトルを表示" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "AIS船の航跡、長さ (分) を表示" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "錨泊/係留船を表示しない、最大速度 (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "危険な可能性の低い船舶の追跡の停止を許可" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "(AIS バイナリ メッセージ) からエリア通知を表示" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "AIS船の実際のサイズを表示" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "1 より大きいスケールで AIS ターゲット名を表示" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "AIS情報重畳表示機能" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "ルート/AIS 情報ブロックを有効にします。" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "「船名」MMSI (コールサイン)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "AISタイプ[AorB] 、 (航海状態)の表示" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "対地速力 対地針路の表示" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "最接近距離 最接近時間" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA警報" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "CPA/TCPA警報ダイアログを表示" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "CPA/TCPA警報や DSC/SART の遭難警報を鳴らします。" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "ターゲット警告タイムアウト (分) を有効にする" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "一般設定" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "言語" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "フォント" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "フォントの選択." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "フォントの色を選択." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "サンプル" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "ツールバーとウィンドウ スタイル" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "インタ フェース オプション" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "ステータス バーを表示" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "メニュー バーを表示" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "コンパス/GPS ステータス ウィンドウを表示" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "ツールバーを自動的に隠す" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "時鐘を鳴らす" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "タッチ スクリーン インターフェイスを有効にします。" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "拡張グラフィックス インターフェイスを有効にします" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "ユーザー インターフェイス規模係数" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "海図の物票の尺度" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "船舶の拡大縮小" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "適用" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "海図" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "接続" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "船舶" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "ユーザー インターフェイス" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "プラグイン" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "ユーザーによる自差設定" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "フィート" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "測深" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "海図ファイルを含むディレクトリを追加" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - あなたの船の長さ > 0 でなければなりません" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - あなたの船のビーム > 0 でなければなりません" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - ミッドシップからのオフセットあなたのGPSは、あなたの船のビーム内になければなりません" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - 船首からのオフセットあなたのGPSは、あなたの船の長さの範囲内でなければなりません" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - あなたの船の最小アイコン サイズは、1~100 mmにする必要があります" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "自船の実サイズの設定が正しくありません" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6821,15 +6833,15 @@ msgstr "ディスク上のかファイルを圧縮します。\n" "圧縮された海図は一部のシステムで表示に少し時間がかかることがあります。\n" "それらは、unxzまたは7つのzipプログラムを使用して再度解凍することができます。" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN 圧縮海図" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "圧縮する海図が見つかりません" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6838,71 +6850,71 @@ msgstr "海図圧縮%ld \n" " %.1fMB から%.1fMB\n" "  %.1fMB (%.1f%%)の節約。" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "グループ名を入力" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "新しい海図グループ" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "潮汐/潮流データを選択" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "テクスチャ圧縮" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "キャッシュとテクスチャ圧縮" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "テクスチャ圧縮キャッシュ" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "テクスチャ メモリのサイズ (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "サイズ: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "テクスチャ キャッシュを再構築" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "テクスチャ キャッシュをクリア" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "ポリゴンの平滑化" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "線のスムージング" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "ソフトウェアの OpenGL (再起動 OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "急速パンニングの使用" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "テクスチャの設定" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "テクスチャ キャッシュ" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "その他" @@ -6985,127 +6997,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7150,10 +7162,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS情報表示機能" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "潮汐潮流グラフ ロールオーバー" @@ -7271,12 +7279,6 @@ msgstr "航跡からのルート" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7480,15 +7482,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7794,7 +7796,7 @@ msgstr " (セクター角はシーワードからの真方位で msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7910,7 +7912,7 @@ msgstr "本日" msgid "Tomorrow" msgstr "明日" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "ツールチップ" @@ -8192,153 +8194,156 @@ msgstr "通過点の移動" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_ko_KR.po b/po/opencpn_ko_KR.po index fb599ab3a7..d74b796a46 100644 --- a/po/opencpn_ko_KR.po +++ b/po/opencpn_ko_KR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Korean\n" "Language: ko_KR\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(이름 없는 트랙)" @@ -414,7 +414,7 @@ msgstr "수색및구조(SAR) 항공기" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "해상이동통신서비스식별부호 (MMSI)" @@ -476,7 +476,7 @@ msgstr " (마지막으로 알려진)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "위치" @@ -509,11 +509,11 @@ msgstr "우측" msgid "Left" msgstr "좌측" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "속력" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "해발" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "항법장치" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "기지" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "킬로미터/시간" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "미터/초" @@ -2437,8 +2437,8 @@ msgstr "경유지의 이름은 자연스러운 순서를 반영하도록 변경 "웨이포인트의 이름을 바꾸시겠습니까?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "OpenCPN에 대하여" @@ -2484,9 +2484,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "옵션" @@ -2528,7 +2528,7 @@ msgstr "" msgid "Track properties" msgstr "트랙 속성" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2541,12 +2541,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2643,23 +2643,23 @@ msgstr "플러그인 API" msgid "OpenCPN Website" msgstr "OpenCPN 웹사이트" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN 도움말 문서는 로컬에서 사용할 수 없습니다." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "더 많은 정보를 위해 opencpn.org 웹사이트를 방문하시겠습니까?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3059,7 +3059,7 @@ msgstr "취소 - 메시지 연결 ID로 식별되는 취소 영역" msgid "Undefined (default)" msgstr "정의되지 않음 (기본값)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "선박자동식별장치(AIS) 표적명" @@ -3070,7 +3070,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "선박자동식별장치(AIS) 경보" @@ -3086,7 +3086,7 @@ msgstr "무음 경보(&S)" msgid "&Jump To" msgstr "로 이동(&J)" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "경유지 생성" @@ -3109,7 +3109,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "선박자동식별장치(AIS) 표적 목록" @@ -3198,38 +3198,38 @@ msgstr "표적 수" msgid "Undock Target List" msgstr "표적 목록 결합 해제" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "트랙 기록" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "이 대상의 최근 캡처한 트랙이 기록되었습니다.\n" "현재 OpenCPN 세션이 끝날 때까지 계속 기록하시겠습니까?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "선박자동식별장치(AIS)표적쿼리" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "확인" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "추적 중단" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "메뉴" @@ -3283,7 +3283,7 @@ msgstr "선박을 여기로 이동" msgid "Navigate To Here" msgstr "여기로 항해" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "행해코스가 화면 위로 향하는 모드" @@ -3292,8 +3292,8 @@ msgid "Heading Up Mode" msgstr "선수가 화면 위로 향하는 모드" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "북쪽이 화면 위로 향하는 모드" @@ -3302,7 +3302,7 @@ msgid "Chart Up Mode" msgstr "해도가 화면에 바르게 보이는 모드" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "전체화면 켜기/끄기" @@ -3327,7 +3327,7 @@ msgstr "트랙 붙여넣기" msgid "CM93 Offset Dialog..." msgstr "CM93(벡터 해도) 오프셋 대화 상자.." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "해도 그룹" @@ -3445,7 +3445,7 @@ msgstr "KML로 복사" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "삭제" @@ -3599,18 +3599,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "해도 패널 옵션" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "항해 모드" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "북쪽이 화면의 위쪽" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "코스의 진행방향이 화면의 위쪽" @@ -3618,32 +3618,32 @@ msgstr "코스의 진행방향이 화면의 위쪽" msgid "Heading Up" msgstr "선수방향 화면 위쪽" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "미리보기 모드" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "표시 형식" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "해도 누비기 활성화" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "격자 보이기" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "해도 윤관선 보이기" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "수심 단위 보이기" @@ -3663,7 +3663,7 @@ msgstr "조류와 해류" msgid "Show Tide stations" msgstr "조류 관측소 보이기" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "해류 표시하기" @@ -3679,8 +3679,8 @@ msgstr "텍스트 보이기" msgid "Show depths" msgstr "수심 보이기" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "부표/등표 이름" @@ -3688,8 +3688,8 @@ msgstr "부표/등표 이름" msgid "Lights" msgstr "등화" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "등표 설명" @@ -3705,18 +3705,18 @@ msgstr "보이는 섹터 등화 보이기" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "분류 표시" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "표준" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "전부" @@ -3761,7 +3761,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "URL에서 데이터를 다운로드할 수 없습니다." @@ -3816,8 +3816,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4149,28 +4149,28 @@ msgstr "'아니요'라고 답하면 이 경로에 대한 모든 새로운 경유 msgid "Merge waypoints?" msgstr "경유지를 병합하시겠습니까?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "경로 구간 정보 지연출항" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile 지도는 OpenGL을 활성화해야 합니다." -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "피트" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "미터" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "길" @@ -4178,7 +4178,7 @@ msgstr "길" msgid "OverZoom" msgstr "과도확대" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "확장된 조석 아이콘" @@ -4194,7 +4194,7 @@ msgstr "선박자동식별장치(AIS) 표적 문의" msgid "Show all AIS Targets" msgstr "모든 선박자동식별시스템(AIS) 표적 보이기" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "덜 위협적인 선박자동식별시스템(AIS) 표적 흐리기" @@ -4242,9 +4242,9 @@ msgstr "사용자 X 오프셋" msgid "User Y Offset" msgstr "사용자 Y 오프셋" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "미터" @@ -4255,11 +4255,13 @@ msgstr "이 구간" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "제어창 범례" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "제어창 값" @@ -4295,12 +4297,12 @@ msgstr "다음지점까지 남은시간(ETA) @평균속력(VMG)" msgid "ETA @SOG" msgstr "다음지점까지의 남은시간(ETA) @실속력(SOG)" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "제목" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4329,7 +4331,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4618,12 +4620,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN 경고" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN 정보" @@ -4632,17 +4634,17 @@ msgstr "OpenCPN 정보" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "모두 선택" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "모두 지우기" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "추가" @@ -4668,59 +4670,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "일반 사항" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4778,7 +4780,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "재설치" @@ -4786,7 +4788,7 @@ msgstr "재설치" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "이전 버전으로 되돌리기" @@ -4816,7 +4818,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4824,6 +4826,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "선박자동식별시스템(AIS)지연변경" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4836,7 +4853,7 @@ msgstr "래스터 해도 압축 스레드 종료를 기다리는 중입니다." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "자선으로 부터의 거리: %4.0f 해리" @@ -4957,7 +4974,7 @@ msgstr "이 경유지는 레이어의 일부이며 편집할 수 없습니다." msgid "Icon" msgstr "아이콘" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4967,7 +4984,7 @@ msgid "Links" msgstr "링크" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5008,22 +5025,22 @@ msgstr "거리환" msgid "Number" msgstr "번호" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "거리" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "색상" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "없음" @@ -5113,16 +5130,16 @@ msgstr "축척에서만 보이기" msgid "Tide Station not found" msgstr "조류 관측소를 찾음 수 없음" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "지속되는" @@ -5154,35 +5171,35 @@ msgstr "망관리부가장치(NMEA) 디버그 창" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5230,8 +5247,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5239,277 +5256,277 @@ msgstr "" msgid "Anchorage created " msgstr "정박지 생성 " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "추적 활성화" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "자동 추종" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "확대" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "축소" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "해도 스크롤바 보이기" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "전자해도 텍스트 보이기" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "조석 표시하기" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "색 구성 변경" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "선박자동식별시스템(AIS) 표적 보이기" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "경로 생성" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "익수자 표시 지우기" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "기본 설정" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "인쇄하는 동안 문제가 발생했습니다.\n" "현재 프린터가 올바르게 설정되어 있지 않습니까?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(이름 없는 경로)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "자선" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "경로 및 표시 관리자" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "해도 인쇄하기" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5517,105 +5534,105 @@ msgstr "현재 설정을 기반으로 개인 구성 템플릿을 만듭니다.\n "이 템플릿은 저장되며 언제든지 나중에 사용할 수 있도록 선택할 수 있습니다.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "해상이동통신 서비스식별부호(MMSI) 확장 속성" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "추적" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "기본 추적" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "항상 추적" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "추적하지 않음" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "이 해상이동통신 서비스식별부호(MMSI) 무시하기" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "이 해상이동통신 서비스식별부호(MMSI)를 SART/PLB(AIS) MOB로 처리합니다." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "이 MMSI에 대해 타선수신정보(AIVDM)를 자선정보(AIVDO)로 변환" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "이 MMSI는 내 동행선입니다 - 최근접점(CPA) 경고 없음" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "해상이동통신서비스식별부호(MMSI) ID는 일반적으로 9자리 숫자입니다.\n" "입력 사항을 확인하고 필요한 경우 취소하십시오." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "기본값" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "항상" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "절대 아님" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "해상이동통신서비스식별부호(MMSI) 속성 편집" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "해상이동통신서비스식별부호(MMSI) 속성" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "추적 상태" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "무시하기" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "익수자" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr " 다른 선박으로 받는 AIS 메시지(VDM)->자선의 정보를 상대방의 배로 송신하는 메시지(VDO)" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "배 이름" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "팔로워" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "신규..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "해상무선통신서비스식별부호(MMSI) 속성 추가" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5633,7 +5650,7 @@ msgstr "선택한 장치에 액세스할 수 없습니다. opencpn은\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "자세한 내용은 배포 문서에서 LINUX_DEVICES.md 파일을 참조하십시오. .\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5653,1179 +5670,1174 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "자세한 내용은 배포 문서에서 LINUX_DEVICES.md 파일을 참조하십시오. .\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "망관리부가장치(NMEA)" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "실침로(COG) 예측변수 길이 (분)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "선수방향 예측변수 길이 (해리)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "선박 아이콘 종류" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "실 축척 비트맵" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "실 축척 벡터" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "전체 길이 (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "전체 폭 (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "선수로부터 GPS 오프셋 (미터)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "선박중앙으로 부터 GPS 오프셋 (미터)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "최소 화면 크기 (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "범위 링 보이기" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "링 간의 거리" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "거리 단위" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "해리" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "킬로미터" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "범위 링 색상" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "활성 경유지 방향 보이기" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "모양" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "실선" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "점" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "긴 줄표" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "짧은 줄표" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "점 줄표" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "기본 색상" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "검정" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "어두운 빨강" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "어두운 초록" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "어두운 노랑" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "어두운 파랑" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "어두운 자홍" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "어두운 청록" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "밝은 재" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "어두운 재" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "빨강" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "초록" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "노랑" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "파랑" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "자홍" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "청록" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "흰" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "트랙" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "자정에 자동 일일 추적" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "에 자동 일일 추적" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "컴퓨터" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "협정세계시(UTC)" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "지역평균시(LMT)" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "강조 트랙" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "추적 정밀도" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "하" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "중" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "고" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "계산 값" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "변경 위치에서 실속력(SOG) 및 실침로(COG) 계산" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "업데이트 사이의 시간" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "경로/지점" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "새 경로" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "경유지 기본 아이콘" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "경유지 도착 원 반경 (해리)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "도착지만 있는 전진 경로" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "해도축척 기반 가시성에 대한 설정을 재정의하고 항상 보이기" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "경유지 범위 원 색상" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "제어 옵션" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "트랙 및 경로 삭제 확인" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "해도 파일" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "디렉토리" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "디렉토리 추가" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "선택항목 제거" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "선택항목 압축" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "제거" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "업데이트 제어" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "해도 스캔 및 데이터베이스 업데이트" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "전체 데이터베이스를 다시 만들기" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "모든 해도를 준비하기" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "[수정됨] " -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "서식파일" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "서식파일 등급" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "마지막으로 적용된 서식파일 제목:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "저장된 서식파일" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "환경설정 생성..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "선택한 환경설정 삭제..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "선택한 환경설정 적용" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "환경설정 생성" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "선택한 환경설정을 적용하는 중에 문제가 발생했습니다." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "고급" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "기울기 보정 래스터 해도" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "그래픽 (OpenGL) 가속기능을 사용" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL 옵션" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "해도 회전 평균 시간" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "초" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "해도 확대/축소 가중치" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "래스터" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "벡터" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 상세 수준" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "실제 화면 폭" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "자동" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "수동:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "해도 표시" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "기울어진 래스터 해도를 북쪽을 위쪽으로 보이기" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "값이 낮을수록 동일한 확대/축소 수준은 덜 상세한 해도를 표시합니다.\\값이 높을수록 동일한 확대/축소 수준이 더 자세한 해도를 표시합니다." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "그래픽" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "벡터 해도 표시" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "뱃사람 표준" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "수심" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "해도정보 객체" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "부표/등표" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "확장 등표 영역" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "해도 글자" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "한글 표시" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "중요 글자만 표시" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "중복되지 않게 글자 표시" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "해도 상세 사항" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "소축척에서는 덜 상세하게" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "그래픽 스타일" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "종이 해도" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "단순화" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "경계" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "있는 대로" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "기호화" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "색상" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 색상" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 색상" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "얕은 수심" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "안전 수심" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "깊은 수심" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "사용자 표준 객체" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "표준으로 재설정" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "조류와 해류" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "활성 데이터 세트" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "데이터 세트 추가..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "사용 가능한 모든 해도" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "해도 제거" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "모든 해도" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "새 그룹..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "그룹 삭제" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "해도 전환 시 축척 유지" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "컨트롤" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "부드러운 이동과 확대" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "커서로 확대" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "특성 표시" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "상태 표시줄 옵션" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "커서 지점에 실시간 예상도착시간(ETA)" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "기본 보트 속도" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "화폭 배치행태" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "상태 표시줄" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "단위" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "법령 마일" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "노트" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "마일/시간" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "깊이" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "온도" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "섭씨" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "화씨" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "절대온도" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "위도/경도" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "도, 십진수 분" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "십진수 도" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "도, 분, 초" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "방위각" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "진북 보기" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "자기 보이기" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "추정된 자기 변화" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "도 (-서 + 동)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "실제 방위와 선수방위 보이기" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "자기 방위와 선수방위 보이기" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "세계자기장모델(WMM) 플러그인이 계산한 자기 값" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "자기 값을 수동으로 설정하려면\n" " 세계자기장모델(WMM) 플러그인을 비활성화해야 합니다." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "오디오 파일 이름:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "소리 파일 선택" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "음향" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "정박 경고" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "정박 경고시 소리 재생" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "정박 경고 소리 선택" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "선박자동식별시스템(AIS) 경보시 소리 재생" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "선박자동식별시스템(AIS) 경보음 선택" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "수색및구조응답기(SART) 경보" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "선박자동식별시스템(AIS) 수색및구조응답기(SART) 경보음 재생" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "선박자동식별시스템(AIS) 수색및구조응답기(SART) 경보음 선택" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "디지털선택호출장치(DSC) 경보" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "디지털선택호출장치(DSC) 알림시 소리 재생" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "디지털선택호출장치(DSC) 알림음 선택" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "알 수 없는 장치:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "소리 장치" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "오디오 재생 명령:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "선박자동식별시스템(AIS) 표적" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "최근접점(CPA) 계산" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "(해리) 보다 표적 범위가 큰 경우 최근접점(시간)((T)CPA) 경보 없음" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "(해리) 보다 CPA가 작은 경우 경고 " -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "... 및 최근접점시간(TCPA)이 (분) 보다 작다" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "잃어버린 표적" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "(분) 후에 표적을 잃어버린 것으로 표시" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "(분) 후 잃어버린 표적 제거" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "화면" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "표적 실침로(COG) 예측자 화살표, 길이 (분) 보이기" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "표적 트랙, 길이 (분) 보이기" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "정박/계류된 표적, 최대 속도(노트) 표시금지" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "선박자동식별시스템(AIS) 실시간 예측, 표적 최저 속도 (노트) 얻기" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "표적이 ... 보다 많은 경우 덜 위험한 표적의 흐리게 보이도록 허용하기" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "지역 공지사항 보이기 (선박자동식별시스템(AIS) 바이너리 메시지에서)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "선박자동식별시스템(AIS) 표적 실제 크기 보이기" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "1보다 큰 축척에서 선박자동식별시스템(AIS) 표적과 함께 이름 보이기:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "WPL 위치 메시지 사용. 수신 시 조치:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "자동위치발신시스템(APRS) 위치 보고" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "표시 생성" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "지연" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "경로/AIS정보 블럭 활성화" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"선박명\" MMSI (호출 부호)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[등급] 유형 (상태)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "실속력(SOG) 실침로(COG)" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "최근접점(CPA) 최금접점시간(TCPA)" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "최근접점(CPA)/최근접점시간(TCPA) 경보" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "최근접점(CPA)/최근접점시간(TCPA) 경보 대화상자 보이기" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "최근접점(CPA)/최근접점시간(TCPA) 경보 및 디지털선택호출(DSC)/수색과구조응답기(SART) 긴급 상황에서 소리 재생" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "정박/계류된 표적에 대한 경보 금지" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "표적 경보 확인 시간 초과 활성화 (분)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "일반 옵션" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "언어" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "글꼴" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "글꼴 선택" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "글꼴 색상 선택..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "예시" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "도구 모음 및 창 모양" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "사용환경 옵션" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "상태 표시줄 보이기" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "메뉴 표시줄 보이기" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "나침판/GPS 상태 창 보이기" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "도구모음 자동 숨기기 활성화" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "선박의 시간알림 종 재생" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "터치스크린 사용환경 활성화" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "축척에 따른 그래픽 사용환경 활성화" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "확대/축소 버튼 보이기" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "사용자 사용환경 축척 인수" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "해도 객체 축척 인수" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "선박 축척 인수" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "전자해도 수심측정 인수" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "적용" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "해도" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "접속" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "선박" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "사용자 사용환경" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "플러그인" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "사용자 설정 자기 편차" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "피트" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "패덤(수심축정단위, 6피트 또는 1.8미터)" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "해도 파일이 포함된 디렉토리 추가" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - 선박의 길이는 0보다 커야 합니다." -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - 선박의 폭은 0보다 커야 합니다." -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - 선박 중앙으로 부터의 GPS 오프셋은 선박 폭 내에 있어야 합니다." -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - 선수로부터의 GPS 오프셋은 선박 길이 내에 있어야 합니다." -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - 선박 아이콘 최소 크기는 1에서 100 mm 사이여야 합니다." -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "자선 실제 크기에 대한 설정이 올바르지 않습니다." -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6835,15 +6847,15 @@ msgstr "압축은 디스크의 모든 해도 파일을 변경하게 됩니다.\n "압축된 차트는 로드 및 일부 시스템에서 표시하는 데 약간 더 오래 걸릴 수 있습니다.\n" "unxz 또는 7 zip 프로그램을 사용하여 다시 압축을 풀 수 있습니다." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN 압축 해도" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "압축할 해도가 없습니다." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6852,71 +6864,71 @@ msgstr "압축된 %ld 해도\n" "%.1fMB에서 %.1fMB로\n" "%.1fMB(%.1f%%)로 저장" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "그룹명 입력" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "새 해도 그룹" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "조류/해류 데이터 선택" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "텍스처 압축" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "캐싱을 통한 텍스처 압축" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "텍스처 압축 캐싱" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "텍스처 메모리 크기 (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "크기:" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "텍스처 캐시 재구축" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "텍스처 캐시 지우기" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "다각형 평활화" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "선 평활화" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "소프트웨어 OpenGL (OpenCPN 다시 시작)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "가속 표적따라가기 사용" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "텍스처 설정" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "텍스처 캐시" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "기타" @@ -6998,127 +7010,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "이러한 설정은 OpenCPN을 불안정하게 할 수 있으며 기본적으로 비활성화되어 있습니다. 위험에도 불구하고 환경구성 파일의 [PlugIns] 섹션에 CatalogExpert=1 행을 수동으로 추가할 수 있습니다." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "플러그인 목록" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "플러그인 목록 업데이트" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "플러그인 가져오기..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "설정..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "비활성화" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN 목록 업데이트" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "목록 파일을 복사할 수 없습니다." -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "목록 파일을 캐시에 복사할 수 없습니다." -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "목록 업데이트 성공" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "tarball압축 파일 선택" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN 플러그인 가져오기 오류" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "호환되지 않는 플러그인 가져오기 발견" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "tarball플러그인을 가져와 압축을 푸는 동안 오류" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "활성 목록" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "최종 목록" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "최종 변경: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "플러그인 목록을업데이트하십시오." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "제거" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "활성화" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "버전으로 업그레이드" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "설치..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "로 업데이트" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "웹사이트" @@ -7163,10 +7175,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "선박자동식별시스템(AIS)지연변경" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "조류해류그래프지연변경" @@ -7284,12 +7292,6 @@ msgstr "트랙으로 부터 경로" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7493,15 +7495,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7806,7 +7808,7 @@ msgstr "(섹터 각도는 바다쪽방향으로 부터 실제 방 msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7922,7 +7924,7 @@ msgstr "오늘" msgid "Tomorrow" msgstr "내일" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "도구 설명" @@ -8204,153 +8206,156 @@ msgstr "경유지 이동" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_mr_IN.po b/po/opencpn_mr_IN.po index 4c8ed4ffac..b0df05e852 100644 --- a/po/opencpn_mr_IN.po +++ b/po/opencpn_mr_IN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Marathi\n" "Language: mr_IN\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "" @@ -414,7 +414,7 @@ msgstr "" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "" @@ -476,7 +476,7 @@ msgstr "" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "" @@ -509,11 +509,11 @@ msgstr "" msgid "Left" msgstr "" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "" @@ -2435,8 +2435,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "" @@ -2482,9 +2482,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "" @@ -2526,7 +2526,7 @@ msgstr "" msgid "Track properties" msgstr "" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2539,12 +2539,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2641,23 +2641,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3057,7 +3057,7 @@ msgstr "" msgid "Undefined (default)" msgstr "" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "" @@ -3068,7 +3068,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "" @@ -3084,7 +3084,7 @@ msgstr "" msgid "&Jump To" msgstr "" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "" @@ -3107,7 +3107,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "" @@ -3196,37 +3196,37 @@ msgstr "" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "" @@ -3280,7 +3280,7 @@ msgstr "" msgid "Navigate To Here" msgstr "" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "" @@ -3289,8 +3289,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "" @@ -3299,7 +3299,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3324,7 +3324,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3442,7 +3442,7 @@ msgstr "" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "" @@ -3596,18 +3596,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "" @@ -3615,32 +3615,32 @@ msgstr "" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "" @@ -3660,7 +3660,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "" @@ -3676,8 +3676,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "" @@ -3685,8 +3685,8 @@ msgstr "" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "" @@ -3702,18 +3702,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "" @@ -3758,7 +3758,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3813,8 +3813,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4146,28 +4146,28 @@ msgstr "" msgid "Merge waypoints?" msgstr "" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "" @@ -4175,7 +4175,7 @@ msgstr "" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4191,7 +4191,7 @@ msgstr "" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4239,9 +4239,9 @@ msgstr "" msgid "User Y Offset" msgstr "" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "" @@ -4252,11 +4252,13 @@ msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4292,12 +4294,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4326,7 +4328,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4615,12 +4617,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "" @@ -4629,17 +4631,17 @@ msgstr "" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "" @@ -4665,59 +4667,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4775,7 +4777,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4783,7 +4785,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4813,7 +4815,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4821,6 +4823,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4833,7 +4850,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -4954,7 +4971,7 @@ msgstr "" msgid "Icon" msgstr "" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4964,7 +4981,7 @@ msgid "Links" msgstr "" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5005,22 +5022,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "" @@ -5109,16 +5126,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "" @@ -5150,35 +5167,35 @@ msgstr "" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5226,8 +5243,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5235,379 +5252,379 @@ msgstr "" msgid "Anchorage created " msgstr "" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr "" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "" -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5618,7 +5635,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5630,1259 +5647,1254 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "" @@ -6959,127 +6971,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7124,10 +7136,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7245,12 +7253,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7448,15 +7450,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7759,7 +7761,7 @@ msgstr "" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7875,7 +7877,7 @@ msgstr "" msgid "Tomorrow" msgstr "" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "" @@ -8156,153 +8158,156 @@ msgstr "" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_nb_NO.po b/po/opencpn_nb_NO.po index 9825c498d0..2c964d049d 100644 --- a/po/opencpn_nb_NO.po +++ b/po/opencpn_nb_NO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -17,14 +17,14 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Slepestrek uten navn)" #: model/include/model/track.h:136 msgid "(Unknown Date)" -msgstr "" +msgstr "(Ukjent dato)" #: model/src/ais_decoder.cpp:934 msgid "Vessel, type unknown" @@ -392,15 +392,15 @@ msgstr "AtoN Virkelig (Utenfor posisjon)" #: model/src/ais_target_data.cpp:120 msgid "steady" -msgstr "" +msgstr "stabil" #: model/src/ais_target_data.cpp:122 msgid "decreasing" -msgstr "" +msgstr "avtagende" #: model/src/ais_target_data.cpp:124 msgid "increasing" -msgstr "" +msgstr "økende" #: model/src/ais_target_data.cpp:483 model/src/ais_target_data.cpp:1081 #: gui/src/OCPNListCtrl.cpp:121 @@ -414,7 +414,7 @@ msgstr "SAR fly" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Sist sett)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posisjon" @@ -486,7 +486,7 @@ msgstr "Rapport alder" #: model/src/ais_target_data.cpp:702 msgid "Issued (UTC)" -msgstr "" +msgstr "Utstedt (UTC)" #: model/src/ais_target_data.cpp:721 msgid "Report as of" @@ -509,11 +509,11 @@ msgstr "Styrbord" msgid "Left" msgstr "Babord" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Fart" @@ -566,13 +566,13 @@ msgid "Altitude" msgstr "Breddegrad" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" -msgstr "" +msgstr "Vindstyrke" #: model/src/ais_target_data.cpp:907 msgid "Wind gust" -msgstr "" +msgstr "Vindkast" #: model/src/ais_target_data.cpp:913 model/src/ais_target_data.cpp:1185 msgid "Water level deviation" @@ -584,11 +584,11 @@ msgstr "" #: model/src/ais_target_data.cpp:930 model/src/ais_target_data.cpp:1193 msgid "Water level" -msgstr "" +msgstr "Vannstand" #: model/src/ais_target_data.cpp:940 msgid "Surface current " -msgstr "" +msgstr "Overflatestrøm" #: model/src/ais_target_data.cpp:950 model/src/ais_target_data.cpp:957 #: model/src/ais_target_data.cpp:1211 @@ -597,31 +597,31 @@ msgstr "" #: model/src/ais_target_data.cpp:960 msgid "Waves height & period" -msgstr "" +msgstr "Bølgehøyde og periode" #: model/src/ais_target_data.cpp:962 msgid "Swell height & period " -msgstr "" +msgstr "Dønningshøyde og periode" #: model/src/ais_target_data.cpp:979 msgid "Air Temperatur" -msgstr "" +msgstr "Lufttemperatur" #: model/src/ais_target_data.cpp:980 msgid "Air pressure" -msgstr "" +msgstr "Lufttrykk" #: model/src/ais_target_data.cpp:994 msgid "Relative Humidity" -msgstr "" +msgstr "Relativ fuktighet" #: model/src/ais_target_data.cpp:996 msgid "Dew Point " -msgstr "" +msgstr "Duggpunkt" #: model/src/ais_target_data.cpp:1010 msgid "Water Temperatur" -msgstr "" +msgstr "Vanntemperatur" #: model/src/ais_target_data.cpp:1011 msgid "Sea state" @@ -629,7 +629,7 @@ msgstr "" #: model/src/ais_target_data.cpp:1026 msgid "Precipitation" -msgstr "" +msgstr "Nedbør" #: model/src/ais_target_data.cpp:1028 msgid "Horizontal Visibility" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Hjelp til Navigasjon (AtoN)" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/t" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "Veipunkter kan døpes om for å reflektere den nye sorteringen, navnene "Ønsker du å døpe om veipunktene?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Om OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Overskrive Garmin enhetens rutenummer 1?" msgid "OpenCPN Message" msgstr "OpenCPN melding" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Alternativer" @@ -2543,7 +2543,7 @@ msgstr "Skriv ut valgte slepestrek" msgid "Track properties" msgstr "Egenskaper for slepestrek" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "Utvidelses API: " msgid "OpenCPN Website" msgstr "OpenCPN nettsted" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN hjelpedokumenter er ikke tilgjengelig lokalt." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Ønsker du å besøke opencpn.org nettsiden for mer informasjon?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Avbrytning - Avbryt område som identifisert av meldingskobling ID" msgid "Undefined (default)" msgstr "Udefinert (standard)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Navn på AIS-mål" @@ -3089,7 +3089,7 @@ msgstr "\n" "En vedvarende sporing vil derfor bli startet på nytt for dette målet.\n\n" "Vil du i stedet stoppe vedvarende sporing for dette målet?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS varsel" @@ -3105,7 +3105,7 @@ msgstr "&Avstill alarm" msgid "&Jump To" msgstr "&Hopp til" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Sett ut veipunkt" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS fartøyliste" @@ -3217,38 +3217,38 @@ msgstr "Antall mål" msgid "Undock Target List" msgstr "Undock target liste" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Lagre slepestrek" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Det nylig registrerte slepestreket etter dette målet har blitt lagret. \n" "Vil du fortsette lagringen til du avslutter OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS mål informasjon" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Stopp sporing" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Meny" @@ -3302,7 +3302,7 @@ msgstr "Flytt båt hit" msgid "Navigate To Here" msgstr "Naviger hit" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Kurs opp modus" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Kurs opp modus" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Nord opp modus" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Kart opp modus" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Aktiver/deaktiver fullskjerm" @@ -3346,7 +3346,7 @@ msgstr "Lim inn slepestrek" msgid "CM93 Offset Dialog..." msgstr "CM93 forskyvnings dialog..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Kartgrupper" @@ -3464,7 +3464,7 @@ msgstr "Kopier som KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Slett" @@ -3618,18 +3618,18 @@ msgstr "Send spor til annen OpenCPN" msgid "Chart Panel Options" msgstr "Tilpass kartet" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigasjonsmodus" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Nord opp" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Kurs opp" @@ -3637,32 +3637,32 @@ msgstr "Kurs opp" msgid "Heading Up" msgstr "Kurs opp" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Se forover modus" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Visnings alternativer" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Aktiver kartfletting" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Vis rutenett" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Vis kartomriss" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Vis dybdeenheter" @@ -3682,7 +3682,7 @@ msgstr "Tidevann og strømmer" msgid "Show Tide stations" msgstr "Vis tidevannstasjoner" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Vis havstrømmer" @@ -3698,8 +3698,8 @@ msgstr "Vis tekst" msgid "Show depths" msgstr "Vis dybder" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Bøye/lykt navnelapper" @@ -3707,8 +3707,8 @@ msgstr "Bøye/lykt navnelapper" msgid "Lights" msgstr "Lykter" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Lykt beskrivelse" @@ -3724,18 +3724,18 @@ msgstr "Vis synlige sektorlys" msgid "Show chart data quality" msgstr "Vis kartets datakvalitet" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Visnings alternativer" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Alle" @@ -3780,7 +3780,7 @@ msgstr "Bruk som aktiv katalog" msgid "Latest available catalog:" msgstr "Siste tilgjengelige katalog:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Kan ikke laste ned data fra URL" @@ -3835,8 +3835,8 @@ msgstr "Mislykkes: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Svarer du 'NEI' opprettes det nye veipunkter for denne ruten." msgid "Merge waypoints?" msgstr "Koble sammen veipunkter?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RuteleggInfoMusOver" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile krever at OpenGL er aktivert" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Fot" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Meter" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Favner" @@ -4197,7 +4197,7 @@ msgstr "Favner" msgid "OverZoom" msgstr "Overzoom" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "UtvidetTidevannsIkon" @@ -4213,7 +4213,7 @@ msgstr "AIS-mål informasjon" msgid "Show all AIS Targets" msgstr "Vis alle AIS-målene" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Demp mindre kritiske AIS-mål" @@ -4261,9 +4261,9 @@ msgstr "Bruker X forskyvning" msgid "User Y Offset" msgstr "Bruker Y forskyvning" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "meter" @@ -4274,11 +4274,13 @@ msgstr "Denne leggen" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Konsoll Forklaring" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Konsoll Verdi" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Tittel" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Mindre" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Rediger valgt tilkobling" @@ -4637,12 +4639,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN advarsel" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN info" @@ -4651,17 +4653,17 @@ msgstr "OpenCPN info" msgid "Sentence Filter" msgstr "Setningsfilter" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Velg alt" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Tøm alt" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Legg til" @@ -4692,59 +4694,59 @@ msgstr "En NMEA setning er normalt 3 tegn lang (f.eks. RMC, GGA osv.)\n" msgid "REGEX syntax error: \n" msgstr "REGEX syntaksfeil: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Generelt" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filtrer NMEA Kurs- og Fartsdata" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Filterperiode (sek)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Vis NMEA feilsøkningsvindu" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Formater opplasting for Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Benytt Garmin GRMN (Vert) modus for opplastinger" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Juster kommunikasjonsprioritet..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Datatilkoblinger" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Fjern tilkobling" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Sett opp ny tilkobling" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Installer" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Installer på nytt" @@ -4810,7 +4812,7 @@ msgstr "Installer på nytt" msgid "Update" msgstr "Oppdater" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Nedgrader" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr " installasjon vellykket" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Installasjon fullført" @@ -4848,6 +4850,21 @@ msgstr "Installasjon fullført" msgid "Installation error" msgstr "Installasjonsfeil" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Merker" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS kursor over" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "Rutenett tekst" @@ -4860,7 +4877,7 @@ msgstr "Venter på at rasterkart komprimerings-tråden skal avslutte." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN komprimert hurtigbuffer oppdatering" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distanse fra eget skip: %4.0f NM" @@ -4993,7 +5010,7 @@ msgstr "Dette veipunktet er del av et lag og kan ikke endres" msgid "Icon" msgstr "Ikon" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Kombinert!" @@ -5003,7 +5020,7 @@ msgid "Links" msgstr "Linker" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5044,22 +5061,22 @@ msgstr "Avstandsringer" msgid "Number" msgstr "Nummer" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distanse" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Farge" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Ingen" @@ -5149,16 +5166,16 @@ msgstr "Vis bare ved skala" msgid "Tide Station not found" msgstr "Tidevannstasjon ble ikke funnet" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Sett målestokk" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Målestokk" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Varig" @@ -5190,35 +5207,35 @@ msgstr "NMEA feilsøkningsvindu" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Kunne ikke starte brukergrensesnittet. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN kan ikke starte. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "De nødvendige konfigurasjonsfilene ble ikke funnet. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "SE loggfilen på " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " for detaljer." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Bærbar(-p) startes fra " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Innhenter kart mapper fra Windows registeret" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN startet på %ld ms." @@ -5273,8 +5290,8 @@ msgstr "Estimert tid : " msgid "Remaining time : " msgstr "Gjenværende tid : " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN kartoppdatering" @@ -5282,277 +5299,277 @@ msgstr "OpenCPN kartoppdatering" msgid "Anchorage created " msgstr "Ankerplass opprettet " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Vis verktøylinje" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Skjul verktøylinje" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "MANN OVER BORD" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " ved " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " på " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 NM langs COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Midlertidig MOB rute" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Antatt 1 mils punkt" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Tid: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Posisjon: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Deaktiver sporing" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Aktiver sporing" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Følg automatisk" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Baug opp modus" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Zoom inn" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Zoom ut" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Kart med større målestokk" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Kart med mindre målestokk" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Avslutt OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Naviger" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Vis kartlinje" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Vis ENC tekst" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Vis ENC lykter" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Vis ENC loddskudd" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Vis ENC ankringsinfo" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Vis ENC datakvalitet" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Vis nav.objekter" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Vis tidevann" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Bytt fargepalett" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Vis" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Vis AIS-mål" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Skjul fortøyde AIS-mål" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Vis slepestrek etter AIS-mål" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Vis CPA alarmdialoger" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Aktiver hørbare CPA alarmer" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Vis CPA advarsler" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Mål distanse" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Rute && Merke behandling..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Lag rute" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Sett merke ved båt" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Sett merke ved kursor" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Sett MOB merke" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Innstillinger" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Verktøy" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Vindu" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN Hjelp" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Hjelp" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Start OpenCPN på nytt for å aktivere valgt språk eller stilendring." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Skip " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Rotert modus" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Et problem oppstod ved utskrift.\n" "Kanskje printer ikke er installert korrekt?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Rute uten navn)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS MANN OVER BORD" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Eget skip" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Midlertidig AISMOB rute" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Vis eget skip" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Eget skips posisjon: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " MOB Posisjon: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS MANN OVER BORD OPPDATERING" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Rute & punktbehandling" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Skriv ut kart" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Mellomrom)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN ENC forberedelse" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC ferdig." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5560,105 +5577,105 @@ msgstr "Opprett en privat konfigurasjons-mal basert på nåværende innstillinge "Denne malen vil bli lagret, og kan når som helst bli valgt for fremtidig bruk.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI utvidede egenskaper" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Sporer" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Standard sporing" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Alltid spor" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Aldri spor" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorer dette MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Behandle dette MMSI som SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Konverter AIVDM for dette MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Fartøy med MMSI er min følger - Ingen CPA varsel" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "En MMSI Id består av 9 siffer.\n" " Vennligst sjekk din oppføring og avbryt om nødvendig." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Standard" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Alltid" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Aldri" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Rediger MMSI egenskaper" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI egenskaper" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Spormodus" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorer" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Skipsnavn" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Følger" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Ny..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Legg til MMSI egenskaper" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5676,7 +5693,7 @@ msgstr "Den valgte enheten er ikke tilgjengelig; opencpn vil sansynligvis ikke k " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For mer informasjon, se filen LINUX_DEVICES.md i distribusjons dokumentene.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5696,1180 +5713,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For mer informasjon, se filen LINUX_DEVICES.md i distribusjons dokumentene.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG kursvektor lengde (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Lengde på kursberegnings vektor (Nm)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Ikontype for skipet" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Virkelig skala, Bitmap" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Virkelig skala, Vektor" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Total lengde, LOA (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Total bredde, WOA (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS forskyvning fra baug (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS forskyvning fra midtskip (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Minimums størrelse på skjerm (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Vis avstandsringer" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distanse mellom ringer" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Distanse enhet" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Nautiske mil" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometer" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Avstandsring farge" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Vis retning til aktivt veipunkt" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Stil" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Kraftig" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Punkt" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Lang strek" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Kort strek" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Punkt strek" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Standard farge" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Sort" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Mørk Rød" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Mørk Grønn" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Mørk Gul" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Mørk Blå" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Mørk Magenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Mørk Cyan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Lys Grå" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Mørk Grå" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Rød" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Grønn" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Gul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blå" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cyan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Hvit" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Slepestreker" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatisk daglig slepestrek ved midnatt" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatisk daglig slepestrek på" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Datamaskin" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Merkede slepestrek" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Uthevet farge" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Slepestrek nøyaktighet" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Lav" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Middels" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Høy" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Beregn verdier" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Beregn SOG og COG ut fra posisjons endringer" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Min. sekunder mellom oppdateringer" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Ruter/Punkter" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Nye ruter" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Standard ikon for veipunkt" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Veipunkt ankomst sirkel radius (Nm)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Gå kun til ruteveipunkt etter ankomst" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Overstyr innstillinger for synlighet basert på kartskala og alltid vis punktene" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Farge på avstandsringer for veipunkt" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Kontroll alternativer" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Bekreft sletting av slepestrek og ruter" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Kartfiler" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Mapper" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Legg til mappe" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Fjern valgte" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Komprimer valgte" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Legg til.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Fjern" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Komprimer" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Migrer kart.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Oppdateringskontroll" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Søk gjennom karter og oppdater database" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Fremtving full kartdatabase gjenoppbygging" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Forbered alle ENC karter" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Maler" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Malstatus" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Sist brukte mal:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Lagrede maler" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Opprett konfigurasjon..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Slett valgt konfigurasjon..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Bruk valgt mal" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Opprett konfigurasjon" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Det oppstod et problem ved aktivering av valgt konfigurasjon." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avansert" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Nullstill forskyvde rasterkarter" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Bruk akselerert grafikk (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL alternativer" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Kartrotasjons gjennomsnitts tid" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "sekunder" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Vektbasert kart-zoom/-skalering" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektor" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 Detaljnivå" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Fysisk skjermbredde" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manuell:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Kartvisning" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Vis skjeve rasterkarter som Nord opp" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Med en lavere verdi, samme zoom-nivå vises et mindre detaljert kart.\n" "Med en høyere verdi, viser den samme zoom-verdi et mer detaljert kart." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafikk" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vektorkart visning" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Mariner's Standard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Vis loddskudd" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Kartinformasjons objekter" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bøyer/lykter" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Utvidede fyrsektorer" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Kart-tekst" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Nasjonal tekst på kart" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Kun viktig tekst" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Ryddig visning av tekst" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Kartdetaljer" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Reduser detaljer ved liten skala" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafikkstil" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Papirkart" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "ENC standard" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Grenser" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Vanlig" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Symbolisert" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Farger" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Farger" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Farger" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Grunn dybde" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Sikkerhetsdybde" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Klart farvann (dybde)" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Brukers standard objekter" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Tilbakestill til STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Tidevann && Strømmer" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktive datasett" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Legg til datasett..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Alle tilgjengelige kart" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Fjern kart" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Alle kart" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Ny gruppe..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Slett gruppe" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Bevar skala ved bytte av karter" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Betjening" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Jevn panorering / zooming" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom til kursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Visnings funksjoner" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Statuslinje valg" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Virkelig ETA ved kursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Standard båt hastighet " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Lerret oppsett" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Statuslinjen" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Enheter" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Statute mil" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Knop" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Dybde" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatur" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celcius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Len/Bre." -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Grader, Desimal minutter" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Desimal grader" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Grader, Minutter, Sekunder" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Kurser" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Vis sann" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Vis magnetisk" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Antatt magnetisk variasjon" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "grad. (-V, +Ø)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Vis sanne retninger og kurser" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Vis magnetiske retninger og kurser." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Magnetisk variasjon kalkulert av WMM utvidelse" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " For å sette magnetisk variasjon manuelt,\n" " må du deaktivere WMM utvidelsen." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Test" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Lydfilnavn:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Velg lydfil" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Lyd" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Anker Alarm" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Spill lyd på Anchor Alarm." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Velg Anker Alarmlyd" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Spill lyd på AIS varsling." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Velg AIS varsel lyd" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART Varsel" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Spill lyd på AIS SART varsling." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Velg AIS SART alarmlyd" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC Varsel" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Spill lyd ved DSC varsel." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Velg DSC varslingslyd" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Ukjent enhet :" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Inn-enhet :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Lydenhet" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Spill lyd kommando:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS-mål" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA kalkulasjon" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Ingen (T)CPA varsel hvis målets avstand er større enn (Nm)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Advar hvis CPA er mindre enn (Nm)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr " ...og TCPA er mindre enn (min)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Mistede mål" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Merk mål som mistet etter (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Fjern mistede mål etter (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Vis" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Vis målenes COG kursvektor pil, lengde (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Synkroniser AIS pillengde med eget skips COG beregning" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Vis slepestrek etter mål, lengde (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Undertrykk ankrede/fortøyde mål, fart maks (Kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Tegn AIS sanntids forutsigelse, målets min. hastighet (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Tillat demping av mindre kritiske mål hvis det er mer enn ... mål" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Vis område notiser (fra binære AIS meldinger)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Vis AIS-målenes virkelige størrelse" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Vis navn ved AISmål ved skala større enn 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Bruk WPL posisjons meldinger. Handling når mottatt:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS posisjons rapport" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Opprett merke" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Mus over" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Aktiver rute/AIS info blokk" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Skipsnavn\" MMSI (kallesignal)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Klasse] Type (Status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA Varsler" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Vis CPA/TCPA Varseldialog" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Spill lyd for CPA/TCPA advarsler og DSC/SART nødmeldinger." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Undertrykk alarmer for ankrede/fortøyde mål" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Aktiver tidsavbrudd for utkvittering av målvarsel (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Generelle alternativer" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Språk" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Bokstavfamilier" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Velg skrifttype" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Velg skriftfarge..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Eksempel" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Verktøylinje og vindusstil" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Grensesnitt alternativer" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Vis statuslinje" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Vis menylinje" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Vis kompass/GPS Statusvindu" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Skjul verktøylinjen automatisk" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Spill skipsklokker" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Aktiver berøringsskjerm grensesnitt" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Aktiver skalert grafisk brukergrensesnitt" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Vis zoomknapper" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Benytt innenlands ECDIS" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Innland ECDIS manual" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Brukergrensesnitt skaleringsfaktor" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Kartobjekt skaleringsfaktor" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Skipets skalerings faktor" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC loddskudd visningsstørrelse" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC tekstskala" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Sensivitet for zoom med musehjul" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Bruk" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Karter" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Tilkoblinger" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Koble til" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Skip" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Brukergrensesnitt" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Bruker" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Utvidelser" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Brukersatt magnetisk variasjon" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "fot" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "favner" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Legg til en mappe som inneholder kartfiler" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - skipets lengde må være > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - skipets bredde må være > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - GPS forskyvningen fra midtskips må være innen skipets bredde" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - GPS forskyvningen fra baug må være innenfor skipets lengde" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - minste skipsikon størrelse må være mellom 1 og 100 mm." -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Innstillingene for størrelsen på eget skip er ikke riktige:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Innenlands ECDIS manual er ikke tilgjengelig lokalt." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Ønsker du å besøke iECDIS manual nettsiden for mer informasjon?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6879,15 +6891,15 @@ msgstr "Komprimering vil endre kartfiler på disk.\n" "Komprimerte kart kan ta litt lengre tid å åpne på noen systemer.\n" "Kartene kan dekomprimeres ved å benytte UNXZ eller 7zip programmer." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN komprimer karter" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Ingen kart funnet for komprimering." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6896,71 +6908,71 @@ msgstr "komprimert %ld karter\n" "fra %.1fMB til %.1fMB\n" "spart %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Sett inn gruppenavn" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Ny kartgruppe" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Velg tidevann/strømdata" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Tekstur-komprimering" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Teksturkomprimering med hurtigbuffer" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Tekstur-komprimerings buffer" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tekstur minnestørrelse (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Størrelse: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Gjenopprett teksturbuffer" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Tøm tekstur buffer" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Polygon-utjevning" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Linje utjevning" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Programvare OpenGL (start OpenCPN på nytt)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Bruk akselerert grafikk (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Tekstur innstillinger" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Tekstur-hurtigminne" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Diverse" @@ -7042,127 +7054,127 @@ msgstr "Vennligst sjekk systemloggen for mer info." msgid " successfully installed from cache" msgstr " vellykket installert fra mellomlager" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Disse innstillingene kan destabilisere OpenCPN og er som standard deaktivert. Til tross for farene kan du manuelt enable dem ved å legge til en CatalogExpert=1 linje i [PlugIns] -delen av konfigurasjonsfilen." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Utvidelses katalog" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Oppdater utvidelses katalog" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importer utvidelse..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Innstillinger..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Deaktivert" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Oppdater utvidelsekatalog: hoved" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN katalog oppdatering" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Kunne ikke kopiere katalog-fil" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Kunne ikke kopiere katalog-fil til mellomlager" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Katalog ble vellykket oppdatert" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Velg tarball fil" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Importfeil med OpenCPN utvidelse" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Inkompatibel import utvidelse ble oppdaget." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Feil ved utpakking av import utvidelses tarball." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktiv katalog" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Siste katalog" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Sist endret" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Vennligst oppdater utvidelses katalog." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Avinstaller" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Aktivert" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Oppgrader til versjon " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Installer..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Oppdater til " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Nettsted" @@ -7207,10 +7219,6 @@ msgstr "Satellitter" msgid "OpenCPN Server Message" msgstr "OpenCPN server melding" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS kursor over" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TidevannstrømGrafMusOver" @@ -7328,12 +7336,6 @@ msgstr "Rute fra Slepestrek" msgid "Send to &Peer" msgstr "Send til annen OCPN" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Merker" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7534,15 +7536,15 @@ msgstr "men nåværende målestokk er" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Derfor vil ikke nye veipunkt være synlige ved dette zoom nivå." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Veipunkt(er) er sendt." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Feil ved veipunkt opplasting. Garmin GPS er ikke tilkoblet" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Feil ved veipunkt opplasting. Vennligst sjekk loggfiler..." @@ -7847,11 +7849,11 @@ msgstr "(Sektorvinkler har rettvisende retninger mot sjøen)The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

Siste opencpn kjøring ser ut til å ha feilet. Vil du kjøre\n" "i sikker modus uten utvidelser og andre potensielt problematiske\n" "-funksjoner?\n" -"



Du kan vurdere å besøke listen over kjente problemer.

" +"



Du kan vurdere å besøke listen over kjente problemer.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7966,7 +7968,7 @@ msgstr "I dag" msgid "Tomorrow" msgstr "I morgen" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Verktøytips" @@ -8256,153 +8258,156 @@ msgstr "Flytt veipunkt" msgid "Dismiss" msgstr "Avvis" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_nl_NL.po b/po/opencpn_nl_NL.po index 0f5304ba64..0b4ac6c5d4 100644 --- a/po/opencpn_nl_NL.po +++ b/po/opencpn_nl_NL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(naamloze track)" @@ -414,7 +414,7 @@ msgstr "SAR vliegtuig" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (laatst bekende)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Positie" @@ -509,11 +509,11 @@ msgstr "Rechts" msgid "Left" msgstr "Links" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Vaart" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Hoogte" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Windsnelheid" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Navigatiehulpmiddel" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Basis" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/u" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "De waypoints worden hernoemd om de natuurlijke volgorde weer te geven, d "Wilt u de waypoints hernoemen?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Over OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Wilt u routenummer 1 op het Garmin-apparaat overschrijven?" msgid "OpenCPN Message" msgstr "OpenCPN Bericht" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opties" @@ -2543,7 +2543,7 @@ msgstr "Geselecteerde track afdrukken" msgid "Track properties" msgstr "Trackeigenschappen" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "Plugin API:" msgid "OpenCPN Website" msgstr "OpenCPN Website" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN Help-documentatie is niet aanwezig op de computer." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Wilt u de opencpn.org website bezoeken voor meer informatie?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Intrekking - van gebied zoals genoemd in Message Linking ID " msgid "Undefined (default)" msgstr "niet gedefinieerd (standaard)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS objectnaam" @@ -3089,7 +3089,7 @@ msgstr "\n" "Een permanente track opname zal daarom opnieuw worden gestart voor dit doel.\n\n" "Wilt u in plaats daarvan de permanente tracking voor dit doel stoppen?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS Waarschuwing" @@ -3105,7 +3105,7 @@ msgstr "&Stop alarm" msgid "&Jump To" msgstr "&Spring naar" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Maak markeringspunt" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS objectenlijst" @@ -3217,38 +3217,38 @@ msgstr "Objectaantal" msgid "Undock Target List" msgstr "Loskoppelen verzendlijst" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Track opslaan" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "De track van dit object wordt bewaard.\n" "Wilt u doorgaan met opslaan tot OpenCPN afgesloten wordt?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS objectquery" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Stop volgen" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3302,7 +3302,7 @@ msgstr "Plaats schip hier" msgid "Navigate To Here" msgstr "Zet koers uit naar hier" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Koers-Boven presentatie" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Koers-Boven modus" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Noord-Boven presentatie" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Kaartoriëntatie-Boven presentatie" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Volledig scherm aan/uit" @@ -3346,7 +3346,7 @@ msgstr "Plak track" msgid "CM93 Offset Dialog..." msgstr "CM93 offsets..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Kaartgroepen" @@ -3464,7 +3464,7 @@ msgstr "Kopiëren als KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Verwijderen" @@ -3618,18 +3618,18 @@ msgstr "Verstuur Track(s) naar 2ᵉ OpenCPN" msgid "Chart Panel Options" msgstr "Weergaveopties Kaart" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigatiemodus" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Noord-Boven" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Koers-Boven" @@ -3637,32 +3637,32 @@ msgstr "Koers-Boven" msgid "Heading Up" msgstr "Koers-Boven" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Kijk-Vooruit presentatie" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Weergaveopties Eigen Schip" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Kaartsamenvoeging inschakelen" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Toon geografisch grid" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Toon kaartgrenzen" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Toon diepte-eenheid" @@ -3682,7 +3682,7 @@ msgstr "Getijden en stromingen" msgid "Show Tide stations" msgstr "Toon getij punten" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Toon getijstromen" @@ -3698,8 +3698,8 @@ msgstr "Toon tekst" msgid "Show depths" msgstr "Toon dieptes" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Boei- en lichtlabels" @@ -3707,8 +3707,8 @@ msgstr "Boei- en lichtlabels" msgid "Lights" msgstr "Lichten" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Toon vuureigenschappen" @@ -3724,18 +3724,18 @@ msgstr "Toon zichtbare sectorlichten" msgid "Show chart data quality" msgstr "Toon kwaliteit kaart data" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Weergavecategorie" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "standaard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "alles" @@ -3780,7 +3780,7 @@ msgstr "Als actieve catalogus gebruiken" msgid "Latest available catalog:" msgstr "Laatst beschikbare catalogus:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Kan gegevens niet downloaden van url" @@ -3835,8 +3835,8 @@ msgstr "Fout:" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Het antwoord 'Nee' resulteert in het maken van nieuwe markeringspunten v msgid "Merge waypoints?" msgstr "Markeringspunten samenvoegen?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Info routesegment bij aanwijzen" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile vereist dat OpenGL ingeschakeld wordt" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "voet" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "meter" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "vadem" @@ -4197,7 +4197,7 @@ msgstr "vadem" msgid "OverZoom" msgstr "OverZoom" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Uitgebreid getijpictogram" @@ -4213,7 +4213,7 @@ msgstr "AIS objectgegevens" msgid "Show all AIS Targets" msgstr "Toon alle AIS objecten" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Verklein minder kritische AIS objecten" @@ -4261,9 +4261,9 @@ msgstr "Gebruiker X offset" msgid "User Y Offset" msgstr "Gebruiker Y offset" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "meter" @@ -4274,11 +4274,13 @@ msgstr "Segment" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Consolelegenda" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Consolewaarde" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Naam" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Minder" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Wijzig geselecteerde verbinding" @@ -4637,12 +4639,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN Waarschuwing" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN info" @@ -4651,17 +4653,17 @@ msgstr "OpenCPN info" msgid "Sentence Filter" msgstr "Stringfilter" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Selecteer alles" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Wis alles" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Toevoegen" @@ -4692,59 +4694,59 @@ msgstr "Een NMEA-string is in het algemeen 3 tekens lang (RMC, GGA enz.). \n" msgid "REGEX syntax error: \n" msgstr "REGEX syntaxisfout: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Algemeen" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filter NMEA koers en snelheid" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Filter periode (sec)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Toon NMEA debugvenster" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Opmaak uploads voor Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Gebruik Garmin GRMN (Host) modus voor uploads" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Stel communicatie prioriteiten in" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Data verbindingen" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Verwijder verbinding" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Nieuwe verbinding configureren" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Installeren" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Herïnstalleer" @@ -4810,7 +4812,7 @@ msgstr "Herïnstalleer" msgid "Update" msgstr "Bijwerken" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Downgraden" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr " succesvol geïnstalleerd!" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "De installatie is voltooid" @@ -4848,6 +4850,21 @@ msgstr "De installatie is voltooid" msgid "Installation error" msgstr "Installatiefout" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Markeringen" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS-info bij aanwijzen" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "GridText" @@ -4860,7 +4877,7 @@ msgstr "Wacht op einde van compressie rasterkaart" msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN Gecomprimeerde cache bijwerken" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Afstand vanaf eigen schip: %4.0f NMi" @@ -4993,7 +5010,7 @@ msgstr "Dit markeringspunt is deel van een kaartlaag en kan niet worden gewijzig msgid "Icon" msgstr "Pictogram" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -5003,7 +5020,7 @@ msgid "Links" msgstr "Koppelingen" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5044,22 +5061,22 @@ msgstr "Afstandscirkels" msgid "Number" msgstr "Aantal" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Afstand" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Kleur" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Geen" @@ -5149,16 +5166,16 @@ msgstr "Toon alleen op schaal" msgid "Tide Station not found" msgstr "Getij station niet gevonden" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Schaal instellen" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Kaart schaal" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "vasthouden" @@ -5190,35 +5207,35 @@ msgstr "NMEA debugvenster" msgid "Cannot load route or waypoint file: " msgstr "Kan route- of waypointbestand niet laden: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Kon de gebruikersinterface niet initialiseren. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN kan niet starten." -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "De benodigde configuratiebestanden zijn niet gevonden. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Bekijk het logbestand op " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " voor details." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Portable(-p) uitvoeren vanaf " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Haal de initiele kaartmapset op uit het Windows register" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN Geïnitialiseerd in %ld ms." @@ -5273,8 +5290,8 @@ msgstr "Geschatte tijd:" msgid "Remaining time : " msgstr "Resterende tijd:" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN Kaartbijwerking" @@ -5282,277 +5299,277 @@ msgstr "OpenCPN Kaartbijwerking" msgid "Anchorage created " msgstr "Ankerpositie vastgelegd" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Toon werkbalk" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Verberg werkbalk" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "MAN OVERBOORD" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "op" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " op " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 NM langs GrK" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Tijdelijke MOB route" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Aangenomen 1 NM punt" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Tijd: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Positie: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Volgen uitschakelen" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Volgen inschakelen" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Automatische volgmodus" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Koers-Boven modus" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Inzoomen" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Uitzoomen" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Kaart, grotere schaal" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Kaart, kleinere schaal" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "OpenCPN afsluiten" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "Navigeren" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Toon kaartbalk" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Toon ENC-tekst" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Toon ENC lichten" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Toon ENC dieptes" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Toon ENC anker informatie" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Toon ENC gegevenskwaliteit" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Toon Navobjecten" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Toon getijhoogten" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Wijzig kleurenschema" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Weergave" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Toon AIS objecten" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Verberg afgemeerde AIS objecten" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Toon tracks van AIS objecten" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Toon CPA waarschuwings dialogen" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Speel CPA geluidsalarm af" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Toon CPA waarschuwingen" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Afstand meten" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Beheer route- en markeringen..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Maak route" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Markeer bij schip" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Markeer bij cursor" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Plaats MOB markeringspunt hier" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Voorkeuren" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Gereedschappen" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Venster" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN Help" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Help" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Start OpenCPN opnieuw om taal- of stijlveranderingen te activeren." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Schip " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Gedraaide modus" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Er was een afdrukprobleem.\n" "Is uw printer goed ingesteld?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(naamloze route)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS MAN OVERBOORD" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr " Eigen Schip" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Tijdelijke AIS-MOB route" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Toon eigen schip" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Eigen scheeps positie: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "MOB-positie:" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "AIS MAN OVERBOORD UPDATE" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Beheer routes, tracks en markeringspunten" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Afdrukken kaart" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Spatie)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN ENC voorbereiden" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC voltooid" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5560,105 +5577,105 @@ msgstr "Maak een persoonlijk configuratiesjabloon, gebaseerd op de huidige inste " Dit sjabloon wordt opgeslagen en kan op ieder moment worden geselecteerd voor verder gebruik.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Uitgebreide MMSI gegevens" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Volgen" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Standaard volgen" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Altijd volgen" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Nooit volgen" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Negeer deze MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Behandel deze MMSI als SART/PLB(AIS) MOB" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "AIVDM omzetten naar AIVDO voor deze MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Deze MMSI is mijn volger. Geen CPA-alarm." -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Een MMSI ID bestaat meestal uit 9 cijfers.\n" "Controleer uw invoer en annuleer deze indien nodig." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "standaard" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "altijd" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "nooit" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Bewerk MMSI-eigenschappen" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI Eigenschappen" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Volgmodus" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Negeren" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Scheepsnaam" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Volger" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Nieuw..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Toevoegen MMSI-eigenschappen" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5676,7 +5693,7 @@ msgstr "Het geselecteerde apparaat is niet bereikbaar; opencpn zal het waarschij " KERNEL == \"ttyS *\", MODE = \"0666\"\n" "< div class = \" notranslate \"> 8 Voor meer info, zie het bestand LINUX_DEVICES.md in de distributie-docs.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5696,1181 +5713,1176 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Voor meer informatie, zie het bestand LINUX_DEVICES.md in \"distribution docs\".\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Lengte GrK/Vgr-vector (tijdminuten): " -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Lengte koersvoorspeller (zeemijl):" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Type scheepspictogram:" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "'Real Scale Bitmap'" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "'Real Scale Vector'" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Lengte over alles (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Breedte over alles (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS-offset vanaf boeg (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS-offset vanaf middenlijn (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Minimum schermafmeting (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Toon afstandscirkels" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Interval tussen afstandscirkels" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Afstandseenheid voor cirkels:" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "zeemijl (NM of NMi)" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "kilometer" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Kleur afstandscirkels" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Toon richting actief waypoint" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Stijl" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "ononderbroken" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "punt" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "lange streep" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "korte streep" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "punt-streep" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "standaard kleur" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "zwart" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "donkerrood" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "donkergroen" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "donkergeel" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "donkerblauw" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "donkermagenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "donkercyaan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "lichtgrijs" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "donkergrijs" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "rood" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "groen" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "geel" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "blauw" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "cyaan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "wit" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Tracks" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatische dagelijkse tracks vanaf 00:00 uur" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatische dagelijkse tracks vanaf" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Computer" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Markeer tracks" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Kleur markeren" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Volgnauwkeurigheid:" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "laag" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "gemiddeld" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "hoog" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Bereken waarden" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Bereken SOG en COG vanuit opeenvolgende posities" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Aantal seconden tussen updates" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Routes/markeringspunten" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Nieuwe routes" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Actieve route" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Vervolg actieve route, automatisch activeren bij opstarten" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Standaard pictogram" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Straal van aankomstcirkel (in NM):" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Verschuif waypoint alleen bij aankomst" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Toon altijd, ongeacht andere kaartschaal-instellingen" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Kleur afstandscirkels" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Algemene Opties" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Bevestig verwijderen van tracks en routes" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Kaartbestanden" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Mappen" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Voeg map toe ..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Selectie weghalen" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Comprimeren van selectie" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Voeg toe..." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Verwijderen" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Comprimeer" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "verplaats kaarten.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Kaartmappen bijwerken" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Scan kaarten en werk database bij" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Forceer volledige herbouw van database" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Alle ENC-kaarten voorbereiden" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Gewijzigd]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Templates" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Template Status" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Laatst toegepaste template naam:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Opgeslagen Templates" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Configuratie aanmaken..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Geselecteerde configuratie verwijderen..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Geselecteerde configuratie toepassen" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Configuratie aanmaken" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Probleem met het toepassen van geselecteerde configuratie." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Uitgebreid" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Rechttrekken scheve rasterkaarten" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Hardwareversnelling inschakelen (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL-opties" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Gemiddelde tijd voor kaartrotatie" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "seconden" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Kaart zoom/schaal-weging" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vector" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 detailniveau" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Fysieke schermbreedte" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "handmatig" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Kaartweergave" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Toon scheve rasterkaarten Noord-Boven" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Met een lagere waarde toont bepaald zoomniveau een minder gedetailleerde kaart. \n" "Met een hogere waarde, toont hetzelfde zoomniveau een meer gedetailleerde kaart." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Afbeeldingen" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Kaartbalk" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Uitgebreide kaartbalk informatie tonen." -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vectorkaartweergave" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Nautische Standaard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Toon kaartdieptes" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Toon kaartinformatieobjecten" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Boeien en lichten" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Toon verlengde lichtsectoren" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Kaartteksten" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Nationale tekst op kaart" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Toon alleen belangrijke tekst" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Schoon tekst op" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Kaartdetail" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Reduceer detail bij kleine schaal" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafische stijl" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "papieren kaart" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "vereenvoudigd" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Grenzen" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "eenvoudig" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "gesymboliseerd" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Aantal kleuren voor diepteweergave" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 kleuren" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 kleuren" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Ondiep" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Veilige diepte" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Grote diepte" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Gebruikers voorkeur Objecten" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Terugzetten naar STANDAARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Getijhoogten en -stromen" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Actieve datasets" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Voeg dataset toe ..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Alle beschikbare kaarten" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Kaart weghalen" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Alle kaarten" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nieuwe groep ..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Groep verwijderen" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Behoud schaal wanneer kaart wordt gewisseld" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Besturingselementen" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Soepel pannen en zoomen" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom in op cursorpositie" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Weergavevoorzieningen" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Optie voor statusbalk" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "ETA bij cursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Kruissnelheid " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Schermindeling" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Status Balk" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Eenheden" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "statute mile" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "knopen" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Diepte" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatuur" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Geogr. Breedte/Lengte" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "graden, decimale minuten" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "graden, decimale graden" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "graden, minuten, seconden" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Peilingen" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Toon als waar" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Toon magnetisch" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Veronderstelde magnetische variatie" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "graden (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Windsnelheid" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Toon ware koersen en peilingen" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Toon magnetische koersen en peilingen." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Door WMM Plugin berekende magn. variatie" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Om de magn. variatie handmatig in te stellen,\n" " dient u de WMM PlugIn uit te schakelen." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Test" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "naam van geluidsbestand:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Selecteer geluidbestand" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Geluiden" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Anker Alarm" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Speel Anker Alarm geluid af." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Selecteer Anker Alarm Geluid" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "AIS waarschuwing laten horen." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Selecteer AIS waarschuwingsgeluid" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART waarschuwing" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "AIS waarschuwingsgeluid afspelen." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Selecteer AIS SART waarschuwingsgeluid" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC Waarschuwing" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Speel geluid af voor DSC-melding" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Selecteer DSC-meldingsgeluid" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Geluidsapparaat configuratie" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Onbekend apparaat :" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Invoerapparaat:" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Geluidsapparaat" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Audio Play commando:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS objecten" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA Berekening" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Geen CPA-waarschuwingen als objectafstand > (zeemijl)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Waarschuw als kortste naderingsafstand minder is dan (zeemijl): " -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr " ... en TCPA is minder dan (minuten):" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Verdwenen AIS objecten" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Markeer object als verdwenen na (minuten): " -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Verwijder verdwenen objecten na (minuten): " -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Weergaveopties" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Toon GrK/Vgr-vectoren met lengte van (tijdminuten):" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Synchroniseer de lengte van de AIS-pijl met de COG-voorspeller van het eigen schip" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Toon objecttracks met lengte van (tijdminuten):" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Verberg geankerde/afgemeerde AIS objecten, max. vaart (knopen)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Teken AIS realtime voorspelling, doel snelheid min (knopen)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Verkleinen minder kritische AIS objecten toestaan indien meer dan..." -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Toon gebiedsberichten (binaire AIS meldingen)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Toon AIS objecten in werkelijke grootte" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Toon namen bij AIS-objecten met een schaal > 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Gebruik WPL positieberichten. Actie bij ontvangen:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS positierapport" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Markeer" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Toon bij aanwijzen" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Route/AIS Infoblok inschakelen" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr " \"Scheepsnaam\" MMSI (roepnaam)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[klasse] type (status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "Vgr GrK" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA Waarschuwingen" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Toon CPA/TCPA waarschuwingsscherm" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Geluidsmelding bij CPA/TCPA waarschuwingen en DSC/SART noodberichten" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Test AIS waarschuwingsgeluid" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Onderdruk waarschuwingen voor geankerde en gemeerde objecten" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Inschakelen time-out voor CPA/TCPA waarschuwing na bevestiging (minuten):" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Opties Gebruikersinterface" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Taal" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Lettertypes" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Kies lettertype..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Kies letterkleur..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Voorbeeld" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Werkbalk- en Windowstijl" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Interfaceopties" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Toon statusbalk" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Toon menubalk" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Toon kompas- en GPS-statusvenster" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Verberg werkbalk na" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Glazen slaan" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Activeer touchscreen-interface" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Scaled Graphics interface inschakelen" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Toon de \"zoom\" knoppen" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Gebruik Inland ECDIS" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Binnenland ECDIS handleiding" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Schaalfactor gebruikersinterface" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Schaalfactor kaartobjecten" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Schaalfactor Eigen Schip" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC Dieptefactor" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC text grootte" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Muiswiel zoom gevoeligheid" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Toepassen" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Kaarten" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Verbindingen" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Verbinden" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Eigen Schip en\n" "AIS Objecten" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Gebruikersinterface" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Gebruiker" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Plugins" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Gebruikersinstelling magn. variatie" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "voet" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "vadem" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Voeg een map met kaartbestanden toe" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - de scheepslengte moet > 0 zijn" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - de scheepsbreedte moet > 0 zijn" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - de GPS-offset vanaf de middenlijn moet vallen binnen de scheepsbreedte" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - de GPS-offset vanaf de boeg moet vallen binnen de scheepslengte" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - de minimum grootte van het scheepspictogram moet zijn tussen 1 en 100mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "De instellingen voor de afmetingen van uw schip zijn niet juist:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "De binnenland ECDIS-handleiding is niet lokaal beschikbaar." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Wilt u de iECDIS-handleiding-website bezoeken voor meer informatie?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6880,15 +6892,15 @@ msgstr "Compressie verandert de kaartbestanden op de schijf.\n" "Het laden van gecomprimeerde kaarten kan op sommige systemen iets langer duren.\n" "De compressie kan ongedaan worden gemaakt met de programma's unxz of 7zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Kaartcompressie" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Geen kaarten gevonden om te comprimeren." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6897,71 +6909,71 @@ msgstr "%ld kaarten gecomprimeerd\n" "van %.1fMB naar %.1fMB\n" "%.1fMB vrijgekomen(%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Voer groepsnaam in" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Nieuwe kaartgroep" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Selecteer getijdenbestand" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Textuurcompressie" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Textuurcompressie met caching" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Textuurcompressie caching" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Textuur-geheugengrootte (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Grootte: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Textuurcache opnieuw maken" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Textuurcache opschonen" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Polygonen vloeiend maken" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Lijn vloeiend maken" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Software OpenGL (OpenCPN herstarten)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Gebruik versnelde planning" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Textuurinstellingen" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Textuurcache" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Diversen" @@ -7043,127 +7055,127 @@ msgstr "Controleer het systeemlogboek voor meer informatie." msgid " successfully installed from cache" msgstr "Succesvol geïnstalleerd vanuit cache" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Deze instellingen kunnen OpenCPN destabiliseren en zijn standaard uitgeschakeld. Om ze ondanks de risico's toch in te schakelen kunt u handmatig een CatalogExpert=1 regel toevoegen in de [PlugIns] sectie in het configuratiebestand." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Plugin catalogus" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Update Plugin Catalogus" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importeer plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Instellingen ..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Uitgeschakeld" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Update Plugin Catalogus:master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN kaart-update" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Kan dit bestand niet kopiëren" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Kan dit bestand niet kopiëren" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Bijwerken status geslaagd" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Selecteer tarball bestand" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Fout bij het uitpakken van metadata uit tar bestand." -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN Plugin import fout" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Niet-compatibele plug-in gedetecteerd." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Fout bij het uitpakken van de plug-in tarball." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Plug-in" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "Succesvol geïmporteerd" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Actieve catalogus" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Laatste catalogus" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Laatste wijziging:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Update Plug-in Catalogus." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "De-installeer" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Plug-in de-installeren" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "De-Installatie" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Ingeschakeld" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Upgrade naar versie " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Installeren..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Updaten naar" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Website" @@ -7208,10 +7220,6 @@ msgstr "Satellieten" msgid "OpenCPN Server Message" msgstr "OpenCPN Server Bericht" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS-info bij aanwijzen" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Getij-info bij aanwijzen" @@ -7329,12 +7337,6 @@ msgstr "Maak route van track" msgid "Send to &Peer" msgstr "Verstuur naar 2ᵉ OpenCPN" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Markeringen" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7538,15 +7540,15 @@ msgstr "maar huidige kaartschaal is" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Daarom zal het nieuwe waypoint niet zichtbaar op dit zoomniveau." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Waypoint(s) verzonden." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Fout bij laden van waypoints. Garmin GPS-ontvanger niet verbonden." -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Fout bij laden van waypoints. Raadpleeg logbestanden..." @@ -7851,11 +7853,11 @@ msgstr "(Sectorhoeken zijn ware richtingen vanaf zeezijde)< msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

De laatste opencpn start lijkt mislukt. Wil je\n" "in veilige modus opstarten zonder plugins en andere mogelijk problematische\n" "functies?\n" -"



U kunt overwegen de lijst met bekende problemente bezoeken.

" +"



U kunt overwegen de lijst met bekende problemente bezoeken.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7971,7 +7973,7 @@ msgstr "Vandaag" msgid "Tomorrow" msgstr "Morgen" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Tips" @@ -8261,153 +8263,156 @@ msgstr "Verplaats waypoint" msgid "Dismiss" msgstr "Afwijzen" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_pl_PL.po b/po/opencpn_pl_PL.po index 1245ccb28d..fc9c92b750 100644 --- a/po/opencpn_pl_PL.po +++ b/po/opencpn_pl_PL.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(ślad bez nazwy)" @@ -414,7 +414,7 @@ msgstr "Samolot SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Ostatni znany)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Pozycja" @@ -509,11 +509,11 @@ msgstr "prawo" msgid "Left" msgstr "lewo" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Prędkość" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Wysokość" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Znak nawigacyjny" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Baza" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "m/h" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2440,8 +2440,8 @@ msgstr "Punkty drogi zostaną zmienione w celu oddania ich naturalnej kolejnośc "Czy chcesz zmienić nazwę punktów drogi?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "O programie OpenCPN" @@ -2487,9 +2487,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "Wiadomość OpenCPN" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opcje" @@ -2531,7 +2531,7 @@ msgstr "Drukuj wybrane ślady" msgid "Track properties" msgstr "Właściwości śladu" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2544,12 +2544,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2647,23 +2647,23 @@ msgstr "Wtyczka API: " msgid "OpenCPN Website" msgstr "Strona internetowa OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Dokumentacja OpenCPN Help nie jest dostępna po polsku." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Chcesz odwiedzić stronę opencpn.org, gdzie uzyskasz więcej informacji (w języku angielskim)?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3063,7 +3063,7 @@ msgstr "Anulowanie - dotyczy obszaru określonego przez powiązaną wiadomość msgid "Undefined (default)" msgstr "Niezdefiniowany (domyślnie)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nazwa obiektu AIS" @@ -3074,7 +3074,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Alarm AIS" @@ -3090,7 +3090,7 @@ msgstr "&Wycisz alarm" msgid "&Jump To" msgstr "&Skocz do" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Utwórz punkt drogi" @@ -3113,7 +3113,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Lista obiektów AIS" @@ -3202,38 +3202,38 @@ msgstr "Liczba obiektów" msgid "Undock Target List" msgstr "Odepnij listę obiektów" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Zapisz ślad" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Niedawno przechwycona ścieżka tego obiektu została zapisana. \n" "Czy chcesz kontynuować nagrywanie do końca bieżącej sesji OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Dane obiektu AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Przerwij śledzenie" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3287,7 +3287,7 @@ msgstr "Przesuń statek tutaj" msgid "Navigate To Here" msgstr "Prowadź do tego miejsca" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Zorientowanie wg KDD" @@ -3296,8 +3296,8 @@ msgid "Heading Up Mode" msgstr "Zorientowanie wg KR" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Zorientowanie wg północy" @@ -3306,7 +3306,7 @@ msgid "Chart Up Mode" msgstr "Zorientowanie wg mapy" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Włącz/wyłącz pełny ekran" @@ -3331,7 +3331,7 @@ msgstr "Wklej ślad" msgid "CM93 Offset Dialog..." msgstr "Ustawienie przesunięcia CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Grupy map" @@ -3449,7 +3449,7 @@ msgstr "Kopiuj jako KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Usuń" @@ -3603,18 +3603,18 @@ msgstr "Wyślij ślad do równoległego OpenCPN" msgid "Chart Panel Options" msgstr "Panel opcji mapy" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Tryb nawigacji" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Wg północy" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "wg KDD" @@ -3622,32 +3622,32 @@ msgstr "wg KDD" msgid "Heading Up" msgstr "Wg KR" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Tryb patrzenia naprzód" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Opcje wyświetlania mapy" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Sklejaj mapy" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Pokaż siatkę" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Pokaż krawędzie map" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Pokaż jednostki głębokości" @@ -3667,7 +3667,7 @@ msgstr "Pływy i prądy" msgid "Show Tide stations" msgstr "Pokaż stacje pływowe" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Pokaż prądy" @@ -3683,8 +3683,8 @@ msgstr "Pokaż tekst" msgid "Show depths" msgstr "Pokaż głębokości" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Etykiety pław/świateł" @@ -3692,8 +3692,8 @@ msgstr "Etykiety pław/świateł" msgid "Lights" msgstr "Światła" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Pokaż charakterystyki świateł" @@ -3709,18 +3709,18 @@ msgstr "Pokaż widoczne sektory świateł" msgid "Show chart data quality" msgstr "Pokaż jakość danych mapy" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Wyświetlane kategorie " -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "wszystkie" @@ -3765,7 +3765,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Nie można pobrać danych z adresu URL" @@ -3820,8 +3820,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4153,28 +4153,28 @@ msgstr "Gdy odpowiesz \"nie\" - zostaną stworzone wszystkie nowe punkty drogi n msgid "Merge waypoints?" msgstr "Połączyć punkty drogi?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Info o odcinku drogi" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTiele do włączenia wymaga OpenGL" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Stopy" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metry" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Sążnie" @@ -4182,7 +4182,7 @@ msgstr "Sążnie" msgid "OverZoom" msgstr "Nadmierne powiększenie" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Rozszerzona Ikona Pływu" @@ -4198,7 +4198,7 @@ msgstr "Dane obiektu AIS" msgid "Show all AIS Targets" msgstr "Pokaż wszystkie obiekty AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Pomniejsz ikony niekrytycznych obiektów AIS" @@ -4246,9 +4246,9 @@ msgstr "Korekta X użytkownika" msgid "User Y Offset" msgstr "Korekta Y użytkownika" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metry" @@ -4259,11 +4259,13 @@ msgstr "Ten odcinek" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Konsola — opisy" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Konsola — wartości" @@ -4299,12 +4301,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Tytuł" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4333,7 +4335,7 @@ msgid "Less" msgstr "Mniej" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Edytuj wybrane połączenie" @@ -4622,12 +4624,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Ostrzeżenie OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Informacja OpenCPN" @@ -4636,17 +4638,17 @@ msgstr "Informacja OpenCPN" msgid "Sentence Filter" msgstr "Filtrowanie komunikatów" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Zaznacz wszystkie" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Odznacz wszystko" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Dodaj" @@ -4677,59 +4679,59 @@ msgstr "Ciag danych NMEA jest na ogół 3 znakowy (jak RMC, GGA itp.) \n" msgid "REGEX syntax error: \n" msgstr "Błąd składni REGEX: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "ustawienia ogólne" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filtruj dane NMEA dot. kursu i prędkości" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Okres filtrowania (s.)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Pokaż okno strumienia danych NMEA" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Do wysyłania danych użyj formatu Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Użyj protokołu GRMN/GRMN (Host) do przesyłania dróg i punktów do GPS" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Dostosuj priorytety komunikacji..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Łącza danych" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Usuń połączenie" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Konfigurowanie nowego połączenia" @@ -4787,7 +4789,7 @@ msgid "Install" msgstr "Instaluj" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Przeinstaluj" @@ -4795,7 +4797,7 @@ msgstr "Przeinstaluj" msgid "Update" msgstr "Uaktualnij" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Obniż wersję" @@ -4825,7 +4827,7 @@ msgid " successfully installed" msgstr " zainstalowano pomyślnie!" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Instalacja zakończona" @@ -4833,6 +4835,21 @@ msgstr "Instalacja zakończona" msgid "Installation error" msgstr "Błąd podczas instalacji" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Najazd na obiekt AIS" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4845,7 +4862,7 @@ msgstr "Oczekiwanie na zakończenie kompresji mapy rastrowej." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN - aktualizacja skompresowanego bufora" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Odległość od naszego statku: %4.0f Mm" @@ -4966,7 +4983,7 @@ msgstr "Ten punkt drogi jest częścią warstwy i nie może być edytowany" msgid "Icon" msgstr "Ikona" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Kombo!" @@ -4976,7 +4993,7 @@ msgid "Links" msgstr "Linki" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5017,22 +5034,22 @@ msgstr "Okręgi odległości" msgid "Number" msgstr "Liczba" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Odległość" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Kolor:" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Brak" @@ -5122,16 +5139,16 @@ msgstr "Pokaż tylko przy skali" msgid "Tide Station not found" msgstr "Nie znaleziono stacji pływowych" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Skala mapy" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Trwale" @@ -5163,35 +5180,35 @@ msgstr "Okno strumienia danych NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "Nie można uruchomić OpenCPN. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Nie znaleziono niezbędnych plików konfiguracyjnych. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5239,8 +5256,8 @@ msgstr "Szacowany czas:" msgid "Remaining time : " msgstr "Pozostały czas:" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "Aktualizacja zbioru map OpenCPN" @@ -5248,277 +5265,277 @@ msgstr "Aktualizacja zbioru map OpenCPN" msgid "Anchorage created " msgstr "Kotwicowisko utworzone " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Pokaż pasek narzędzi" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Ukryj pasek narzędzi" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "MOB - CZŁOWIEK ZA BURTĄ…" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1,0 Mm wzdłuż KDD" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Czas: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Pozycja: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Wyłącz ślad" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Włącz ślad" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Automatyczne podążanie " -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Zorientowanie wg KR" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Powiększ" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Pomniejsz" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Mapa w większej skali" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Mapa w mniejszej skali" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Zamknij OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Pokaż pasek map" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Pokaż napisy ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Pokaż światła (ENC)" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Pokaż głębokości (ENC)" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Pokaż inf. dot. kotwiczenia (ENC)" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Pokaż jakość danych ENC" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Pokaż obiekty nawigacyjne" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Pokaż pływy" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Zmień schemat kolorów" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "Widok" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Pokaż obiekty AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Ukryj zakotwiczone / zacumowane obiekty AIS" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Pokaż ślady obiektów AIS" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Pokaż okno dial. ostrzeżeń CPA" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Alarmy dźwiękowe CPA" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Pokaż ostrzeżenia CPA" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Pomiar odległości" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Zarządzanie drogami i punktami drogi..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Utwórz drogę" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Umieść znacznik w miejscu łodzi" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Umieść znacznik w miejscu kursora" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Postaw znak MOB tutaj" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Ustawienia" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "Narzędzia" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "Okno" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Pomoc programu" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "Pomoc" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Uruchom ponownie OpenCPN aby aktywować język i/lub styl." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "Statek" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Tryb obrócony" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Był problem z wydrukiem.\n" "Może wybrana drukarka nie jest właściwie ustawiona?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(droga bez nazwy)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS MOB" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Własny statek" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Tymczasowa droga do AIS MOB" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Pokaż własny statek" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Własna pozycja: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "Pozycja MOB:" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "Aktualizacja AIS MOB" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Zarządzanie drogami i punktami drogi" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Drukuj mapę" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Spacja)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN przygotowuje mapy ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "przygotowywanie ENC zakończone." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5526,105 +5543,105 @@ msgstr "Utwórz prywatny szablon konfiguracji na podstawie bieżących ustawień " Ten szablon zostanie zapisany i może zostać użyty w dowolnym momencie.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Zaawansowane właściwości MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Zapisywanie śladu" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Ślad domyślny" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Zawsze ślad" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "bez śladu" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignoruj ten MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Traktuj ten MMSI jako SART / PLB (AIS) MOB" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Przekształć AIVDM w AIVDO dla tego MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Ten MMSI podąża za/przede mną - nie alarmuj o CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Numer MMSI powinien być dziewięciocyfrowy. \n" " Skontroluj wpis i popraw." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Domyślny" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Zawsze" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Nigdy" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Edytuj właściwości MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Właściwości MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Tryb śladu" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignoruj" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM-> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nazwa statku" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Podąża " -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Nowy..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Dodaj właściwości MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5643,7 +5660,7 @@ msgstr "Wybrane urządzenie nie jest dostępne; OpenCPN prawdopodobnie nie będz " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Aby uzyskać więcej informacji, zobacz plik LINUX_DEVICES.md w dokumentaci dystrybucji.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5664,1180 +5681,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Aby uzyskać więcej informacji, zobacz plik LINUX_DEVICES.md w dokumentaci dystrybucji.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Długość wektora przewidywanego KDD (min.):" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Długość wektora KR (Mm)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Sposób zobrazowania statku" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Rzeczywista skala, obraz bitmapowy" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Rzeczywista skala, obraz wektorowy" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Długość LOA (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Szerokość (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "wzdłużne przesunięcie anteny GPS od dziobu [m]" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "poprzeczne przesunięcie anteny GPS od śródokręcia [m]" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Minimalny rozmiar ekranu (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Pokaż okręgi odległości" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Odległość między okręgami" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Jednostka odległości" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Mile morskie" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometry" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Kolor okręgu odległości" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Pokaż kierunek dla aktywnego punktu drogi" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Styl" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Ciągła" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Kropkowa" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Kreskowa (długie)" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Kreskowa (krótkie)" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Kropka - kreska" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Kolor domyślny" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "czarny" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "ciemnoczerwony" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "ciemnozielony" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "ciemnożółty" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "ciemnoniebieski" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "ciemnopurpurowy" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "ciemny cyjan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "jasnoszary" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "ciemnoszary" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "czerwony" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "zielony" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "żółty" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "niebieski" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "purpurowy" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "cyjanowy" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "biały" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Ślady" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatyczny ślad dobowy od północy" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatyczny ślad dobowy od" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Komputer" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Wyróżniaj ślady" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Kolor podświetlenia" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Szczegółowość śladu" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "niska" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "średnia" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "wysoka" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Przeliczanie wartości" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Przelicz SOG i KDD ze zmieniającej się pozycji" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Min. ilość sekund między aktualizacjami" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Trasy / Punkty" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Nowa droga" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Domyślna ikona punktu drogi" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Promień okręgu \"zaliczenia\" punktu drogi (Mm)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "\"Zalicz\" punkt trasy tylko po przejściu" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Zastąp ustawienia widoczności zależne od skali mapy i pokaż wszystkie" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Kolor okręgów punktu drogi" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Opcje sterowania" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Potwierdź usunięcie śladów i dróg" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Pliki map" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Katalogi" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Dodaj katalog..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Usuń wybrane" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Kompresuj wybrane" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Dodaj.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Usuń" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Skompresuj" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Przenieś mapy." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Kontrola aktualizacji katalogu" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Przejrzyj mapy i zaktualizuj bazę danych" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Wymuś całkowitą przebudowę bazy danych" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Przygotuj wszystkie mapy ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Zmieniony]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Szablony" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Stan szablonów" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Ostatni wybrany szablon:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Zapisane szablony" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Tworzenie pliku konfiguracyjnego..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Usuń wybraną konfigurację..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Zastosuj wybraną konfigurację" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Utwórz konfigurację" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Wystąpił problem z wybraną konfiguracją." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Opcje zaawansowane" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Wyprostuj mapy rastrowe" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Użyj przyspieszonej Grafiki (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Ustawienia OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Średni czas obrotu mapy" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "sek." -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Proporcje powiększenia/skali mapy" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Rastrowe" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Wektorowe" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "Poziom szczegółów CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Rzeczywista szerokość ekranu" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Automatyczne" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Ręcznie:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Wyświetlanie map" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Na skośnych mapach rastrowych N zawsze na górze" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Przy niższej wartości (przy tym samym powiększeniu) pokazuje mniej szczegółów mapy, \n" " przy wyższej (i tym samym powiększeniu) - więcej." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafika" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Mapy wektorowe" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Standard morski" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Pokaż głębokości" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Informacje o znaku" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Pławy/światła" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Rozszerzające się sektory świateł" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Napisy na mapie" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Napisy w języku producenta map" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Tylko istotne teksty" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Usuwaj nakładające się napisy" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Szczegółowość map" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Zmniejszenie ilości szczegółów w małej skali" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Style grafiki" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Mapa papierowa" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Uproszczone" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Granice obszarów" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Uproszczone" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Symbolizowane" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Kolory" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 kolory" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 kolory" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "izobata spłycenia" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "izobata bezpieczeństwa" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "izobata większej głębokości" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Obiekty standardu uzytkownika" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Przywróć standardowe" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Pływy i prądy" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Aktywne zestawy danych" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Dodaj zestaw danych..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Wszystkie dostępne mapy" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Usuń mapę" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Mapy" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nowa grupa..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Usuń grupę" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Zachowaj skalę przy zmianie map" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Ustawienia" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Płynne przesuwanie/powiększanie" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "&Zoom" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Parametry wyświetlania" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Opcje paska statusu" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Bieżąca ETA pod kursorem" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Domyślna prędkość jednostki" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Układ widoku" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Pasek statusu" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Jednostki" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Mile angielskie" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "węzły" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "mile/h" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Głębokość" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatura" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "° Celsjusza" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "° Fahrenheita" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelwinów" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "φ / λ" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Stopnie, minuty i ich dziesiętne" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Stopnie i ich dziesiętne" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Stopnie, minuty, sekundy" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Namiary" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Pokaż rzeczywiste" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Pokaż magnetyczny" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Zakładana deklinacja magnetyczna" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "stopni (-W, + E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Pokaż namiary i kursy rzeczywiste" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Pokaż namiary i kursy magnetyczne." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Wtyczka WMM oblicza deklinację magnetyczną" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Aby ustawić deklinację magnetyczną ręcznie, \n" " należy wyłączyć wtyczkę WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Test" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Nazwa pliku audio:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Wybierz sygnał alarmu dźwiękowego" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Dźwięki" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Alarm kotwiczny" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Odtwarzaj dźwięk alarmu kotwicznego." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Wybierz dźwięk alarmu kotwicznego" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Odtwarzaj dźwięk alertu AIS." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Wybierz dźwięk alertu AIS" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "Alert AIS-SART" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Odtwarzaj dźwięk alertu AIS-SART." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Wybierz dźwięk alertu AIS-SART" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "Alert DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Odtwarzaj dźwięk alertu DSC." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Wybierz dźwięk alertu DSC" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Nieznane urządzenie: " -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Urządzenie wejściowe" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Urządzenie dźwiękowe" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Odtwarzaj polecenia audio:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Obiekty AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Obliczenie CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Nie alarmuj o (T)CPA jeżeli obiekt jest dalej niż (Mm)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Ostrzegaj jeżeli CPA jest mniejsze niż (Mm):" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr " ...oraz TCPA jest mniejszy niż (minut):" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Utracone obiekty" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Oznacz obiekty jako zgubione po (min):" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Usuń stracone obiekty po (min):" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Ekran" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Pokaż przewidywane wektory KDD (min) " -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Synchronizuj długość wektora AIS z prognozą wektora KDD" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Pokaż ślady obiektów, długość (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Ukryj obiekty zakotwiczone / zacumowane, prędkość max (w.)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Narysuj przewidywanie AIS w czasie rzeczywistym, min prędkość obiektu (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Pozwól pomniejszać ikony obiektów AIS, gdy jest ich więcej niż..." -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Pokaż akweny z powiadomień (z binarnych komunikatów AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Pokaż prawdziwą wielkość obiektów AIS" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Pokaż nazwy obiektów AIS gdy skala jest większa niż 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Użyj komunikatów o pozycji WPL. Akcja po odebraniu:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Raport pozycji APRS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Utwórz znacznik" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Najazd myszką " -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Włącz blok informacji o trasie/AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr " \"Nazwa jedn.\" MMSI (Sygn. wywoł.)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Klasa] Typ (Status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG KDD" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA/TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Alarm CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Pokaż ustawienia alarmów CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Odtwarzaj dźwięk przy alarmie CPA/TCPA" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Wyłącz alarmy dla zakotwiczonych / zacumowanych obiektów" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Włącz automatyczne potwierdzanie po (min.)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Opcje GUI" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Język" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Czcionki" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Wybierz czcionkę ..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Wybierz czcionkę ..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Przykład" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Styl pasków narzędzi i okien" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Opcje interfejsu" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Pokaż pasek statusu" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Pokaż pasek menu" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Pokaż kompas / status GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Autoukrywanie paska narzędzi po" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Wybijaj szklanki" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Włącz obsługę ekranu dotykowego" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Włącz skalowalny interfejs graficzny" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Pokaż przyciski powiększenia" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Wielkość interfejsu użytkownika" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Wielkość obiektów mapy wektorowej" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Wielkość jednostek" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "wielkość cyfr sondowań ENC" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "Skala tekstu ENC" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Czułość kółka myszy" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Zastosuj" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Mapy" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Połączenia" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Połączenia" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Statki" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Interfejs użytkownika" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Użytkownik" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Wtyczki" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Użytkownik ustawia deklinację magnetyczną" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "stopy" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "sążnie" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Dodaj katalog zawierający pliki map" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - długość statku musi być > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - szerokość statku musi być > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - odsunięcie GPS od śródokręcia nie może być większe niż połowa szerokości statku" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - odsunięcie GPS od dziobu nie może być większe niż długość statku" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - minimalna ikonka statku musi mieć od 1 do 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Ustawiona wielkość twojego statku jest niepoprawna:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6847,15 +6859,15 @@ msgstr "Skompresowane zostaną starsze pliki map.\n" "Skompresowane mapy mogą ładować się wolniej w niektórych systemach.\n" "Pliki można zdekompresować za pocą programów unxz czy 7-zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Kompresja map OpenCPN" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Brak map do skompresowania." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6864,71 +6876,71 @@ msgstr "skompresowano %ld map\n" "z %.1fMB do %.1fMB\n" "zaoszczędzono %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Podaj nazwę grupy" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Nowa grupa map" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Wybierz źródło danych o pływach" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Kompresja tekstury" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Kompresja tekstury z buforowaniem" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Buforowanie kompresji tekstury" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Pamięć tekstur (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Rozmiar: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Przebudowa bufora tekstury" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Czyszczenie bufora tekstury" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Wygładzanie wielokątów" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Wygładzanie linii" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Oprogramowanie OpenGL (ponownie uruchom OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Przyspieszone przesuwanie" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Ustawienia tekstury" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Bufor tekstury" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Różne" @@ -7010,127 +7022,127 @@ msgstr "Proszę sprawdzić dziennik systemowy, aby uzyskać więcej informacji." msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Te ustawienia mogą zdestabilizować OpenCPN i są domyślnie wyłączone. Aby mimo zagrożeń włączyć je - ręcznie dodaj linię CatalogExpert=1 w sekcji [PlugIns] w pliku konfiguracyjnym." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Katalog wtyczek" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Aktualizuj katalog wtyczek" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importuj wtyczkę..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Ustawienia..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Wyłączony" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "Aktualizacja katalogu OpenCPN" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Nie można skopiować pliku katalogu" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Nie można skopiować pliku katalogu do pamięci podręcznej" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Katalog zaktualizowany pomyślnie" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Błąd importu wtyczki OpenCPN" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktywny katalog" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Ostatni katalog" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Ostatnia zmiana:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Proszę zaktualizować katalog wtyczek." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Odinstaluj" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Włączone" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Uaktualnij do wersji " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Instaluję..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Aktualizacja do" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Strona internetowa" @@ -7175,10 +7187,6 @@ msgstr "Satelity" msgid "OpenCPN Server Message" msgstr "Wiadomość serwera OpenCPN" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Najazd na obiekt AIS" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Info o prądach i pływach" @@ -7296,12 +7304,6 @@ msgstr "Droga ze śladu" msgid "Send to &Peer" msgstr "Wyślij do równoległego oCPN" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7505,15 +7507,15 @@ msgstr "a bieżąca skala mapy wynosi" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Dlatego nowe punkty drogi nie będą widoczne przy obecnej skali." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Punkt(y) drogi wysłany(e)" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Błąd w przesyłaniu punktu drogi. GPS Garmin nie podłączony." -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Błąd w przesyłaniu punktu. Sprawdź pliki dziennika..." @@ -7818,7 +7820,7 @@ msgstr " (sektory kątowe są namiarami rzeczywistymi od strony mo msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7934,7 +7936,7 @@ msgstr "Dziś" msgid "Tomorrow" msgstr "Jutro" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Etykiety narzędzi" @@ -8216,153 +8218,156 @@ msgstr "Przesuń punkt drogi" msgid "Dismiss" msgstr "Odrzuć" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_pt_BR.po b/po/opencpn_pt_BR.po index 5a2d6c9699..388f789f01 100644 --- a/po/opencpn_pt_BR.po +++ b/po/opencpn_pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-08 09:37-0400\n" -"PO-Revision-Date: 2024-06-09 01:20\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 20:51\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -17,287 +17,287 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3023 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Acompanhamento sem Nome)" #: model/include/model/track.h:136 msgid "(Unknown Date)" -msgstr "" +msgstr "Data desconhecida" -#: model/src/ais_decoder.cpp:932 +#: model/src/ais_decoder.cpp:934 msgid "Vessel, type unknown" -msgstr "" +msgstr "Tipo de Navio desconhecido" -#: model/src/ais_decoder.cpp:933 +#: model/src/ais_decoder.cpp:935 msgid "Freightbarge" -msgstr "" +msgstr "Barcaça de Frete" -#: model/src/ais_decoder.cpp:934 +#: model/src/ais_decoder.cpp:936 msgid "Tankbarge" -msgstr "" +msgstr "BarcaçaTanque" -#: model/src/ais_decoder.cpp:935 +#: model/src/ais_decoder.cpp:937 msgid "Tankbarge, dry cargo as if liquid (e.g. cement)" -msgstr "" +msgstr "BarcaçaTanque, carga seca como líquido (por exemplo, cimento)" -#: model/src/ais_decoder.cpp:936 +#: model/src/ais_decoder.cpp:938 msgid "Service vessel, police patrol, port service" -msgstr "" +msgstr "Navio de serviço, patrulha da polícia, serviço de porto" -#: model/src/ais_decoder.cpp:937 model/src/ais_decoder.cpp:991 +#: model/src/ais_decoder.cpp:939 model/src/ais_decoder.cpp:993 msgid "Pushboat, single" -msgstr "" +msgstr "Barco-Suspenso, único" -#: model/src/ais_decoder.cpp:938 +#: model/src/ais_decoder.cpp:940 msgid "Object, not otherwise specified" -msgstr "" +msgstr "Objeto, não especificado" -#: model/src/ais_decoder.cpp:939 +#: model/src/ais_decoder.cpp:941 msgid "Object, towed, not otherwise specified" -msgstr "" +msgstr "Objeto, rebocado, não especificado" -#: model/src/ais_decoder.cpp:940 +#: model/src/ais_decoder.cpp:942 msgid "Bunkership" -msgstr "" +msgstr "NavioCarvoeiro" -#: model/src/ais_decoder.cpp:941 +#: model/src/ais_decoder.cpp:943 msgid "Motor freighter" -msgstr "" +msgstr "Cargueiro a motor" -#: model/src/ais_decoder.cpp:942 +#: model/src/ais_decoder.cpp:944 msgid "Motor tanker" -msgstr "" +msgstr "Tanque a motor" -#: model/src/ais_decoder.cpp:943 +#: model/src/ais_decoder.cpp:945 msgid "Motor tanker, liquid cargo, type N" -msgstr "" +msgstr "Tanque a motor, carga líquida, tipo N" -#: model/src/ais_decoder.cpp:944 +#: model/src/ais_decoder.cpp:946 msgid "Motor tanker, liquid cargo, type C" -msgstr "" +msgstr "Tanque a motor, carga líquida, tipo C" -#: model/src/ais_decoder.cpp:945 +#: model/src/ais_decoder.cpp:947 msgid "Motor tanker, dry cargo as if liquid (e.g. cement)" -msgstr "" +msgstr "Tanque a Motor, carga secar como líquido (por exemplo, cimento)" -#: model/src/ais_decoder.cpp:946 +#: model/src/ais_decoder.cpp:948 msgid "Container vessel" -msgstr "" +msgstr "Navio Container" -#: model/src/ais_decoder.cpp:947 +#: model/src/ais_decoder.cpp:949 msgid "Gas tanker" -msgstr "" +msgstr "Tanque de gás" -#: model/src/ais_decoder.cpp:948 +#: model/src/ais_decoder.cpp:950 msgid "Motor freighter, tug" -msgstr "" +msgstr "Cargueiro a motor, rebocador" -#: model/src/ais_decoder.cpp:949 +#: model/src/ais_decoder.cpp:951 msgid "Motor tanker, tug" -msgstr "" +msgstr "Tanque a Motor, rebocador" -#: model/src/ais_decoder.cpp:950 +#: model/src/ais_decoder.cpp:952 msgid "Motor freighter with one or more ships alongside" -msgstr "" +msgstr "Cargueiro a motor com um ou mais navios ao lado" -#: model/src/ais_decoder.cpp:951 +#: model/src/ais_decoder.cpp:953 msgid "Motor freighter with tanker" -msgstr "" +msgstr "Cargueiro a Motor com tanque" -#: model/src/ais_decoder.cpp:952 +#: model/src/ais_decoder.cpp:954 msgid "Motor freighter pushing one or more freighters" -msgstr "" +msgstr "Cargueiro a motor empurrando um ou mais cargueiros" -#: model/src/ais_decoder.cpp:953 +#: model/src/ais_decoder.cpp:955 msgid "Motor freighter pushing at least one tank-ship" -msgstr "" +msgstr "Cargueiro a motor empurrando pelo menos um navio-tanque" -#: model/src/ais_decoder.cpp:954 +#: model/src/ais_decoder.cpp:956 msgid "Tug, freighter" -msgstr "" +msgstr "Rebocador, cargueiro" -#: model/src/ais_decoder.cpp:955 +#: model/src/ais_decoder.cpp:957 msgid "Tug, tanker" -msgstr "" +msgstr "Rebocador, tanque" -#: model/src/ais_decoder.cpp:956 +#: model/src/ais_decoder.cpp:958 msgid "Tug freighter, coupled" -msgstr "" +msgstr "Rebocador, cargueiro/petroleiro, acoplados" -#: model/src/ais_decoder.cpp:957 +#: model/src/ais_decoder.cpp:959 msgid "Tug, freighter/tanker, coupled" -msgstr "" +msgstr "Rebocador, cargueiro/petroleiro, acoplados" -#: model/src/ais_decoder.cpp:958 +#: model/src/ais_decoder.cpp:960 msgid "Tankbarge, liquid cargo, type N" -msgstr "" +msgstr "BarcaçaTanque, carga líquida, tipo N" -#: model/src/ais_decoder.cpp:959 +#: model/src/ais_decoder.cpp:961 msgid "Tankbarge, liquid cargo, type C" -msgstr "" +msgstr "BarcaçaTanque, carga líquida, tipo C" -#: model/src/ais_decoder.cpp:960 +#: model/src/ais_decoder.cpp:962 msgid "Freightbarge with containers" -msgstr "" +msgstr "BarcaçadeFrete com conteiners" -#: model/src/ais_decoder.cpp:961 +#: model/src/ais_decoder.cpp:963 msgid "Tankbarge, gas" -msgstr "" +msgstr "BarcaçaTanque, gás" -#: model/src/ais_decoder.cpp:962 +#: model/src/ais_decoder.cpp:964 msgid "Pushtow, one cargo barge" -msgstr "" +msgstr "RebocadorEmpurrando, uma barca de carga" -#: model/src/ais_decoder.cpp:963 +#: model/src/ais_decoder.cpp:965 msgid "Pushtow, two cargo barges" -msgstr "" +msgstr "RebocadorEmpurrando, duas barcaças de carga" -#: model/src/ais_decoder.cpp:964 +#: model/src/ais_decoder.cpp:966 msgid "Pushtow, three cargo barges" -msgstr "" +msgstr "RebocadorEmpurrando, três barcaças de carga" -#: model/src/ais_decoder.cpp:965 +#: model/src/ais_decoder.cpp:967 msgid "Pushtow, four cargo barges" -msgstr "" +msgstr "RebocadorEmpurrando, quatro barcaças de carga" -#: model/src/ais_decoder.cpp:966 +#: model/src/ais_decoder.cpp:968 msgid "Pushtow, five cargo barges" -msgstr "" +msgstr "RebocadorEmpurrando, cinco barcaças de carga" -#: model/src/ais_decoder.cpp:967 +#: model/src/ais_decoder.cpp:969 msgid "Pushtow, six cargo barges" -msgstr "" +msgstr "RebocadorEmpurrando, seis barcaças de carga" -#: model/src/ais_decoder.cpp:968 +#: model/src/ais_decoder.cpp:970 msgid "Pushtow, seven cargo barges" -msgstr "" +msgstr "RebocadorEmpurrando, sete barcaças de carga" -#: model/src/ais_decoder.cpp:969 +#: model/src/ais_decoder.cpp:971 msgid "Pushtow, eight cargo barges" -msgstr "" +msgstr "RebocadorEmpurrando, oito barcaças de carga" -#: model/src/ais_decoder.cpp:970 +#: model/src/ais_decoder.cpp:972 msgid "Pushtow, nine or more barges" -msgstr "" +msgstr "RebocadorEmpurrando, nove ou mais barcaças" -#: model/src/ais_decoder.cpp:971 +#: model/src/ais_decoder.cpp:973 msgid "Pushtow, one tank/gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, barcaça de um tanque/gás" -#: model/src/ais_decoder.cpp:973 +#: model/src/ais_decoder.cpp:975 msgid "Pushtow, two barges at least one tanker or gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, duas barcaças pelo menos um tanque ou barcaça de gás" -#: model/src/ais_decoder.cpp:975 +#: model/src/ais_decoder.cpp:977 msgid "Pushtow, three barges at least one tanker or gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, tres barcaças pelo menos um tanque ou barcaça de gás" -#: model/src/ais_decoder.cpp:977 +#: model/src/ais_decoder.cpp:979 msgid "Pushtow, four barges at least one tanker or gas barge" msgstr "" -#: model/src/ais_decoder.cpp:979 +#: model/src/ais_decoder.cpp:981 msgid "Pushtow, five barges at least one tanker or gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, cinco barcaças pelo menos um tanque ou barcaça de gás" -#: model/src/ais_decoder.cpp:981 +#: model/src/ais_decoder.cpp:983 msgid "Pushtow, six barges at least one tanker or gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, seis barcaças pelo menos um tanque ou barcaça de gás" -#: model/src/ais_decoder.cpp:983 +#: model/src/ais_decoder.cpp:985 msgid "Pushtow, seven barges at least one tanker or gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, sete barcaças pelo menos um tanque ou barcaça de gás" -#: model/src/ais_decoder.cpp:985 +#: model/src/ais_decoder.cpp:987 msgid "Pushtow, eight barges at least one tanker or gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, oito barcaças pelo menos um tanque ou barcaça de gás" -#: model/src/ais_decoder.cpp:987 +#: model/src/ais_decoder.cpp:989 msgid "Pushtow, nine or more barges at least one tanker or gas barge" -msgstr "" +msgstr "RebocadorEmpurrando, nove ou mais barcaças pelo menos um tanque ou barcaça de gás" -#: model/src/ais_decoder.cpp:988 +#: model/src/ais_decoder.cpp:990 msgid "Tug, single" -msgstr "" +msgstr "Rebocador, único" -#: model/src/ais_decoder.cpp:989 +#: model/src/ais_decoder.cpp:991 msgid "Tug, one or more tows" -msgstr "" +msgstr "Rebocador, um ou mais reboques" -#: model/src/ais_decoder.cpp:990 +#: model/src/ais_decoder.cpp:992 msgid "Tug, assisting a vessel or linked combination" -msgstr "" +msgstr "Rebocador, ajudando uma embarcação ou combinação vinculada" -#: model/src/ais_decoder.cpp:992 +#: model/src/ais_decoder.cpp:994 msgid "Passenger ship, ferry, cruise ship, red cross ship" -msgstr "" +msgstr "Navio de passageiros, balsa, navio de cruzeiro, Cruz Vermelha" -#: model/src/ais_decoder.cpp:993 +#: model/src/ais_decoder.cpp:995 msgid "Ferry" -msgstr "" +msgstr "Balsa" -#: model/src/ais_decoder.cpp:994 +#: model/src/ais_decoder.cpp:996 msgid "Red cross ship" -msgstr "" +msgstr "Navio da Cruz Vermelha" -#: model/src/ais_decoder.cpp:995 +#: model/src/ais_decoder.cpp:997 msgid "Cruise ship" -msgstr "" +msgstr "Navio de cruzeiro" -#: model/src/ais_decoder.cpp:996 +#: model/src/ais_decoder.cpp:998 msgid "Passenger ship without accommodation" -msgstr "" +msgstr "Navio de passageiros sem acomodações" -#: model/src/ais_decoder.cpp:997 +#: model/src/ais_decoder.cpp:999 msgid "Vessel, work maintenance craft, floating derrick, cable-ship, buoy-ship, dredge" -msgstr "" +msgstr "Navio, trabalho de manutenção de embarcações, torre flutuante, navio-cabo, navio-boia, draga de flutuação" -#: model/src/ais_decoder.cpp:999 +#: model/src/ais_decoder.cpp:1001 msgid "Fishing boat" -msgstr "" +msgstr "Barco de pesca" -#: model/src/ais_decoder.cpp:1000 +#: model/src/ais_decoder.cpp:1002 msgid "Barge, tanker, chemical" -msgstr "" +msgstr "Barcaça, navio-tanque, químico" -#: model/src/ais_decoder.cpp:1001 +#: model/src/ais_decoder.cpp:1003 msgid "General cargo Vessel maritime" -msgstr "" +msgstr "Navio geral de carga" -#: model/src/ais_decoder.cpp:1002 +#: model/src/ais_decoder.cpp:1004 msgid "Unit carrier maritime" -msgstr "" +msgstr "Portador da unidade marítima" -#: model/src/ais_decoder.cpp:1003 +#: model/src/ais_decoder.cpp:1005 msgid "Bulk carrier maritime" -msgstr "" +msgstr "Graneleiro marítimo" -#: model/src/ais_decoder.cpp:1004 model/src/ais_target_data.cpp:1988 +#: model/src/ais_decoder.cpp:1006 model/src/ais_target_data.cpp:1988 msgid "Tanker" msgstr "Navio-tanque" -#: model/src/ais_decoder.cpp:1005 +#: model/src/ais_decoder.cpp:1007 msgid "Liquified gas tanker" -msgstr "" +msgstr "Tanque de gás liquefeito" -#: model/src/ais_decoder.cpp:1006 +#: model/src/ais_decoder.cpp:1008 msgid "Pleasure craft, longer than 20 metres" -msgstr "" +msgstr "Embarcações de recreio, mais de 20 metros" -#: model/src/ais_decoder.cpp:1007 +#: model/src/ais_decoder.cpp:1009 msgid "Fast ship" -msgstr "" +msgstr "Navio rápido" -#: model/src/ais_decoder.cpp:1008 +#: model/src/ais_decoder.cpp:1010 msgid "Hydrofoil" -msgstr "" +msgstr "Hidrofoil" -#: model/src/ais_decoder.cpp:2118 +#: model/src/ais_decoder.cpp:2120 #, c-format msgid "%02X" -msgstr "" +msgstr "%02X" #: model/src/ais_target_data.cpp:90 msgid "Underway using Engine" @@ -392,15 +392,15 @@ msgstr "AtoN Real (fora de Posição)" #: model/src/ais_target_data.cpp:120 msgid "steady" -msgstr "" +msgstr "estável" #: model/src/ais_target_data.cpp:122 msgid "decreasing" -msgstr "" +msgstr "diminuindo" #: model/src/ais_target_data.cpp:124 msgid "increasing" -msgstr "" +msgstr "aumentando" #: model/src/ais_target_data.cpp:483 model/src/ais_target_data.cpp:1081 #: gui/src/OCPNListCtrl.cpp:121 @@ -414,7 +414,7 @@ msgstr "Aeronave SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -463,7 +463,7 @@ msgstr "" #: model/src/ais_target_data.cpp:660 msgid "by:" -msgstr "" +msgstr "por:" #: model/src/ais_target_data.cpp:664 msgid "Nature of distress: " @@ -476,7 +476,7 @@ msgstr " (Último conhecido)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posição" @@ -486,7 +486,7 @@ msgstr "Relatório de período" #: model/src/ais_target_data.cpp:702 msgid "Issued (UTC)" -msgstr "" +msgstr "Transmitido (UTC)" #: model/src/ais_target_data.cpp:721 msgid "Report as of" @@ -509,10 +509,11 @@ msgstr "Direita" msgid "Left" msgstr "Esquerda" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Velocidade" @@ -544,7 +545,7 @@ msgid "in " msgstr "em " #: model/src/ais_target_data.cpp:866 model/src/ais_target_data.cpp:1170 -#: gui/src/AISTargetListDialog.cpp:640 gui/src/chcanv.cpp:6608 +#: gui/src/AISTargetListDialog.cpp:640 gui/src/chcanv.cpp:6611 msgid "CPA" msgstr "PMA" @@ -565,74 +566,74 @@ msgid "Altitude" msgstr "Altitude" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" -msgstr "" +msgstr "Velocidade do vento" #: model/src/ais_target_data.cpp:907 msgid "Wind gust" -msgstr "" +msgstr "Rajadas de vento" #: model/src/ais_target_data.cpp:913 model/src/ais_target_data.cpp:1185 msgid "Water level deviation" -msgstr "" +msgstr "Desvio do nível de água" #: model/src/ais_target_data.cpp:920 msgid "Water level dev. Ref: " -msgstr "" +msgstr "Nível de água dev. Ref: " #: model/src/ais_target_data.cpp:930 model/src/ais_target_data.cpp:1193 msgid "Water level" -msgstr "" +msgstr "Nível de Água" #: model/src/ais_target_data.cpp:940 msgid "Surface current " -msgstr "" +msgstr "Corrente da superfície " #: model/src/ais_target_data.cpp:950 model/src/ais_target_data.cpp:957 #: model/src/ais_target_data.cpp:1211 msgid "s" -msgstr "" +msgstr "s" #: model/src/ais_target_data.cpp:960 msgid "Waves height & period" -msgstr "" +msgstr "Onda altura & período" #: model/src/ais_target_data.cpp:962 msgid "Swell height & period " -msgstr "" +msgstr "Altura e período do Swell " #: model/src/ais_target_data.cpp:979 msgid "Air Temperatur" -msgstr "" +msgstr "Temperatura do ar" #: model/src/ais_target_data.cpp:980 msgid "Air pressure" -msgstr "" +msgstr "Pressão atmosférica" #: model/src/ais_target_data.cpp:994 msgid "Relative Humidity" -msgstr "" +msgstr "Umidade relativa" #: model/src/ais_target_data.cpp:996 msgid "Dew Point " -msgstr "" +msgstr "Ponto de orvalho" #: model/src/ais_target_data.cpp:1010 msgid "Water Temperatur" -msgstr "" +msgstr "Temperatura da água" #: model/src/ais_target_data.cpp:1011 msgid "Sea state" -msgstr "" +msgstr "Estado do Mar" #: model/src/ais_target_data.cpp:1026 msgid "Precipitation" -msgstr "" +msgstr "Precipitação" #: model/src/ais_target_data.cpp:1028 msgid "Horizontal Visibility" -msgstr "" +msgstr "Visibilidade Horizontal" #: model/src/ais_target_data.cpp:1037 gui/src/OCPNListCtrl.cpp:88 msgid "No" @@ -644,11 +645,11 @@ msgstr "Sim" #: model/src/ais_target_data.cpp:1041 msgid "Sea salinity" -msgstr "" +msgstr "Salinidade do mar" #: model/src/ais_target_data.cpp:1043 msgid "Ice status" -msgstr "" +msgstr "Status do gelo" #: model/src/ais_target_data.cpp:1161 model/src/ais_target_data.cpp:1165 msgid " COG Unavailable" @@ -669,27 +670,27 @@ msgstr "Corrente" #: model/src/ais_target_data.cpp:1202 model/src/navutil_base.cpp:320 #: model/src/navutil_base.cpp:343 msgid "kts" -msgstr "" +msgstr "nós" #: model/src/ais_target_data.cpp:1209 msgid "Wave height" -msgstr "" +msgstr "Altura da onda" #: model/src/ais_target_data.cpp:1217 msgid "Water temp" -msgstr "" +msgstr "Temperatura da água" #: model/src/ais_target_data.cpp:1225 msgid "Air temp" -msgstr "" +msgstr "Temperatura do ar" #: model/src/ais_target_data.cpp:1232 msgid "Air press" -msgstr "" +msgstr "Pressão atmosférica" #: model/src/ais_target_data.cpp:1242 msgid "Visibility" -msgstr "" +msgstr "Visibilidade" #: model/src/ais_target_data.cpp:1330 msgid "A" @@ -708,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Auxílio a Navegação" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -755,11 +756,11 @@ msgstr "Relatório de Posição APRS" #: model/src/ais_target_data.cpp:1351 msgid "METEO" -msgstr "" +msgstr "METEO" #: model/src/ais_target_data.cpp:1351 msgid "Meteorologic" -msgstr "" +msgstr "Meteorológico" #: model/src/ais_target_data.cpp:1354 msgid "Unk" @@ -767,31 +768,31 @@ msgstr "Desc." #: model/src/ais_target_data.cpp:1360 msgid "Fire, explosion" -msgstr "" +msgstr "Fogo/Explosão" #: model/src/ais_target_data.cpp:1360 msgid "Flooding" -msgstr "" +msgstr "Inundação" #: model/src/ais_target_data.cpp:1361 msgid "Collision" -msgstr "" +msgstr "Colisão" #: model/src/ais_target_data.cpp:1361 msgid "Grounding" -msgstr "" +msgstr "Aterramento" #: model/src/ais_target_data.cpp:1362 msgid "Listing, in danger of capsizing" -msgstr "" +msgstr "Listando, perigo de virar" #: model/src/ais_target_data.cpp:1362 msgid "Sinking" -msgstr "" +msgstr "Afundando" #: model/src/ais_target_data.cpp:1363 msgid "Disabled and adrift" -msgstr "" +msgstr "Desabilitado e a deriva" #: model/src/ais_target_data.cpp:1363 msgid "Undesignated distress" @@ -799,19 +800,19 @@ msgstr "" #: model/src/ais_target_data.cpp:1364 msgid "Abandoning ship" -msgstr "" +msgstr "Navio abandonado" #: model/src/ais_target_data.cpp:1364 msgid "Piracy/armed robbery attack" -msgstr "" +msgstr "Ataque à mão armada/pirata" #: model/src/ais_target_data.cpp:1365 msgid "Man overboard" -msgstr "" +msgstr "Homem ao mar" #: model/src/ais_target_data.cpp:1365 msgid "EPIRB emission" -msgstr "" +msgstr "EPIRB emissão" #: model/src/ais_target_data.cpp:1418 msgid "Albania" @@ -2126,73 +2127,73 @@ msgstr "Ltv/Rig" #: model/src/comm_n0183_output.cpp:288 msgid "Connecting to " -msgstr "" +msgstr "Conectando a " #: model/src/comm_n0183_output.cpp:308 msgid "Connected to " -msgstr "" +msgstr "Conectado a" #: model/src/conn_params.cpp:171 gui/src/connection_edit.cpp:273 #: gui/src/conn_params_panel.cpp:220 gui/src/conn_params_panel.cpp:728 msgid "Serial" -msgstr "" +msgstr "Serial" #: model/src/conn_params.cpp:173 gui/src/connection_edit.cpp:278 #: gui/src/conn_params_panel.cpp:312 gui/src/conn_params_panel.cpp:765 msgid "Network" -msgstr "" +msgstr "Rede" #: model/src/conn_params.cpp:175 msgid "GPS" -msgstr "" +msgstr "GPS" #: model/src/conn_params.cpp:177 msgid "BT" -msgstr "" +msgstr "BT" #: model/src/conn_params.cpp:189 msgid "Internal" -msgstr "" +msgstr "Interno" #: model/src/conn_params.cpp:200 gui/src/connection_edit.cpp:351 msgid "TCP" -msgstr "" +msgstr "TCP" #: model/src/conn_params.cpp:202 gui/src/connection_edit.cpp:358 msgid "UDP" -msgstr "" +msgstr "UDP" #: model/src/conn_params.cpp:204 gui/src/connection_edit.cpp:364 msgid "GPSD" -msgstr "" +msgstr "GPSD" #: model/src/conn_params.cpp:206 gui/src/connection_edit.cpp:370 msgid "Signal K" -msgstr "" +msgstr "Sinal K" #: model/src/conn_params.cpp:229 msgid "Input" -msgstr "" +msgstr "Entrada" #: model/src/conn_params.cpp:231 msgid "Output" -msgstr "" +msgstr "Saída" #: model/src/conn_params.cpp:233 msgid "In/Out" -msgstr "" +msgstr "Entrada/Saída" #: model/src/conn_params.cpp:240 msgid "Reject" -msgstr "" +msgstr "Rejeitar" #: model/src/conn_params.cpp:242 msgid "Accept" -msgstr "" +msgstr "Aceitar" #: model/src/conn_params.cpp:245 msgid "Drop" -msgstr "" +msgstr "Largar" #: model/src/conn_params.cpp:247 gui/src/SendToGpsDlg.cpp:207 #: gui/src/SendToPeerDlg.cpp:285 @@ -2201,24 +2202,25 @@ msgstr "Enviar" #: model/src/conn_params.cpp:264 msgid "In" -msgstr "" +msgstr "Em" #: model/src/conn_params.cpp:270 msgid "In: None" -msgstr "" +msgstr "Em: nenhum" #: model/src/conn_params.cpp:274 msgid "Out" -msgstr "" +msgstr "Fora" #: model/src/conn_params.cpp:280 msgid ", Out: None" -msgstr "" +msgstr ", Fora: nenhum" #: model/src/instance_handler.cpp:162 gui/src/ocpn_app.cpp:1044 msgid "Sorry, an existing instance of OpenCPN may be too busy to respond.\n" "Please retry." -msgstr "" +msgstr "Desculpe, uma instância existente do OpenCPN pode estar muito ocupada para responder.\n" +"Por favor, tente novamente." #: model/src/navutil_base.cpp:264 msgid "C" @@ -2238,7 +2240,7 @@ msgstr "MN" #: model/src/navutil_base.cpp:287 msgid "mi" -msgstr "" +msgstr "mi" #: model/src/navutil_base.cpp:290 gui/src/MarkInfo.cpp:612 msgid "km" @@ -2246,51 +2248,54 @@ msgstr "km" #: model/src/navutil_base.cpp:293 model/src/navutil_base.cpp:483 msgid "m" -msgstr "" +msgstr "m" #: model/src/navutil_base.cpp:296 model/src/navutil_base.cpp:480 msgid "ft" -msgstr "" +msgstr "Pés" #: model/src/navutil_base.cpp:299 model/src/navutil_base.cpp:486 msgid "fa" -msgstr "" +msgstr "fa" #: model/src/navutil_base.cpp:305 msgid "cm" -msgstr "" +msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" -msgstr "" +msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" #: model/src/navutil_base.cpp:657 msgid "H " -msgstr "" +msgstr "H " #: model/src/navutil_base.cpp:658 msgid "M" -msgstr "" +msgstr "M" #: model/src/navutil_base.cpp:660 msgid "M " -msgstr "" +msgstr "M " #: model/src/navutil_base.cpp:661 msgid "S" -msgstr "" +msgstr "S" #: model/src/navutil_base.cpp:672 gui/src/RoutePropDlgImpl.cpp:355 #: gui/src/RoutePropDlgImpl.cpp:360 @@ -2303,7 +2308,10 @@ msgid "\n" "PlugIn %s, version %i.%i was detected.\n" "This version is known to be unstable and will not be loaded.\n" "Please update this PlugIn using the PlugIn manager master catalog.\n" -msgstr "" +msgstr "\n" +"PlugIn %s, versão %i.%i foi detectado.\n" +" esta versão é conhecida por ser instável e não será carregado. \n" +" por favor atualize este PlugIn usando o Plugin gerenciador master de catálogo;\n" #: model/src/plugin_blacklist.cpp:68 #, c-format @@ -2311,7 +2319,10 @@ msgid "\n" "PlugIn %s, version %i.%i was detected.\n" "This version is known to be unstable.\n" "Please update this PlugIn using the PlugIn manager master catalog.\n" -msgstr "" +msgstr "\n" +"PlugIn %s, versão %i.%i foi detectada.\n" +"Esta versão é conhecida por ser instável.\n" +"Por favor, atualize este PlugIn usando o catálogo mestre do Plugin.\n" #: model/src/plugin_blacklist.cpp:74 #, c-format @@ -2320,16 +2331,18 @@ msgid "\n" "This plugin is obsolete, the o-charts plugin should be used\n" "instead. Please uninstall this plugin and install o-charts\n" "using the PlugIn manager master catalog.\n" -msgstr "" +msgstr "\n" +"PlugIn %s, versão %i.%i foi detectada.\n" +"Esse plugin é obsoleto, o plugin dos gráficos deve ser usado em vez disso. Por favor, desinstale este plugin e instale os gráficos\\usando o catálogo mestre do gerenciador de Plugin.\n" #: model/src/plugin_blacklist.cpp:251 #, c-format msgid "Plugin library %s can not be loaded" -msgstr "" +msgstr "Biblioteca de plugins %s não pode ser carregada" #: model/src/plugin_loader.cpp:168 msgid " [Imported]" -msgstr "" +msgstr " [Importado]" #: model/src/plugin_loader.cpp:170 msgid " [Orphan]" @@ -2338,67 +2351,68 @@ msgstr "" #: model/src/plugin_loader.cpp:1454 msgid "\n" " Install/uninstall plugin or remove file to mute message" -msgstr "" +msgstr "\n" +" Instalar/desinstalar plugin ou remover arquivo para silenciar mensagem" #: model/src/plugin_loader.cpp:1457 msgid " PluginLoader: Cannot load symbol create_pi: " -msgstr "" +msgstr " PluginLoader: Não é possível carregar símbolo create_pi: " #: model/src/plugin_loader.cpp:1581 msgid "Incompatible plugin detected: " -msgstr "" +msgstr "PlugIn incompatível detectado: " #: model/src/plugin_loader.cpp:1582 msgid " API Version detected: " -msgstr "" +msgstr " Versão da API detectada: " #: model/src/plugin_loader.cpp:1584 msgid " PlugIn Version detected: " -msgstr "" +msgstr " Versão do PlugIn detectada: " #: model/src/rest_server.cpp:368 msgid "No error" -msgstr "" +msgstr "Nenhum erro" #: model/src/rest_server.cpp:370 msgid "Server Generic Error" -msgstr "" +msgstr "Erro Genérico do Servidor" #: model/src/rest_server.cpp:372 msgid "Peer rejected object" -msgstr "" +msgstr "Objeto rejeitado por pares" #: model/src/rest_server.cpp:374 msgid "Peer rejected duplicate object" -msgstr "" +msgstr "Ponto rejeitado objeto duplicado " #: model/src/rest_server.cpp:376 msgid "Peer internal error (insert)" -msgstr "" +msgstr "Erro interno dos pares (insert)" #: model/src/rest_server.cpp:378 msgid "Peer requests new pincode" -msgstr "" +msgstr "O Par solicita um novo pincode" #: model/src/rest_server.cpp:380 msgid "XML parse error" -msgstr "" +msgstr "XML parse error" #: model/src/rest_server.cpp:382 msgid "Unspecified error" -msgstr "" +msgstr "Erro não especificado" #: model/src/rest_server.cpp:518 msgid "wants to send you new data." -msgstr "" +msgstr "quer enviar novos dados para você." #: model/src/rest_server.cpp:519 msgid "Please enter the following PIN number on " -msgstr "" +msgstr "Por favor, digite o seguinte PIN no " #: model/src/rest_server.cpp:520 msgid "to pair with this device" -msgstr "" +msgstr "parear com este dispositivo" #: model/src/rest_server.cpp:646 msgid "The received route already exists on this system.\n" @@ -2408,7 +2422,7 @@ msgstr "" #: model/src/rest_server.cpp:647 model/src/rest_server.cpp:689 #: model/src/rest_server.cpp:730 msgid "Always replace objects?" -msgstr "" +msgstr "Sempre substituir objetos?" #: model/src/rest_server.cpp:688 msgid "The received track already exists on this system.\n" @@ -2433,8 +2447,8 @@ msgstr "Waypoints serão renomeados para refletir a ordem natural, os nomes ser "Deseja renomear os Waypoints?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3594 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Sobre OpenCPN" @@ -2453,7 +2467,7 @@ msgstr "OpenCPN AIS alerta" #: gui/include/gui/AISTargetQueryDialog.h:46 #: gui/include/gui/AISTargetQueryDialog.h:57 gui/include/gui/S57QueryDialog.h:42 #: gui/include/gui/S57QueryDialog.h:51 gui/src/canvasMenu.cpp:475 -#: gui/src/canvasMenu.cpp:484 gui/src/chcanv.cpp:9746 +#: gui/src/canvasMenu.cpp:484 gui/src/chcanv.cpp:9750 msgid "Object Query" msgstr "Interrogar Objeto" @@ -2467,7 +2481,7 @@ msgid "Link Properties" msgstr "Propriedades da Marca" #: gui/include/gui/MarkInfo.h:100 gui/include/gui/MarkInfo.h:361 -#: gui/src/chcanv.cpp:9904 gui/src/routemanagerdialog.cpp:2689 +#: gui/src/chcanv.cpp:9908 gui/src/routemanagerdialog.cpp:2689 #: gui/src/RoutePropDlgImpl.cpp:927 msgid "Waypoint Properties" msgstr "Propriedades do waypoint" @@ -2480,9 +2494,9 @@ msgstr "Substituir o itinerário do dispositivo Garmin número 1?" msgid "OpenCPN Message" msgstr "OpenCPN Mensagem" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3584 -#: gui/src/ocpn_frame.cpp:3862 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opções" @@ -2501,7 +2515,7 @@ msgid "Print Route Selection" msgstr "Imprimir rota selecionada" #: gui/include/gui/RoutePropDlg.h:174 gui/include/gui/RoutePropDlgImpl.h:97 -#: gui/src/canvasMenu.cpp:1893 gui/src/chcanv.cpp:7761 +#: gui/src/canvasMenu.cpp:1893 gui/src/chcanv.cpp:7765 #: gui/src/RoutePropDlgImpl.cpp:514 msgid "Route Properties" msgstr "Propriedades da rota" @@ -2513,7 +2527,7 @@ msgstr "Informação extra do objeto" #: gui/include/gui/SendToPeerDlg.h:61 gui/src/routemanagerdialog.cpp:497 msgid "Send to Peer" -msgstr "" +msgstr "Enviar para Par" #: gui/include/gui/trackprintout.h:78 gui/src/trackprintout.cpp:275 msgid "Print Track Selection" @@ -2524,21 +2538,25 @@ msgstr "Imprimir seleção de rota" msgid "Track properties" msgstr "Propriedades da faixa" +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 +msgid "OpenCPN Initial Configuration" +msgstr "OpenCPN configuração inicial" + #: gui/src/about.cpp:224 gui/src/about.cpp:268 gui/src/about.cpp:402 #: gui/src/about.cpp:520 gui/src/AISTargetListDialog.cpp:325 -#: gui/src/CanvasOptions.cpp:73 gui/src/chcanv.cpp:11990 -#: gui/src/chcanv.cpp:12023 gui/src/ChInfoWin.cpp:53 gui/src/cm93.cpp:6239 +#: gui/src/CanvasOptions.cpp:73 gui/src/chcanv.cpp:11994 +#: gui/src/chcanv.cpp:12027 gui/src/ChInfoWin.cpp:53 gui/src/cm93.cpp:6239 #: gui/src/concanv.cpp:103 gui/src/connection_edit.cpp:247 #: gui/src/conn_params_panel.cpp:86 gui/src/conn_params_panel.cpp:144 #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2636,23 +2654,23 @@ msgstr "API de Plugin: " msgid "OpenCPN Website" msgstr "Site OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Documentação de ajuda do OpenCPN não está disponível localmente." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Gostaria de visitar o site opencpn.org para obter mais informações?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:604 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3052,7 +3070,7 @@ msgstr "Cancelamento - área de cancelar, conforme identificado pelo ID da mensa msgid "Undefined (default)" msgstr "S&ublinhado" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nome do Alvo AIS" @@ -3063,7 +3081,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Alerta de AIS" @@ -3079,7 +3097,7 @@ msgstr "& Silêncio alerta" msgid "&Jump To" msgstr "&Saltar para" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Criar Ponto da Derrota" @@ -3102,7 +3120,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3548 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Lista dos Alvos AIS" @@ -3191,38 +3209,38 @@ msgstr "Contagem de alvos" msgid "Undock Target List" msgstr "Lista de Alvos Desancorados" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Registro de rota" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "A faixa recentemente capturada deste alvo foi gravada.\n" " Você quer continuar a gravação até o final da sessão atual do OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "InterrogaçãoAlvoAIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Parar rastreamento" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3276,7 +3294,7 @@ msgstr "Mover o Barco Aqui" msgid "Navigate To Here" msgstr "Navegue até aqui" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3443 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Modo Curso Acima" @@ -3285,8 +3303,8 @@ msgid "Heading Up Mode" msgstr "Modo Rumo Acima" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3156 gui/src/ocpn_frame.cpp:3442 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Modo Norte Acima" @@ -3295,7 +3313,7 @@ msgid "Chart Up Mode" msgstr "Modo Carta Acima" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Alternar Tela Cheia" @@ -3320,7 +3338,7 @@ msgstr "Colar Faixa" msgid "CM93 Offset Dialog..." msgstr "CM93 Deslocamento diálogo..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Grupo de cartas" @@ -3377,9 +3395,9 @@ msgstr "Ocultar" msgid "Show" msgstr "Mostrar" -#: gui/src/canvasMenu.cpp:698 gui/src/chcanv.cpp:6603 +#: gui/src/canvasMenu.cpp:698 gui/src/chcanv.cpp:6606 msgid "CPA alarm " -msgstr "" +msgstr "CPA alarme" #: gui/src/canvasMenu.cpp:706 msgid "Unnamed Route" @@ -3413,7 +3431,7 @@ msgstr "Desativar" msgid "Activate" msgstr "Ativar" -#: gui/src/canvasMenu.cpp:732 gui/src/chcanv.cpp:3780 gui/src/chcanv.cpp:10752 +#: gui/src/canvasMenu.cpp:732 gui/src/chcanv.cpp:3780 gui/src/chcanv.cpp:10756 #: gui/src/concanv.cpp:142 gui/src/concanv.cpp:157 gui/src/concanv.cpp:196 msgid "Route" msgstr "Rota" @@ -3438,7 +3456,7 @@ msgstr "Copiar como KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Apagar" @@ -3493,11 +3511,11 @@ msgstr "Dividir Rota no Waypoint" #: gui/src/canvasMenu.cpp:898 msgid "Unnamed Mark" -msgstr "" +msgstr "Marca sem nome" #: gui/src/canvasMenu.cpp:910 msgid "Mark" -msgstr "" +msgstr "Marca" #: gui/src/canvasMenu.cpp:915 msgid "Navigate To This" @@ -3570,11 +3588,11 @@ msgstr "_B" #: gui/src/canvasMenu.cpp:1766 msgid "Send Waypoint to OpenCPN Peer" -msgstr "" +msgstr "Enviar Waypoint para OpenCPN Peer" #: gui/src/canvasMenu.cpp:1817 msgid "Send Route to OpenCPN Peer" -msgstr "" +msgstr "Enviar rota para OpenCPN Peer" #: gui/src/canvasMenu.cpp:1907 msgid "Are you sure you want to delete this track?" @@ -3586,24 +3604,24 @@ msgstr "OpenCPN Apagar Acompanhamento" #: gui/src/canvasMenu.cpp:1956 msgid "Send Track to OpenCPN Peer" -msgstr "" +msgstr "Enviar rota para OpenCPN Peer" #: gui/src/CanvasOptions.cpp:111 msgid "Chart Panel Options" msgstr "Opções do Painel de Carta" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Modo de navegação" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Norte acima" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Rumo acima" @@ -3611,32 +3629,32 @@ msgstr "Rumo acima" msgid "Heading Up" msgstr "Rumo acima" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Modo Olhar adiante" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Opções de Apresentação da Carta" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Habilitar Emenda de Cartas" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Mostrar grade" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3469 -#: gui/src/ocpn_frame.cpp:3475 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Mostrar Contorno das Cartas" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Mostrar Unidade de Profundidade" @@ -3656,7 +3674,7 @@ msgstr "Marés e Correntes" msgid "Show Tide stations" msgstr "Mostrar estações de marés" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3511 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Mostrar Correntes" @@ -3672,8 +3690,8 @@ msgstr "Mostrar textos" msgid "Show depths" msgstr "Mostrar profundidades" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Legendas de bóias e Faróis" @@ -3681,8 +3699,8 @@ msgstr "Legendas de bóias e Faróis" msgid "Lights" msgstr "Luzes" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Mostrar descrição dos Faróis" @@ -3696,20 +3714,20 @@ msgstr "Mostrar luzes do setor visível" #: gui/src/CanvasOptions.cpp:314 msgid "Show chart data quality" -msgstr "" +msgstr "Mostrar qualidade de dados da carta" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Categoria da Apresentação" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Padrão" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Todos" @@ -3754,7 +3772,7 @@ msgstr "Usar como catálogo ativo" msgid "Latest available catalog:" msgstr "Último catálogo disponível:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Não é possível baixar dados da url" @@ -3809,8 +3827,8 @@ msgstr "Falhou: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -3952,7 +3970,7 @@ msgstr "Aviso de Grupo OpenCPN" msgid "\" is empty, switching to \"All Active Charts\" group." msgstr "\" está vazio, mudando para o grupo \"Todos as cartas ativas\"." -#: gui/src/chcanv.cpp:3782 gui/src/chcanv.cpp:10754 +#: gui/src/chcanv.cpp:3782 gui/src/chcanv.cpp:10758 msgid "Layer Route: " msgstr "Camada de Rota: " @@ -3996,207 +4014,210 @@ msgstr "Faixa Total: " msgid "Segment Created: " msgstr "Segmento Criado: " -#: gui/src/chcanv.cpp:5449 gui/src/ocpn_frame.cpp:2118 -#: gui/src/ocpn_frame.cpp:2141 gui/src/OCPNPlatform.cpp:1722 +#: gui/src/chcanv.cpp:5449 gui/src/ocpn_frame.cpp:2116 +#: gui/src/ocpn_frame.cpp:2139 gui/src/OCPNPlatform.cpp:1722 msgid "StatusBar" msgstr "Barra de Status" -#: gui/src/chcanv.cpp:6596 +#: gui/src/chcanv.cpp:6599 msgid "ON" msgstr "" -#: gui/src/chcanv.cpp:6599 +#: gui/src/chcanv.cpp:6602 msgid "OFF" msgstr "" -#: gui/src/chcanv.cpp:6607 +#: gui/src/chcanv.cpp:6610 msgid "CPA Alarm is switched" -msgstr "" +msgstr "Alarme CPA alterado" -#: gui/src/chcanv.cpp:6774 +#: gui/src/chcanv.cpp:6778 msgid "Composite of " -msgstr "" +msgstr "Composto de " -#: gui/src/chcanv.cpp:6779 +#: gui/src/chcanv.cpp:6783 msgid "charts" -msgstr "" +msgstr "cartas" -#: gui/src/chcanv.cpp:6781 +#: gui/src/chcanv.cpp:6785 msgid "chart" -msgstr "" +msgstr "carta" -#: gui/src/chcanv.cpp:6785 +#: gui/src/chcanv.cpp:6789 msgid "Chart scale" -msgstr "" +msgstr "Escala da Carta" -#: gui/src/chcanv.cpp:6792 +#: gui/src/chcanv.cpp:6796 msgid "Zoom in for more information" -msgstr "" +msgstr "Zoom para obter mais informações" -#: gui/src/chcanv.cpp:7853 gui/src/chcanv.cpp:8426 +#: gui/src/chcanv.cpp:7857 gui/src/chcanv.cpp:8430 msgid "Use nearby waypoint?" msgstr "Usar Ponto da Derrota mais próximo?" -#: gui/src/chcanv.cpp:7853 gui/src/chcanv.cpp:7891 gui/src/chcanv.cpp:7912 -#: gui/src/chcanv.cpp:7974 gui/src/chcanv.cpp:8426 gui/src/chcanv.cpp:8464 -#: gui/src/chcanv.cpp:8484 gui/src/chcanv.cpp:8542 gui/src/chcanv.cpp:8936 -#: gui/src/chcanv.cpp:8954 gui/src/chcanv.cpp:9196 gui/src/chcanv.cpp:9214 +#: gui/src/chcanv.cpp:7857 gui/src/chcanv.cpp:7895 gui/src/chcanv.cpp:7916 +#: gui/src/chcanv.cpp:7978 gui/src/chcanv.cpp:8430 gui/src/chcanv.cpp:8468 +#: gui/src/chcanv.cpp:8488 gui/src/chcanv.cpp:8546 gui/src/chcanv.cpp:8940 +#: gui/src/chcanv.cpp:8958 gui/src/chcanv.cpp:9200 gui/src/chcanv.cpp:9218 msgid "OpenCPN Route Create" msgstr "OpenCPN Criar rota" -#: gui/src/chcanv.cpp:7883 gui/src/chcanv.cpp:8456 +#: gui/src/chcanv.cpp:7887 gui/src/chcanv.cpp:8460 msgid "Insert first part of this route in the new route?" msgstr "Inserir primeira parte desta rota na nova rota?" -#: gui/src/chcanv.cpp:7887 gui/src/chcanv.cpp:8460 +#: gui/src/chcanv.cpp:7891 gui/src/chcanv.cpp:8464 msgid "Insert this route in the new route?" msgstr "Inserir esta rota no nova rota?" -#: gui/src/chcanv.cpp:7902 gui/src/chcanv.cpp:8475 +#: gui/src/chcanv.cpp:7906 gui/src/chcanv.cpp:8479 msgid "Append last part of this route to the new route?" msgstr "Acrescentar a última parte desta rota à nova rota?" -#: gui/src/chcanv.cpp:7905 gui/src/chcanv.cpp:8478 +#: gui/src/chcanv.cpp:7909 gui/src/chcanv.cpp:8482 msgid "Append this route to the new route?" msgstr "Inserir esta rota no nova rota?" -#: gui/src/chcanv.cpp:7964 gui/src/chcanv.cpp:8534 +#: gui/src/chcanv.cpp:7968 gui/src/chcanv.cpp:8538 msgid "For this leg the Great Circle route is " msgstr "Para esta etapa, a rota Grande Círculo é " -#: gui/src/chcanv.cpp:7966 gui/src/chcanv.cpp:8536 +#: gui/src/chcanv.cpp:7970 gui/src/chcanv.cpp:8540 msgid " shorter than rhumbline.\n\n" msgstr " menor que a Derrota Loxodrômica.\n\n" -#: gui/src/chcanv.cpp:7967 gui/src/chcanv.cpp:8537 +#: gui/src/chcanv.cpp:7971 gui/src/chcanv.cpp:8541 msgid "Would you like include the Great Circle routing points for this leg?" msgstr "Gostaria de incluir os pontos da derrota Ortodrômica para esta pernada?" -#: gui/src/chcanv.cpp:8902 gui/src/chcanv.cpp:9163 +#: gui/src/chcanv.cpp:8906 gui/src/chcanv.cpp:9167 msgid "Replace this RoutePoint by the nearby Waypoint?" msgstr "Substituir este Ponta da Rota pelo Waypoint próximo?" -#: gui/src/chcanv.cpp:8904 gui/src/chcanv.cpp:9165 +#: gui/src/chcanv.cpp:8908 gui/src/chcanv.cpp:9169 msgid "OpenCPN RoutePoint change" msgstr "OpenCPN mudança do Ponto da Rota" -#: gui/src/chcanv.cpp:8929 gui/src/chcanv.cpp:9189 +#: gui/src/chcanv.cpp:8933 gui/src/chcanv.cpp:9193 msgid "Last part of route to be appended to dragged route?" msgstr "Anexar última parte da rota à rota arrastada?" -#: gui/src/chcanv.cpp:8933 gui/src/chcanv.cpp:9193 +#: gui/src/chcanv.cpp:8937 gui/src/chcanv.cpp:9197 msgid "Full route to be appended to dragged route?" msgstr "Anear a Rota Toda a rota arrastada?" -#: gui/src/chcanv.cpp:8947 gui/src/chcanv.cpp:9207 +#: gui/src/chcanv.cpp:8951 gui/src/chcanv.cpp:9211 msgid "First part of route to be inserted into dragged route?" msgstr "Inserir Primeira parte da rota na rota arrastada?" -#: gui/src/chcanv.cpp:8951 gui/src/chcanv.cpp:9211 +#: gui/src/chcanv.cpp:8955 gui/src/chcanv.cpp:9215 msgid "Full route to be inserted into dragged route?" msgstr "Anexar a Rota Toda a rota arrastada?" -#: gui/src/chcanv.cpp:8967 gui/src/chcanv.cpp:9227 +#: gui/src/chcanv.cpp:8971 gui/src/chcanv.cpp:9231 msgid "Do you really want to delete and replace this WayPoint" msgstr "Você realmente deseja excluir e substituir este WayPoint" -#: gui/src/chcanv.cpp:8969 gui/src/chcanv.cpp:9229 +#: gui/src/chcanv.cpp:8973 gui/src/chcanv.cpp:9233 msgid "which has been created manually?" msgstr "qual foi criado manualmente?" -#: gui/src/chcanv.cpp:9741 gui/src/chcanv.cpp:9751 +#: gui/src/chcanv.cpp:9745 gui/src/chcanv.cpp:9755 #: gui/src/S57QueryDialog.cpp:104 gui/src/S57QueryDialog.cpp:281 msgid "ObjectQuery" msgstr "Interrogar Objeto" -#: gui/src/chcanv.cpp:9906 gui/src/routemanagerdialog.cpp:2687 +#: gui/src/chcanv.cpp:9910 gui/src/routemanagerdialog.cpp:2687 msgid "Mark Properties" -msgstr "" +msgstr "Propriedades da Marca" -#: gui/src/chcanv.cpp:9912 gui/src/routemanagerdialog.cpp:2693 +#: gui/src/chcanv.cpp:9916 gui/src/routemanagerdialog.cpp:2693 #: gui/src/RoutePropDlgImpl.cpp:518 msgid "Layer" msgstr "Camada" -#: gui/src/chcanv.cpp:9998 +#: gui/src/chcanv.cpp:10002 msgid "There is an existing waypoint at the same location as the one you are pasting. Would you like to merge the pasted data with it?\n\n" msgstr "Há um ponto da derrota existente no mesmo local onde você está colando. Gostaria de mesclar os dados colados com ele? \n\n" -#: gui/src/chcanv.cpp:10000 +#: gui/src/chcanv.cpp:10004 msgid "Answering 'No' will create a new waypoint at the same location." msgstr "Respondendo 'Não' irá criar um novo ponto da derrota no mesmo local." -#: gui/src/chcanv.cpp:10001 +#: gui/src/chcanv.cpp:10005 msgid "Merge waypoint?" msgstr "Mesclar Pontos da Derrota?" -#: gui/src/chcanv.cpp:10066 +#: gui/src/chcanv.cpp:10070 msgid "There are existing waypoints at the same location as some of the ones you are pasting. Would you like to just merge the pasted data into them?\n\n" msgstr "Existem pontos da derrota no mesmo local onde você está colando. Gostaria de apenas mesclar os dados colados neles? \n\n" -#: gui/src/chcanv.cpp:10069 +#: gui/src/chcanv.cpp:10073 msgid "Answering 'No' will create all new waypoints for this route." msgstr "Respondendo 'Não' irá criar novos pontos da derrota para esta derrota." -#: gui/src/chcanv.cpp:10070 +#: gui/src/chcanv.cpp:10074 msgid "Merge waypoints?" msgstr "Mesclar Pontos da Derrota?" -#: gui/src/chcanv.cpp:10552 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11353 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile requer que OpenGL seja habilitado" -#: gui/src/chcanv.cpp:12008 gui/src/options.cpp:4364 gui/src/options.cpp:4513 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Pés" -#: gui/src/chcanv.cpp:12010 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metros" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4366 gui/src/options.cpp:4515 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Braças" -#: gui/src/chcanv.cpp:12015 +#: gui/src/chcanv.cpp:12019 msgid "OverZoom" msgstr "SOBRESCALA" -#: gui/src/chcanv.cpp:12383 gui/src/chcanv.cpp:12384 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "ExtendedTideIcon" -#: gui/src/chcanv.cpp:12715 gui/src/chcanv.cpp:12716 +#: gui/src/chcanv.cpp:12719 gui/src/chcanv.cpp:12720 msgid "CurrentValue" msgstr "Corrente" -#: gui/src/chcanv.cpp:12949 gui/src/ocpn_frame.cpp:1071 +#: gui/src/chcanv.cpp:12953 gui/src/ocpn_frame.cpp:1071 msgid "AIS Target Query" msgstr "Interrogar Alvo AIS" -#: gui/src/chcanv.cpp:13197 +#: gui/src/chcanv.cpp:13201 msgid "Show all AIS Targets" msgstr "Mostrar todos os alvos AIS" -#: gui/src/chcanv.cpp:13198 gui/src/ocpn_frame.cpp:3531 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Atenuar alvos AIS menos críticos" -#: gui/src/chcanv.cpp:13199 +#: gui/src/chcanv.cpp:13203 msgid "Hide AIS Targets" msgstr "Esconder Alvos AIS" -#: gui/src/chcanv.cpp:13815 +#: gui/src/chcanv.cpp:13819 msgid "Show This Chart" msgstr "Mostrar esta carta" -#: gui/src/chcanv.cpp:13820 +#: gui/src/chcanv.cpp:13824 msgid "Hide This Chart" msgstr "Esconder esta carta" @@ -4232,9 +4253,9 @@ msgstr "Deslocamento X do Usuário" msgid "User Y Offset" msgstr "Deslocamento Y do Usuário" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metros" @@ -4245,11 +4266,13 @@ msgstr "Esta Pernada" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Descrição do console" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Valor do console" @@ -4285,12 +4308,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Título" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4306,7 +4329,7 @@ msgstr "Aplicar este modelo para retornar a uma configuração conhecida segura" #: gui/src/connection_edit.cpp:187 msgid "Connection Edit" -msgstr "" +msgstr "Ediitar conexão" #: gui/src/connection_edit.cpp:202 gui/src/download_mgr.cpp:311 #: gui/src/update_mgr.cpp:306 @@ -4319,29 +4342,29 @@ msgid "Less" msgstr "Menos" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" -msgstr "" +msgstr "Editar conexão selecionada" #: gui/src/connection_edit.cpp:292 gui/src/conn_params_panel.cpp:442 msgid "Built-in GPS" -msgstr "" +msgstr "GPS integrado" #: gui/src/connection_edit.cpp:301 msgid "Built-in Bluetooth SPP" -msgstr "" +msgstr "Bluetooth SPP integrado" #: gui/src/connection_edit.cpp:305 gui/src/connection_edit.cpp:901 msgid "BT Scan" -msgstr "" +msgstr "Procura BT" #: gui/src/connection_edit.cpp:315 msgid "Bluetooth Data Sources" -msgstr "" +msgstr "Fontes de dados do Bluetooth" #: gui/src/connection_edit.cpp:342 msgid "Network Protocol" -msgstr "" +msgstr "Protocolo de rede" #: gui/src/connection_edit.cpp:380 msgid "Data Protocol" @@ -4349,27 +4372,27 @@ msgstr "" #: gui/src/connection_edit.cpp:386 gui/src/connection_edit.cpp:511 msgid "NMEA 0183" -msgstr "" +msgstr "NMEA 0183" #: gui/src/connection_edit.cpp:386 gui/src/connection_edit.cpp:511 msgid "NMEA 2000" -msgstr "" +msgstr "NMEA 2000" #: gui/src/connection_edit.cpp:401 msgid "Address" -msgstr "" +msgstr "Endereço" #: gui/src/connection_edit.cpp:418 msgid "DataPort" -msgstr "" +msgstr "Porta de Dados" #: gui/src/connection_edit.cpp:437 msgid "socketCAN Source" -msgstr "" +msgstr "fonte socketCAN" #: gui/src/connection_edit.cpp:466 msgid "Data port" -msgstr "" +msgstr "Porta de Dados" #: gui/src/connection_edit.cpp:481 gui/src/conn_params_panel.cpp:213 msgid "Baudrate" @@ -4438,11 +4461,11 @@ msgstr "" #: gui/src/connection_edit.cpp:532 gui/src/connection_edit.cpp:547 msgid "User Comment" -msgstr "" +msgstr "Comentário do usuário" #: gui/src/connection_edit.cpp:560 msgid "List position" -msgstr "" +msgstr "Posição na lista" #: gui/src/connection_edit.cpp:565 msgid "0" @@ -4486,35 +4509,35 @@ msgstr "" #: gui/src/connection_edit.cpp:588 msgid "Receive Input on this Port" -msgstr "" +msgstr "Receber entrada nesta porta" #: gui/src/connection_edit.cpp:595 msgid "Output on this port" -msgstr "" +msgstr "Saída nesta porta" #: gui/src/connection_edit.cpp:596 msgid "as autopilot or NMEA repeater" -msgstr "" +msgstr "como piloto automático ou repetidor NMEA" #: gui/src/connection_edit.cpp:603 msgid "Auth Token" -msgstr "" +msgstr "Token de autenticação" #: gui/src/connection_edit.cpp:617 msgid "Control checksum" -msgstr "" +msgstr "Controle da soma" #: gui/src/connection_edit.cpp:621 msgid "If checked, only the sentences with a valid checksum are passed through" -msgstr "" +msgstr "Se marcada, apenas as sentenças com uma verificação válida de soma são passadas através de" #: gui/src/connection_edit.cpp:627 msgid "Use Garmin (GRMN) mode for input" -msgstr "" +msgstr "Usar Garmin (GRMN) modo de entrada" #: gui/src/connection_edit.cpp:637 msgid " UDP Multicast" -msgstr "" +msgstr "UDP Multicast" #: gui/src/connection_edit.cpp:646 msgid "APB bearing precision" @@ -4542,15 +4565,15 @@ msgstr "" #: gui/src/connection_edit.cpp:667 msgid "Automatic server discovery" -msgstr "" +msgstr "Descoberta automática de servidor" #: gui/src/connection_edit.cpp:671 msgid "If checked, signal K server will be discovered automatically" -msgstr "" +msgstr "Se marcado, o servidor de sinal K será descoberto automaticamente" #: gui/src/connection_edit.cpp:677 msgid "Discover now..." -msgstr "" +msgstr "Descubra agora..." #: gui/src/connection_edit.cpp:688 msgid "Input filtering" @@ -4578,61 +4601,61 @@ msgstr "" #: gui/src/connection_edit.cpp:847 msgid "Stop Scan" -msgstr "" +msgstr "Parar a varredura" #: gui/src/connection_edit.cpp:1629 msgid "Signal K server available." -msgstr "" +msgstr "Servidor de sinal K disponível." #: gui/src/connection_edit.cpp:1631 msgid "Signal K server not found." -msgstr "" +msgstr "Servidor de sinal K não encontrado." #: gui/src/connection_edit.cpp:1748 msgid "There is an enabled UDP input connection that uses the same data port." -msgstr "" +msgstr "Há uma conexão de entrada UDP habilitada que usa a mesma porta de dados." #: gui/src/connection_edit.cpp:1751 msgid "Please apply a filter on both connections to avoid a feedback loop." -msgstr "" +msgstr "Por favor, aplique um filtro em ambas as conexões para evitar um loop de feedback." #: gui/src/connection_edit.cpp:1756 msgid "There is a disabled UDP Input connection that uses the same Dataport." -msgstr "" +msgstr "Há uma conexão de entrada UDP desabilitada que usa a mesma porta de dados." #: gui/src/connection_edit.cpp:1760 msgid "If you enable that input please apply a filter on both connections to avoid a feedback loop." -msgstr "" +msgstr "Por favor, aplique um filtro em ambas as conexões para evitar um loop de feedback." #: gui/src/connection_edit.cpp:1764 msgid "Or consider using a different data port for one of them" -msgstr "" +msgstr "Ou considere usar uma porta de dados diferente para uma delas" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN aviso" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN Informações" #: gui/src/connection_edit.cpp:2395 msgid "Sentence Filter" -msgstr "" +msgstr "Filtro de sentença" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Selecionar Tudo" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Limpar Tudo" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Adicionar" @@ -4640,11 +4663,12 @@ msgstr "Adicionar" #: gui/src/connection_edit.cpp:2525 msgid "Enter the NMEA sentence (2, 3 or 5 characters)\n" " or a valid REGEX expression (6 characters or longer)" -msgstr "" +msgstr "Insira a sentença NMEA (2, 3 ou 5 caracteres)\n" +" ou uma expressão REGEX válida (6 caracteres ou mais)" #: gui/src/connection_edit.cpp:2527 msgid "Enter the NMEA sentence" -msgstr "" +msgstr "Insira a sentença NMEA" #: gui/src/connection_edit.cpp:2546 msgid "An NMEA sentence is generally 3 characters long (like RMC, GGA etc.)\n" @@ -4656,76 +4680,76 @@ msgstr "" #: gui/src/connection_edit.cpp:2563 msgid "REGEX syntax error: \n" -msgstr "" +msgstr "Erro de sintaxe REGEX: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Geral" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" -msgstr "" +msgstr "Filtrar dados NMEA de rumo e velocidade" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" -msgstr "" +msgstr "Período de filtro (sec)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" -msgstr "" +msgstr "Janela de depuração NMEA" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" -msgstr "" +msgstr "Uploads formatado para Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" -msgstr "" +msgstr "Usar o modo de Garmin GRMN (Host) para uploads" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" -msgstr "" +msgstr "Usar rumos magnéticos na sentença de saída APB" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." -msgstr "" +msgstr "Ajustar prioridades de comunicação..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "NMEA0183 ID do falante" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" -msgstr "" +msgstr "Conexão de dados" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." -msgstr "" +msgstr "Adicionar Conexões" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." -msgstr "" +msgstr "Editar conexão" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" -msgstr "" +msgstr "Remover a Conexão" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" -msgstr "" +msgstr "Configurar nova conexão" #: gui/src/conn_params_panel.cpp:163 msgid "Enable" -msgstr "" +msgstr "Habilitar" #: gui/src/conn_params_panel.cpp:195 gui/src/conn_params_panel.cpp:287 #: gui/src/conn_params_panel.cpp:417 gui/src/conn_params_panel.cpp:520 msgid "Direction" -msgstr "" +msgstr "Direção" #: gui/src/conn_params_panel.cpp:207 msgid "Serial Port" -msgstr "" +msgstr "Porta serial" #: gui/src/conn_params_panel.cpp:260 gui/src/conn_params_panel.cpp:391 #: gui/src/conn_params_panel.cpp:495 gui/src/conn_params_panel.cpp:598 @@ -4733,23 +4757,23 @@ msgstr "" #: gui/src/conn_params_panel.cpp:771 gui/src/conn_params_panel.cpp:773 #: gui/src/conn_params_panel.cpp:777 gui/src/conn_params_panel.cpp:781 msgid "Comment: " -msgstr "" +msgstr "Comentário: " #: gui/src/conn_params_panel.cpp:299 msgid "Network Address" -msgstr "" +msgstr "Endereço de rede" #: gui/src/conn_params_panel.cpp:305 msgid "Network Port" -msgstr "" +msgstr "Porta de rede" #: gui/src/conn_params_panel.cpp:545 msgid "Built-in Bluetooth" -msgstr "" +msgstr "Bluetooth integrado" #: gui/src/conn_params_panel.cpp:620 msgid "Driver" -msgstr "" +msgstr "Driver" #: gui/src/DetailSlider.cpp:88 msgid "CM93 Detail Level" @@ -4768,7 +4792,7 @@ msgid "Install" msgstr "Instalar" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Reinstalar" @@ -4776,7 +4800,7 @@ msgstr "Reinstalar" msgid "Update" msgstr "Atualizar" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Rebaixar" @@ -4806,7 +4830,7 @@ msgid " successfully installed" msgstr " instalado com sucesso!" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Instalação concluída" @@ -4814,6 +4838,21 @@ msgstr "Instalação concluída" msgid "Installation error" msgstr "Erro na instalação" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Marcas" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Alerta AIS" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "Texto das Cartas" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4826,7 +4865,7 @@ msgstr "Esperando por linha de saída para compressão de cartas raster." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN Atualização de Cache Compactado" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distância do NossoBarco: %4.0f NMi" @@ -4892,34 +4931,42 @@ msgstr "Link não completo, não pode ser salvo." #: gui/src/load_errors_dlg.cpp:49 msgid "\n" "The following plugins have encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"Os seguintes plugins encontraram erros durante a inicialização:\n\n" #: gui/src/load_errors_dlg.cpp:54 msgid "\n" "The following plugin has encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"Os seguintes plugins encontraram erros durante a inicialização:\n\n" #: gui/src/load_errors_dlg.cpp:59 msgid "\n" "The following libraries have encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"As seguintes bibliotecas encontraram erros durante a inicialização:\n\n" #: gui/src/load_errors_dlg.cpp:64 msgid "\n" "The following library has encountered errors during startup:\n\n" -msgstr "" +msgstr "\n" +"As seguintes bibliotecas encontraram erros durante a inicialização:\n\n" #: gui/src/load_errors_dlg.cpp:68 msgid "\n\n" "These plugins will be uninstalled. You might want to reinstall\n" "them after updating the catalog.\n" -msgstr "" +msgstr "\n\n" +"Este plugin será desinstalado. Talvez você queira reinstalar\n" +"após atualizar o catálogo.\n" #: gui/src/load_errors_dlg.cpp:74 msgid "\n\n" "This plugin will be uninstalled. You might want to reinstall\n" "it after updating the catalog.\n" -msgstr "" +msgstr "\n\n" +"Este plugin será desinstalado. Talvez você queira reinstalar\n" +"após atualizar o catálogo.\n" #: gui/src/load_errors_dlg.cpp:80 msgid "\n\n" @@ -4931,7 +4978,9 @@ msgstr "" msgid "\n\n" "The library will be removed. You might want to reinstall it's\n" "associated plugin after updating the catalog." -msgstr "" +msgstr "\n\n" +"A biblioteca será removida. Você pode querer reinstalar ela\n" +"plugin associado após a atualização do catálogo." #: gui/src/MarkInfo.cpp:318 gui/src/RoutePropDlg.cpp:416 #: gui/src/TrackPropDlg.cpp:640 @@ -4947,7 +4996,7 @@ msgstr "Este waypoint é parte de uma camada e não pode ser editado" msgid "Icon" msgstr "Símbolo" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -4957,7 +5006,7 @@ msgid "Links" msgstr "Atalhos" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -4998,22 +5047,22 @@ msgstr "Intervalo de anéis" msgid "Number" msgstr "Número" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distância" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Cor" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Nenhum" @@ -5103,16 +5152,16 @@ msgstr "Mostrar somente em escala" msgid "Tide Station not found" msgstr "Estação de Maré não encontrada" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Definir escala" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Escala da Carta" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Persistente" @@ -5142,40 +5191,40 @@ msgstr "Janela de depuração NMEA" #: gui/src/ocpn_app.cpp:798 msgid "Cannot load route or waypoint file: " -msgstr "" +msgstr "Não é possível carregar a rota ou arquivo de waypoint: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " -msgstr "" +msgstr "Falha ao inicializar a interface do usuário. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " -msgstr "" +msgstr "OpenCPN não pode iniciar. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " -msgstr "" +msgstr "Os arquivos de configuração necessários não foram encontrados. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " -msgstr "" +msgstr "Consulte o arquivo de log em " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." -msgstr "" +msgstr " para detalhes." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " -msgstr "" +msgstr " -- [Executando Portable(-p) de " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" -msgstr "" +msgstr "Recuperar o Directório inicial de cartas do registro do Windows" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." -msgstr "" +msgstr "OpenCPN inicializado em %ld ms." #: gui/src/ocpn_frame.cpp:453 msgid "\n" @@ -5184,322 +5233,329 @@ msgid "\n" "OpenCPN must only be used in conjunction with approved paper charts and traditional methods of navigation.\n\n" "DO NOT rely upon OpenCPN for safety of life or property.\n\n" "Please click \"OK\" to agree and proceed, \"Cancel\" to quit.\n" -msgstr "" +msgstr "\n" +"OpenCPN é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; nem sequer implícita garantia de COMERCIABILIDADE ou APTIDÃO PARA UM PROPÓSITO PARTICULAR.\n\n" +"Veja a Licença Pública Geral GNU para mais detalhes.\n\n" +"OpenCPN só deve ser usado em conjunto com Cartas de papel e tradicionais metodos de navegação.\n\n" +"Não confie em OpenCPN para segurança da vida ou propriedade.\n\n" +"Por favor, clique em \"OK\" para concordar e prosseguir, \"Cancelar\" para sair.\n" #: gui/src/ocpn_frame.cpp:467 msgid "OpenCPN for Android" -msgstr "" +msgstr "OpenCPN para Android" #: gui/src/ocpn_frame.cpp:485 msgid "Welcome to OpenCPN" -msgstr "" +msgstr "Benvindo ao OpenCPN" #: gui/src/ocpn_frame.cpp:718 msgid "This AIS target has Persistent tracking selected by MMSI properties\n" "A Persistent track recording will therefore be restarted for this target.\n\n" "Do you instead want to stop Persistent tracking for this target?" -msgstr "" +msgstr "Esta meta AIS tem rastreamento persistente selecionado por propriedades MMSI\n" +"Uma gravação de faixa Persistente será portanto reiniciada para esta meta.\n\n" +"Em vez disso, você quer parar o rastreamento persistente para este alvo?" #: gui/src/ocpn_frame.cpp:865 msgid "OpenCPN needs to update the chart database from config file entries...." -msgstr "" +msgstr "OpenCPN precisa atualizar o banco de dados de cartas a partir de entradas de arquivo de configuração...." #: gui/src/ocpn_frame.cpp:877 msgid "Rebuilding chart database from configuration file entries..." -msgstr "" +msgstr "Reconstruir banco de dados de cartas a partir de arquivos de configuração..." #: gui/src/ocpn_frame.cpp:881 msgid "Elapsed time : " -msgstr "" +msgstr "Tempo decorrido : " #: gui/src/ocpn_frame.cpp:882 msgid "Estimated time : " -msgstr "" +msgstr "Tempo estimado : " #: gui/src/ocpn_frame.cpp:883 msgid "Remaining time : " -msgstr "" +msgstr "Tempo restante : " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" -msgstr "" +msgstr "OpenCPN Atualização das Cartas" -#: gui/src/ocpn_frame.cpp:1663 +#: gui/src/ocpn_frame.cpp:1661 msgid "Anchorage created " msgstr "Fundeadouro criado " -#: gui/src/ocpn_frame.cpp:2584 gui/src/ocpn_frame.cpp:2706 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" -msgstr "" +msgstr "Mostrar Barra de Ferramentas" -#: gui/src/ocpn_frame.cpp:2585 gui/src/ocpn_frame.cpp:2708 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" -msgstr "" +msgstr "Ocultar barra de ferramentas" -#: gui/src/ocpn_frame.cpp:2914 gui/src/ocpn_frame.cpp:2977 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" -msgstr "" +msgstr "HOMEM AO MAR" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " -msgstr "" +msgstr " no " -#: gui/src/ocpn_frame.cpp:2917 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " -msgstr "" +msgstr " em " -#: gui/src/ocpn_frame.cpp:2937 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" -msgstr "" +msgstr "1.0 NM ao longo do COG" -#: gui/src/ocpn_frame.cpp:2949 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" -msgstr "" +msgstr "Rota temporária MOB" -#: gui/src/ocpn_frame.cpp:2950 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" -msgstr "" +msgstr "Assumir 1 Ponto de Milha" -#: gui/src/ocpn_frame.cpp:2978 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " -msgstr "" +msgstr " Hora: " -#: gui/src/ocpn_frame.cpp:2980 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " -msgstr "" +msgstr " Posição: " -#: gui/src/ocpn_frame.cpp:2998 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" -msgstr "" +msgstr "Desabilitar o Rastreamento" -#: gui/src/ocpn_frame.cpp:3070 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Ativar o Rastreamento" -#: gui/src/ocpn_frame.cpp:3439 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Acompanhar Automaticamente" -#: gui/src/ocpn_frame.cpp:3444 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" -msgstr "" +msgstr "Modo Rumo Acima" -#: gui/src/ocpn_frame.cpp:3447 gui/src/ocpn_frame.cpp:3450 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Aumentar" -#: gui/src/ocpn_frame.cpp:3448 gui/src/ocpn_frame.cpp:3451 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Diminuir" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" -msgstr "" +msgstr "Carta de escala maior" -#: gui/src/ocpn_frame.cpp:3457 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" -msgstr "" +msgstr "Carta de escala menor" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" -msgstr "" +msgstr "Sair do OpenCPN" -#: gui/src/ocpn_frame.cpp:3462 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" -msgstr "" +msgstr "&Navegar" -#: gui/src/ocpn_frame.cpp:3478 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Mostrar barra da carta" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Mostrar texto ENC" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" -msgstr "" +msgstr "Mostrar luzes ENC" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" -msgstr "" +msgstr "Mostrar Sons ENC" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3502 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" -msgstr "" +msgstr "Mostrar informação de ancoragem ENC" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" -msgstr "" +msgstr "Mostrar Qualidade dos Dados ENC" -#: gui/src/ocpn_frame.cpp:3493 gui/src/ocpn_frame.cpp:3507 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" -msgstr "" +msgstr "Mostrar objetos de navegação" -#: gui/src/ocpn_frame.cpp:3510 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Mostrar Marés" -#: gui/src/ocpn_frame.cpp:3515 gui/src/ocpn_frame.cpp:3518 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Mudar Esquema de Cores" -#: gui/src/ocpn_frame.cpp:3526 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" -msgstr "" +msgstr "&Vista" -#: gui/src/ocpn_frame.cpp:3529 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Mostrar Alvos AIS" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" -msgstr "" +msgstr "Ocultar alvos AIS atracados" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" -msgstr "" +msgstr "Mostrar faixas de alvo AIS" -#: gui/src/ocpn_frame.cpp:3536 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" -msgstr "" +msgstr "Mostrar diálogo de alerta do CPA" -#: gui/src/ocpn_frame.cpp:3537 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" -msgstr "" +msgstr "Som de alarmes CPA" -#: gui/src/ocpn_frame.cpp:3541 gui/src/ocpn_frame.cpp:3544 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" -msgstr "" +msgstr "Mostrar avisos do CPA" -#: gui/src/ocpn_frame.cpp:3549 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" -msgstr "" +msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3554 gui/src/ocpn_frame.cpp:3557 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" -msgstr "" +msgstr "Medir Distância" -#: gui/src/ocpn_frame.cpp:3561 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." -msgstr "" +msgstr "Rota && gerente de marca..." -#: gui/src/ocpn_frame.cpp:3563 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Criar rota" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3568 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3574 gui/src/ocpn_frame.cpp:3581 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Lançar Marca de HOMEM AO MAR" -#: gui/src/ocpn_frame.cpp:3578 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preferências" -#: gui/src/ocpn_frame.cpp:3586 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3590 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3595 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3596 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Houve um problema na impressão.\n" "Talvez sua impressora não esteja ajustada corretamente?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Derrota sem Nome)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Nosso Navio" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Rota & Gerente de Marca" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Imprimir Carta" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-espaço)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5507,105 +5563,105 @@ msgstr "Criar um modelo de configuração privada baseado nas configurações at "Este modelo será salvo, e pode ser selecionado para ser usado a qualquer momento.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI propriedades estendidas" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Acompanhamento" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Padrão de rastreamento" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Sempre acompanhar" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Nunca acompanhar" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorar este MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Lidar com este MMSI como SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Converter AIVDM para AIVDO para este MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Este MMSI é do meu seguidor - Sem alerta de CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Um Id MMSI é geralmente um número de nove dígitos.\n" "Por favor verifique as suas entradas e cancele se necessário." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Padrão" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Sempre" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Nunca" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Editar Propriedades MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI Propriedades" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Modo de faixa" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorar" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM-> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nome do navio" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Seguidor" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Novo..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Adicionar Propriedades MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5623,7 +5679,7 @@ msgstr "O dispositivo selecionado não é acessível; opencpn provavelmente não " KERNEL == \"ttyS *\", MODE= \"0666\"\n\n" "Para mais informações, consulte o arquivo LINUX_DEVICES.md nos docs de distribuição.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5643,1172 +5699,1175 @@ msgstr "\n" " KERNEL== \"ttyS *\", MODE= \"0666\"\n\n" "Para mais informações, consulte o arquivo LINUX_DEVICES.md nos docs de distribuição.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Tamanho do preditor da seta de fundo (Minutos)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Linha do Comprimento Previsto(milhas náuticas)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Tipos de ícones de navios" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Bitmap Escala real" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Vetor escala real" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Comprimento total (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Largura total (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Deslocamento GPS da Proa (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Deslocamento GPS da meia-nau (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Tamanho mínimo da tela (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Mostrar Anéis de Alcance" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distância entre anéis" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Distância" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Milhas náuticas" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "&Kilômetros" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Cores dos anéis de distância" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Mostrar direção para o Waypoint Ativo" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Estilo" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Sólido" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Ponto" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Traço longo" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Traço curto" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Ponto traço" +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 +#: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 +msgid "Default color" +msgstr "Cor padrão" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Preto" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Vermelho escuro" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Verde escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Amarelo escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Azul escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Ciano escuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Cinza claro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Cinza escuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Vermelho" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Verde" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Amarelo" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Azul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Ciano" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Branco" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Acompanhamentos" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Faixas de Diário automático à meia-noite" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Faixas de Diários automáticas em" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Computador" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Faixas de destaque" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Propriedades do Acompanhamento..." -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Baixa" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Média" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Alta" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Calcular valores" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Calcular o SOG e COG de mudanças de posição" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Min segundos entre atualizações" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rotas/Pontos" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Novas rotas" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Ícone padrão do Waypoint" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Raio do círculo de chegada waypoint (NM)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Waypoint de avanço de rota na chegada apenas" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Substituir as configurações para visibilidade baseada na escala da carta e mostrar sempre" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Cores dos anéis de distância do Waypoint" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Opções de controle" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Confirma exclusão de trilhas e rotas" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Arquivos de cartas" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Diretórios de Cartas Ativos" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Adicionar Diretório..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Remover selecionados" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Selecionado Compactar" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Adicionar.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Remover" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Compactar" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Migrar Charts.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Controle de Atualização" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Varredura de cartas e atualização de dados" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Forçar Reconstrução Completa do Banco de Dados" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Preparar todas cartas ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Modelos" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Status do modelo" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Último Título do Modelo Aplicado:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Modelos salvos" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Criar Configuração..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Excluir configuração selecionada..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Aplicar configuração selecionada" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Criar configuração" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Problema ao aplicar a configuração selecionada." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avançado" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Inclinação de gráficos Raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Use acelerado gráficos (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Opções OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Tempo médio de rotação da carta" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "segundos" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Zoom Carta/Ponderação Escala" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vetor" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "Nível de Detalhe CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Largura física da tela" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Automático" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manual:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm " -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Mostrar Carta" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Mostrar cartas Raster inclinada com o norte para cima" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Com um valor mais baixo, o mesmo nível de zoom mostra uma carta menos detalhada.\n" "Com um valor mais alto, o mesmo nível de zoom mostra uma carta mais detalhada." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Gráficos" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Apresentação de cartas vectoriais" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Standard Marítimo" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Sondagens" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Informação da Marca" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bóias e Faróis" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Setores de luz estendidos" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Textos da carta" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Texto nacional na carta" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Somente Texto Importante" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Texto Desembaralhado" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Detalhe da carta" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Detalhe reduzido em escala pequena" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Estilo gráfico" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Carta em Papel" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplificado" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Limites" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Simples" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Com Símbolos" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Cores" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Cores" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Cores" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Profundidade Rasa" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Profundidade Segura" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Profundidade Funda" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Objetos Padrão do Usuário" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Redefinir para padrão" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Marés && correntes" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Conjuntos de dados ativos" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Adicione o Dataset..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Todas as cartas disponíveis" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Remover Cartas" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Todas as cartas" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Grupo Novo..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Excluir grupo" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Preservar escala quando mudar de cartas" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Controles" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Suave Visão panorâmica / zoom" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zoom para Cursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Recursos de exibição" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Opção da barra de status" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "ETA ao vivo no Cursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Velocidade padrão do barco " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Layout de tela" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Barra de Status" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unidades" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Estatuto milhas" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Nós" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Profundidade" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatura" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Graus, Décimos de Minutos" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Graus decimais" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Graus, minutos, segundos" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Marcações" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Mostrar a verdade" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Mostrar magnético" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Variação magnética assumida" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "DEG (-W, + E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Mostrar marcações e proas verdadeiros" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Mostrar marcações e proas magnéticas." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Plugin WMM calculalou a variação magnética" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Para definir a variação magnética manualmente,\n" " você deve desabilitar o plugin WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Teste" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Nome do arquivo de áudio:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Selecionar Som do Alerta" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Sons" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Alarme de âncora" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Tocar som no Alarme de Ancora." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Selecionar Som do Alarme Âncora" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Tocar som no Alerta AIS." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Selecionar Som do Alerta AIS" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "Alerta SART " -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Tocar som no Alerta AIS SART." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Selecionar Som de Alerta AIS SART" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "Alerta DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Tocar som na notificação DSC." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Selecionar som de notificação DSC" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Dispositivo desconhecido :" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Dispositivo de entrada" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Dispositivo de som" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Comando de Reprodução de Áudio:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Alvos AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Cálculo PMA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Não há alertas de (T)CPA se intervalo de alvo for maior que (MiN)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Avisar se PMA a menos de (MN):" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...e TPMA for menor que (Minutos):" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Alvos Perdidos" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Marcar alvo como perdido após (Minutos):" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Remover alvos perdidos após (Minutos):" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Apresentação" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Mostrar setas de Rfundo dos alvos" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Mostrar acompanhamentos dos alvos" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Suprimir alvos ancorados/atracado, velocidade max (nós)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Desenhar previsão AIS em tempo real, velocidade mínima do alvo (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Permitir atenuação dos alvos menos críticos, se mais do que... alvos" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Mostrar avisos de área (a partir de mensagens binárias de AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Mostrar tamanho real de alvos AIS" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Mostre nomes com alvos AIS em escala maior que 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Usar mensagens de posição WPL. Quando recebido ação: " -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Relatório de Posição APRS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Criar marca" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Capotamento" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Ativar rota / bloco de informação AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Nome do Navio\" MMSI (indicativo)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Classe] Tipo (Estatus)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "Alerta PMA/TPMA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Alerta PMA/TPMA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Mostrar Janela de Alerta PMA/TPMA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Tocar Som nos Alertas PMA/TPMA" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Suprimir Alerta para alvos ancorados/atracados" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Habilitar alerta de alvo Reconhecer limite de tempo (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Opções Gerais" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Idioma" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Fontes" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Escolher Fonte..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Escolha a cor da fonte..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Amostra" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Barra de ferramentas e estilo da janela" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Opções de Interface" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Mostrar Barra de Status" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Mostrar barra de Menu" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Mostrar Status da bússola/GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Ativar auto-ocultar da barra de ferramentas" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Tocar o sino do navio" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Habilitar a interface Touchscreen" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Habilitar escala interface gráfica" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Mostrar botões de Zoom" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Fator de escala da Interface do usuário" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Fator de escala do objeto gráfico" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Fator de escala do Barco" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "Fator de Sondagem ENC" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Aplicar" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Cartas" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Conexões" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Navios" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Interface de usuário" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Plugins" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Variação magnética definida pelo usuário" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "pés" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "braças" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Adicionar um diretório contendo arquivos de cartas" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - comprimento do seu barco deve ser > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - boca do seu barco deve ser > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - seu deslocamento GPS do meio do barco deve estar dentro da boca do seu barco" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - seu deslocamento GPS da proa deve estar dentro do comprimento do seu barco" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - seu tamanho mínimo do ícone do barco deve estar entre 1 e 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "As configurações para o tamanho real do seu barco não estão corretas:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6818,15 +6877,15 @@ msgstr "Compressão irá alterar arquivos de cartas na disco. \n" "Cartas Compactadas podem demorar um pouco para carregar e exibir em alguns sistemas. \n" "Elas podem ser descompactadas novamente usando unxz ou 7 zip programas." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Cartas compactadas" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Não há cartas para compactar." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6835,71 +6894,71 @@ msgstr "compactado %ld de cartas\n" "de %.1fMB para %.1fMB\n" "salvado %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Digite o nome do grupo" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Novo grupo de cartas" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Selecione dados de maré/corrente" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Compressão de textura" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Compressão de textura com o cache" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Cache de compressão de textura" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tamanho de memória de textura (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Tamanho: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Reconstruir o Cache de texturas" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Limpar o Cache de textura" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Suavização do polígono" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Suavização da Linha" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "OpenGL software (reiniciar OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Usar Visão Panoramica acelerado" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Configurações de textura" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Cache de texturas" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Diversos" @@ -6981,127 +7040,127 @@ msgstr "Por favor, verifique o log do sistema para mais informações." msgid " successfully installed from cache" msgstr " instalado do cache com sucesso" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Estas configurações podem desestabilizar o OpenCPN e estão desativadas por padrão. Para Apesar dos perigos ativa-las, adicione manualmente uma linha CatalogExpert=1 na seção [PlugIns] no arquivo de configuração." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Catálogo de Plugins" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Atualizar Catálogo de Plugins" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importar plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Configurações..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Desabilitado" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Atualizar Catálogo de Plugin: mestre" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN Atualização de Catálogo" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Não foi possível copiar arquivo de catálogo" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Não foi possível copiar o arquivo de catálogo para o cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Catálogo atualizado com sucesso" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Selecionar arquivo tarball" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Erro de Importação de Plugin OpenCPN" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Plugin de importação incompatível detectado." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Erro ao extrair importação tarball do plugin." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Catálogo Ativo" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Último Catálogo" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Última alteração:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Por favor, atualize Catálogo de Plugins." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Desinstalar" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Habilitado" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Atualize para a versão " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Instalar..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Atualizar para " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Website" @@ -7123,48 +7182,44 @@ msgstr "Mover para Baixo" #: gui/src/priority_gui.cpp:104 msgid "Refresh" -msgstr "" +msgstr "Atualizar" #: gui/src/priority_gui.cpp:218 msgid "Priorities" -msgstr "" +msgstr "Prioridades" #: gui/src/priority_gui.cpp:225 msgid "Speed/Course" -msgstr "" +msgstr "Velocidade/Curso" #: gui/src/priority_gui.cpp:233 msgid "Mag Variation" -msgstr "" +msgstr "Variação magnética" #: gui/src/priority_gui.cpp:237 msgid "Satellites" -msgstr "" +msgstr "Satélites" #: gui/src/rest_server_gui.cpp:51 gui/src/rest_server_gui.cpp:70 #: gui/src/rest_server_gui.cpp:249 gui/src/SendToPeerDlg.cpp:127 msgid "OpenCPN Server Message" -msgstr "" - -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Alerta AIS" +msgstr "Mensagem do servidor OpenCPN" #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TideCurrentGraphRollover" -#: gui/src/route_gui.cpp:597 +#: gui/src/route_gui.cpp:601 msgid "Route Transmitted." -msgstr "" +msgstr "Rota transmitida." -#: gui/src/route_gui.cpp:600 +#: gui/src/route_gui.cpp:604 msgid "Error on Route Upload. Garmin GPS not connected" -msgstr "" +msgstr "Erro no Carregamento de rota. GPS Garmin não conectado" -#: gui/src/route_gui.cpp:602 +#: gui/src/route_gui.cpp:606 msgid "Error on Route Upload. Please check logfiles..." -msgstr "" +msgstr "Erro no Upload de rota. Por favor, verifique os arquivos de log..." #: gui/src/routemanagerdialog.cpp:354 msgid "Routes" @@ -7221,15 +7276,15 @@ msgstr "&Exportar Selecionado..." #: gui/src/routemanagerdialog.cpp:490 msgid "&Send to GPS..." -msgstr "" +msgstr "&Enviar para o GPS..." #: gui/src/routemanagerdialog.cpp:491 msgid "Send to &Peer..." -msgstr "" +msgstr "Enviar para Par..." #: gui/src/routemanagerdialog.cpp:494 msgid "Resequence" -msgstr "" +msgstr "Redefinir sequência" #: gui/src/routemanagerdialog.cpp:495 gui/src/TrackPropDlg.cpp:990 msgid "Export" @@ -7249,7 +7304,7 @@ msgstr "Nome do Acompanhamento" #: gui/src/routemanagerdialog.cpp:615 msgid "Start Date" -msgstr "" +msgstr "Data de início" #: gui/src/routemanagerdialog.cpp:617 msgid "Length" @@ -7265,21 +7320,15 @@ msgstr "Acompanhamento da Rota" #: gui/src/routemanagerdialog.cpp:666 gui/src/routemanagerdialog.cpp:814 msgid "Send to &Peer" -msgstr "" - -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" +msgstr "Enviar para Par" #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" -msgstr "" +msgstr "Mostrar todas as marcas" #: gui/src/routemanagerdialog.cpp:752 msgid "Mark Name" -msgstr "" +msgstr "Nome da Marca" #: gui/src/routemanagerdialog.cpp:754 msgid "Distance from own ship" @@ -7360,15 +7409,15 @@ msgstr "Tem certeza que quer excluir as Derrotas?" #: gui/src/routemanagerdialog.cpp:1627 msgid "Send Route(s) to OpenCPN Peer" -msgstr "" +msgstr "Enviar rota para OpenCPN Peer" #: gui/src/routemanagerdialog.cpp:1667 msgid "Send Waypoint(s) to OpenCPN Peer" -msgstr "" +msgstr "Enviar Waypoint para OpenCPN Peer" #: gui/src/routemanagerdialog.cpp:1707 msgid "Send Track(s) to OpenCPN Peer" -msgstr "" +msgstr "Enviar rota para OpenCPN Peer" #: gui/src/routemanagerdialog.cpp:1874 msgid "&Merge Selected Tracks" @@ -7428,7 +7477,7 @@ msgstr "Excedido" #: gui/src/routemanagerdialog.cpp:2698 #, c-format msgid " (%lu points)" -msgstr "" +msgstr " (%lu pontos)" #: gui/src/routemanagerdialog.cpp:2756 msgid "The waypoint you want to delete is used in a route, do you really want to delete it?" @@ -7466,27 +7515,27 @@ msgstr "Você está tentando excluir uma rota ativa de MOB AIS, você tem MESMO #: gui/src/route_point_gui.cpp:765 msgid "The ScaMin value for new waypoints is set to" -msgstr "" +msgstr "O valor da ScaMin para novos waypoints está definido para" #: gui/src/route_point_gui.cpp:766 msgid "but current chartscale is" -msgstr "" +msgstr "mas a escala atual da carta é" #: gui/src/route_point_gui.cpp:768 msgid "Therefore the new waypoint will not be visible at this zoom level." -msgstr "" +msgstr "Portanto, o novo waypoint não será visível a este nível de zoom." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." -msgstr "" +msgstr "Waypoint(s) transmitido." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" -msgstr "" +msgstr "Erro no carregamento do Waypoint. GPS Garmin não conectado" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." -msgstr "" +msgstr "Erro no Carregamento do Waypoint. Por favor, verifique os arquivos de log..." #: gui/src/routeprintout.cpp:101 gui/src/RoutePropDlg.cpp:352 #: gui/src/trackprintout.cpp:85 gui/src/TrackPropDlg.cpp:304 @@ -7558,11 +7607,6 @@ msgstr "Local@PC" msgid "LMT@Location" msgstr "LMT@Localização" -#: gui/src/RoutePropDlg.cpp:265 gui/src/TrackPropDlg.cpp:482 -#: gui/src/TrackPropDlg.cpp:727 -msgid "Default color" -msgstr "Cor padrão" - #: gui/src/RoutePropDlg.cpp:302 gui/src/TrackPropDlg.cpp:516 #: gui/src/TrackPropDlg.cpp:751 msgid "Width" @@ -7794,7 +7838,7 @@ msgstr " (setores de ângulos são direções verdadeiras do lado msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7819,15 +7863,15 @@ msgstr "Progresso..." #: gui/src/SendToPeerDlg.cpp:60 msgid "Objects exists on server. OK to overwrite?" -msgstr "" +msgstr "Os objetos existem no servidor. Deseja sobrescrever?" #: gui/src/SendToPeerDlg.cpp:72 msgid "Server HTTP response is :" -msgstr "" +msgstr "Resposta HTTP do servidor é:" #: gui/src/SendToPeerDlg.cpp:74 msgid "Curl transfer error: " -msgstr "" +msgstr "Erro de transferência curl: " #: gui/src/SendToPeerDlg.cpp:84 msgid "Server internal error response:" @@ -7910,7 +7954,7 @@ msgstr "Hoje" msgid "Tomorrow" msgstr "Amanhã" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Dicas de ferramentas" @@ -8192,3 +8236,156 @@ msgstr "Mover o Ponto da Derrota" msgid "Dismiss" msgstr "Dispensar" +#: gui/src/initwiz/wiz_ui.cpp:74 +msgid "Select the units and data formats you would like to use." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:78 +msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:81 +msgid " icon in the main Toolbar." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:87 +msgid "If you already have charts on your system, you may add them here." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:90 +msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:95 +msgid "To access the Chart Downloader click on the " +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:98 +msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:102 +msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:395 +#, c-format +msgid "NMEA0183: UDP port %d" +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:406 +#, c-format +msgid "NMEA2000: UDP port %d" +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:510 +#, c-format +msgid "NMEA0183: %s TCP port %d" +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:522 +#, c-format +msgid "NMEA2000: %s TCP port %d" +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:609 +#, c-format +msgid "GPSd: %s TCP port %d" +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:632 +msgid "Scanning USB devices..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:637 +msgid "Looking for UDP data feeds..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:642 +msgid "Looking for TCP servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 +msgid "Looking for CAN interfaces..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:660 +msgid "Looking for GPSD servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:676 +#, c-format +msgid "SignalK: %s (%s port %d)" +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:690 +msgid "The system has been scanned for sources of navigation data." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:693 +msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:697 +msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:702 +msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:706 +msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:716 +msgid "Select a directory containing charts" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:30 +msgid "Units and formats" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:81 +msgid "Degrees, decimal minutes (DD MM.MM)" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:81 +msgid "Decimal degrees (DD.DDDDD)" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:81 +msgid "Degrees, minutes, seconds (DD MM SS)" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:90 +msgid "Show true headings and bearings" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:97 +msgid "Show magnetic headings and bearings" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:132 +msgid "Detected navigation data sources:" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:140 +msgid "Rescan..." +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:170 +msgid "Add existing charts" +msgstr "" + +#: gui/src/initwiz/wiz_ui_proto.cpp:177 +msgid "Add chart directory..." +msgstr "" diff --git a/po/opencpn_pt_PT.po b/po/opencpn_pt_PT.po index 1f7484a6cb..5cd0b57ff1 100644 --- a/po/opencpn_pt_PT.po +++ b/po/opencpn_pt_PT.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Portuguese\n" "Language: pt_PT\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Percurso sem nome)" @@ -414,7 +414,7 @@ msgstr "Aeronave SAR" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Último conhecido)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Posição" @@ -509,11 +509,11 @@ msgstr "Direita" msgid "Left" msgstr "Esquerda" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Velocidade" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitude" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Ajuda à navegação" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Base" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "Os pontos de passagem serão renomeados para refletir a ordem natural. O "Deseja renomear os pontos de passagem?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Acerca do OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Substituir o itinerário do dispositivo Garmin número 1?" msgid "OpenCPN Message" msgstr "Mensagem OpenCPN" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opções" @@ -2543,7 +2543,7 @@ msgstr "Imprimir Percurso Selecionado" msgid "Track properties" msgstr "Propriedades do percurso" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "API do Plugin: " msgid "OpenCPN Website" msgstr "Sítio do OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "A documentação de ajuda do OpenCPN não está disponível localmente." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Gostaria de visitar o site opencpn.org para mais informação?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Cancelamento - área de cancelamento conforme identificado pelo ID da me msgid "Undefined (default)" msgstr "Indefinito (default)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Nome do Alvo AIS" @@ -3089,7 +3089,7 @@ msgstr "\n" "Uma gravação de percurso será, portanto, reiniciada para este alvo.\n\n" "Em vez disso, quer parar a gravação de percurso para este alvo?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Alerta de AIS" @@ -3105,7 +3105,7 @@ msgstr "&Silêncio alerta" msgid "&Jump To" msgstr "&Saltar para" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Criar ponto de passagem" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Lista de alvos AIS" @@ -3217,38 +3217,38 @@ msgstr "Contagem de alvos" msgid "Undock Target List" msgstr "Lista de Alvos flutuante" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Gravar Rasto" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "O rasto recentemente capturado deste alvo foi gravado.\n" "Quer continuar a gravação até o final da sessão actual do OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Pesquisa AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Parar rastreamento" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3302,7 +3302,7 @@ msgstr "Mover o Barco para aqui" msgid "Navigate To Here" msgstr "Navegar até aqui" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Modo Rumo para cima" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Modo Rumo Acima" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Modo Norte para cima" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Modo Carta para cima" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Mudar Ecrâ Completo" @@ -3346,7 +3346,7 @@ msgstr "Colar Percurso" msgid "CM93 Offset Dialog..." msgstr "CM93 diálogo de deslocamento..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Grupo de cartas" @@ -3464,7 +3464,7 @@ msgstr "Copiar como KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Apagar" @@ -3618,18 +3618,18 @@ msgstr "Enviar Percurso para OpenCPN Emparelhado" msgid "Chart Panel Options" msgstr "Opções do Painel de Carta" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Modo de navegação" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Norte para cima" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Proa para cima" @@ -3637,32 +3637,32 @@ msgstr "Proa para cima" msgid "Heading Up" msgstr "Proa acima" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Modo Mostrar antecipação" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Opções de Apresentação" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Habilitar Quilting de Cartas" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Mostrar Grelha" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Mostrar limites das Cartas" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Mostrar Unidades da Profundidade" @@ -3682,7 +3682,7 @@ msgstr "Marés e Correntes" msgid "Show Tide stations" msgstr "Mostrar estações de marés" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Mostrar Correntes" @@ -3698,8 +3698,8 @@ msgstr "Mostrar texto" msgid "Show depths" msgstr "Mostrar profundidade" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Legendas de bóias e luzes" @@ -3707,8 +3707,8 @@ msgstr "Legendas de bóias e luzes" msgid "Lights" msgstr "Luzes" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Características sinais luminosos" @@ -3724,18 +3724,18 @@ msgstr "Mostrar luzes do setor visíveis" msgid "Show chart data quality" msgstr "Mostrar qualidade de dados da carta" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Mostrar Categoria" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Padrão" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Todos" @@ -3780,7 +3780,7 @@ msgstr "Usar como catálogo ativo" msgid "Latest available catalog:" msgstr "Último catálogo disponível:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Não é possível obter dados do url" @@ -3835,8 +3835,8 @@ msgstr "Falha: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Responder 'Não' irá criar todos os pontos de passagem para esta rota." msgid "Merge waypoints?" msgstr "Combinar pontos de passagem?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "O MBTile necessita OpenGL para ser activado" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Pés" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metros" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Braças" @@ -4197,7 +4197,7 @@ msgstr "Braças" msgid "OverZoom" msgstr "Sobre Ampliado" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "ExtendedTideIcon" @@ -4213,7 +4213,7 @@ msgstr "Consulta Destino AIS" msgid "Show all AIS Targets" msgstr "Mostrar todos os alvos AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Atenuar alvos AIS menos críticos" @@ -4261,9 +4261,9 @@ msgstr "Deslocamento X do Utilizador" msgid "User Y Offset" msgstr "Deslocamento Y do Utilizador" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metros" @@ -4274,11 +4274,13 @@ msgstr "Esta Perna" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Legenda da consola" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Valor da consola" @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Título" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Menos" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Selecione a Ligação selecionada" @@ -4637,12 +4639,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Aviso OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Informação OpenCPN" @@ -4651,17 +4653,17 @@ msgstr "Informação OpenCPN" msgid "Sentence Filter" msgstr "Filtro de frase" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Seleccionar Tudo" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Limpar Tudo" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Adicionar" @@ -4692,59 +4694,59 @@ msgstr "Uma mensagem NMEA é geralmente de 3 caracteres de comprimento (como RMC msgid "REGEX syntax error: \n" msgstr "Erro de sintaxe REGEX: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Geral" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filtrar dados NMEA de rumo e velocidade" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Período de filtro (sec)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Mostrar janela de depuração NMEA" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Formatar uploads para Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Usar o modo de Garmin GRMN (Host) para uploads" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Ajustar prioridades de comunicação..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Ligações de dados" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Remover ligação" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Configurar nova conexão" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Instalar" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Reinstalar" @@ -4810,7 +4812,7 @@ msgstr "Reinstalar" msgid "Update" msgstr "Atualizar" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Regredir" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr " instalado com sucesso" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Instalação concluída" @@ -4848,6 +4850,21 @@ msgstr "Instalação concluída" msgid "Installation error" msgstr "Erro de instalação" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Marcas" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Alerta AIS" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "GridText" @@ -4860,7 +4877,7 @@ msgstr "Esperando por fim do processo de compressão da carta raster." msgid "OpenCPN Compressed Cache Update" msgstr "Atualização do cache comprimido do OpenCPN " -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Distância do próprio Barco: %4.0f NMi" @@ -4993,7 +5010,7 @@ msgstr "Este ponto de passagem é parte de uma camada e não pode ser editado" msgid "Icon" msgstr "Ícone" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Combo!" @@ -5003,7 +5020,7 @@ msgid "Links" msgstr "Ligações" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5044,22 +5061,22 @@ msgstr "Anéis de alcance" msgid "Number" msgstr "Número" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distância" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "&Cor:" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Nada" @@ -5149,16 +5166,16 @@ msgstr "Mostrar apenas em escala" msgid "Tide Station not found" msgstr "Estação de Maré não encontrada" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Definir escala" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Escala da Carta" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Persistente" @@ -5190,35 +5207,35 @@ msgstr "Janela de depuração NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Falha ao inicializar a interface do utilizador. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN não pode arrancar. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Os ficheiros de configuração necessários não foram encontrados. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Veja o ficheiro de log em " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " para detalhes." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -[Executar versão Portátil(-p) de " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Recuperar o diretório do conjunto inicial cartas do registo do Windows" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN Inicializado em %ld ms." @@ -5273,8 +5290,8 @@ msgstr "Tempo estimado : " msgid "Remaining time : " msgstr "Tempo restante: " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "Actualização Cartas OpenCPN" @@ -5282,277 +5299,277 @@ msgstr "Actualização Cartas OpenCPN" msgid "Anchorage created " msgstr "Ancoradouro criado " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Mostrar barra de ferramentas" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Ocultar Barra de Ferramentas" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "HOMEM AO MAR" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " em" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "em" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1.0 NM ao longo do COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Rota MOB temporária" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Ponto assumido 1 milha" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Tempo: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Posição: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Desativar o Rasto" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Ativar Gravação do Percurso" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Acompanhar Automaticamente" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Modo Proa Acima" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Ampliar" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Reduzir" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Carta de escala maior" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Carta de escala menor" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Sair do OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Navegar" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Mostrar Barra de Cartas" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Mostrar texto ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Mostrar faróis ENC" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Mostrar Batimetria ENC" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Mostrar informação de fundeio ENC" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Mostrar Qualidade dos Dados ENC" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Mostrar objetos de navegação" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Mostrar Marés" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Mudar Esquema de Cores" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Ver" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Mostrar Alvos AIS" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Ocultar alvos AIS atracados" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Mostra rasto dos alvos AIS" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Mostrar diálogos de alerta do CPA" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Soar alarmes CPA" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Mostrar avisos do CPA" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Medida de distância" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Rota && Gestor de Marcas..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Criar Rota" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Lançar Marca na Posição do Barco" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Lançar Marca na Posição do Cursor" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Lançar Marca de Homem ao Mar" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Preferências" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Ferramentas" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Janela" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Ajuda do OpenCPN" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Ajuda" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Por Favor, Reinicie OpenCPN para ativar linguagem ou alterações de estilo." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Navio " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Modo de rotação" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "ocorreu um problema a imprimir.\n" "A sua impressora pode não estar correctamente configurada" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Rota sem nome)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS DE HOMEM AO MAR" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Nosso Navio" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Rota de AISMOB temporária" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Mostrar o nosso navio" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Posição deste Barco: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " Posição do MOB: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "ATUALIZAÇÃO HOMEM AO MAR DO AIS" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Rota & Gestão de Marcas" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Imprimir Carta" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-espaço)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "Preparar OpenCPN ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC Completo." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5560,105 +5577,105 @@ msgstr "Criar um modelo de configuração privado baseado nas configurações at "Este modelo será guardado, e pode ser selecionado para ser usado em qualquer momento.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Propriedades estendidas do MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Acompanhamento" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Acompanhar por defeito" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Acompanhar sempre" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Nunca acompanhar" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Ignorar este MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Considerar este MMSI como SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Converter AIVDM para AIVDO para este MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Este MMSI é do meu seguidor - Sem alerta de CPA" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Um Id MMSI é geralmente um número de nove dígitos. \n" "Por favor verifique as suas entradas e cancele se necessário." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Por defeito" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Sempre" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Nunca" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Editar Propriedades do MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Propriedades do MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Modo de rastreio" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorar" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB (Homem ao mar)" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Nome do navio" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Seguidor" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Novo..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Adicionar Propriedades do MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5676,7 +5693,7 @@ msgstr "O dispositivo selecionado não é acessível; opencpn provavelmente não " KERNEL==\"ttyS *\", MODE= \"0666\"\n\n" "Para mais informações, consulte o arquivo LINUX_DEVICES.md nos manuais da distribuição.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5696,1180 +5713,1175 @@ msgstr "\n" " KERNEL==\"ttyS *\", MODE= \"0666\"\n\n" "Para mais informações, consulte o arquivo LINUX_DEVICES.md nos manuais da distribuição.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Comprimento da linha de previsão COG (em minutos)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Comprimento da linha de previsão de rumo (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Tipo de ícone do navios" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Bitmap à Escala Real" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Vectorial à Escala Real" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Comprimento de fora a fora (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Boca máxima (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Distância da antena GPS até à Proa (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Distância da antena GPS até à meia-nau (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Tamanho mínimo no ecrã (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Mostrar círculos de distância" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Distância entre anéis" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Unidade de Distância" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Milhas Náuticas" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilómetros" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Cor dos círculos de distância" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Mostrar direção para o Ponto de passagem Ativo" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Estilo" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Contínuo" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Ponto" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Traço longo" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Traço curto" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Ponto traço" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Cor por defeito" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Preto" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Vermelho escuro" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Verde escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Amarelo escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Azul escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Magenta escuro" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Ciano escuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Cinzento claro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Cinzento escuro" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Vermelho" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Verde" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Amarelo" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Azul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Ciano" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Branco" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Rastro" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Registo diário à meia noite" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Registo diário automático às" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Computador" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Destacar Percursos" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Cor de realce" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Precisão do Rastro" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Baixa" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Média" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Alta" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Calcular valores" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Calcular o SOG e COG de mudanças de posição" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Mínimo de segundos entre actualizações" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rotas/Pontos" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Novas rotas" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Ícone por defeito para marcas de pontos de passagem" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Raio do círculo do ponto de chegada (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Avanço de ponto de passagem da rota apenas na chegada" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Substituir as configurações para visibilidade baseada na escala da carta e mostrar sempre" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Cores dos anéis de distância a pontos de passagem" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Opções de controle" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Confirmar apagamento de percurso e rotas" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Ficheiros de cartas" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Diretórios" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Adicionar Diretório..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Remover selecionados" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Comprimir a seleção" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Adicionar.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Remover" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Comprimir" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Migrar cartas.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Controlo de Actualização" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Examinar cartas e atualizar base de dados" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Forçar a Reconstrução total da Base de Dados de Cartas" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Preparar todas cartas ENC" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modificado]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Modelos" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Estado do modelo" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Título do último modelo usado:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Modelos guardados" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Criar Configuração..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Eliminar configuração selecionada..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Aplicar configuração selecionada" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Criar Configuração" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Problemas a ativar a configuração selecionada." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avançado" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Inclinação de gráficos Raster" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Usar acelerador de gráficos (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Opções OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Tempo médio de rotação da carta" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "segundos" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Ampliação Carta/Ponderação Escala" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Matricial" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vectorial" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "Nível de Detalhe CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Largura física do ecrã" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Automático" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manual:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Apresentação de cartas" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Mostrar cartas digitalizadas distorcidas com o norte para cima" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Com um valor inferior, o mesmo nível de aumento mostra uma carta menos detalhada.\n" "Com um valor superior, o mesmo nível de aumento mostra uma carta mais detalhada." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Gráficos" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Apresentação de cartas vectoriais" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Standard Marítimo" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Sonda Reduzida" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Ícone" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Bóias e luzes" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Setores de luz estendidos" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Textos da carta" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Texto nacional na carta" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Só Texto Importante" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Desobstruir Texto" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Detalhe da carta" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Detalhe reduzido em escala pequena" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Estilo gráfico" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Carta em Papel" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Simplificados" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Limites" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Simples" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Com símbolos" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Cores" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Cores" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Cores" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Pouca profundidade" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Profundidade segura" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Águas livres" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Objetos standard de utilizador" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Repor STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Marés && Correntes" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Conjuntos de dados activos" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Adicionar ficheiro..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Todas as cartas disponíveis" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Remover carta" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Todas as Cartas" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Grupo Novo..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Apagar grupo" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Manter a escala quando mudar de carta" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Controles" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Ampliação / Deslocação suave" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Ampliação para Cursor" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Opções de apresentação" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Opção Barra de Estado" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "ETA dinâmico no Cursor" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Velocidade do barco por defeito " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Disposição da apresentação" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Barra de Estados" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Unidades" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Milhas terrestres" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Nós" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Profundidade" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatura" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Latitude/Longitude" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Graus, Minutos e Decimais" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Graus e Decimais" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Graus, Minutos e Segundos" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Direções" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Mostrar verdadeiro" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Mostrar magnético" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Variação magnética assumida" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "graus (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Mostrar marcações e proas verdadeiros" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Mostrar marcações e proas magnéticas." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Variação magnética calculada pela extensão WMM" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Para especificar a variação magnética manualmente,\n" " deve desactivar a extensão WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Teste" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Nome do ficheiro de áudio:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Seleccionar Som Alarme" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Sons" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Alarme de âncora" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Tocar som no Alarme de Âncora." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Selecionar Som do Alarme Âncora" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Tocar som no Alerta AIS." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Selecionar Som do Alerta AIS" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "Alerta SART " -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Tocar som no Alerta AIS SART." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Selecionar Som de Alerta AIS SART" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "Alerta DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Tocar som na notificação DSC." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Selecionar som de notificação DSC" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Dispositivo desconhecido:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Dispositivo de entrada:" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Dispositivo sonoro" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Comando de Reprodução de Áudio:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Alvos AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Cálculo do CPA (Closest Point of Approach)" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Não há alertas de (T)CPA se a distância do alvo for maior que (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Avisar se CPA for inferior a [NMi]:" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr " ...e se TCPA for inferior a [Minutos]:" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Alvo Perdido" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Marcar alvo como perdido após (Minutos)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Eliminar Alvos perdidos após [Minutos]:" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Apresentação" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Mostrar seta de previsão COG da embarcação alvo (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Sincronizar o comprimento da seta AIS com o previsão de COG do próprio navio" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Mostrar Rastro da Embarcação Alvo, comprimento (min)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Suprimir alvos ancorados/atracado, velocidade max (nós)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Desenhar previsão AIS em tempo real, velocidade mínima do alvo (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Permitir atenuação dos alvos menos críticos, se mais do que ... alvos" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Mostrar avisos de área (a partir de mensagens binárias de AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Mostrar tamanho real do alvo AIS" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Mostrar nomes com alvos AIS em escala maior que 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Usar mensagens de posição WPL. Ação quando recebida: " -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Indicação de Posição APRS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Criar marca" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Informação imediata" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Ativar rota / bloco de informação AIS" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Nome do Barco\" MMSI (Indicativo de chamada)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Classe] Tipo (Estado)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Alarmes CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Mostrar Janela de Alarmes CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Alarme Sonoro para alertas CPA/TCPA e emergências DSC/SART." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Suprimir alertas para alvos fundeados / atracados" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Activar limite de tempo de resposta de alerta de alvo (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Opções gerais" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Idioma" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Fontes" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Escolher Tipo Letra..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Escolher Cor de Letra..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Amostra" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Estilo da Barra de ferramentas e da janela" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Opções de Interface" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Mostrar Barra de Estado" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Mostrar Barra de Menu" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Mostrar Status da bússola/GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Activar ocultação automática barra ferramentas" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Tocar o sino do navio" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Activar a interface Touchscreen" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Activar a interface Scaled Graphics" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Botões de zoom visíveis" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Usar sistema Inland ECDIS" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Manual Inland ECDIS" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Fator de escala de Interface de utilizador" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Factor de escala dos Objetos na Carta" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Fator de escala do Barco" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "Fator de Sondagem ENC" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "Escala de Texto ENC" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Sensibilidade de zoom da roda do rato" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Aplicar" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Cartas" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Conexões" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Conectar" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Navios" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Interface de utilizador" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Utilizador" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Plugins" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Variação magnética definida pelo utilizador" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "pés" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "braças" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Adicionar um diretório contendo ficheiros de cartas" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - comprimento do seu barco deve ser > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - boca do seu barco deve ser > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - seu deslocamento GPS do meio do barco deve estar dentro da boca do seu barco" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - seu deslocamento GPS da proa deve estar dentro do comprimento do seu barco" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - tamanho mínimo do ícone do barco deve estar entre 1 e 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "As configurações para o tamanho real do seu barco não estão corretas:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "O Manual Inland de ECDIS não está disponível localmente." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Gostaria de visitar o site Manual iECDIS para mais informação?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6879,15 +6891,15 @@ msgstr "Compressão irá alterar ficheiros de cartas no disco. \n" "Cartas compactadas podem demorar um pouco mais a carregar e apresentar em alguns sistemas. \n" "Podem ser descompactadas novamente usando os programas unzip ou 7 zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Cartas compactadas OpenCPN" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Não há cartas para compactar." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6896,71 +6908,71 @@ msgstr "compactadas %ld cartas\n" "de %.1fMB para %.1fMB\n" "reduzido %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Digite o nome do grupo" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Novo grupo de cartas" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Selecione dados de maré/corrente" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Compressão de textura" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Compressão de textura com o cache" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Cache de compressão de textura" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Tamanho de memória de textura (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Tamanho: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Reconstruir o Cache de texturas" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Limpar o Cache de textura" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Suavização de polígono" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Suavização de Linha" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "OpenGL software (reiniciar OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Usar Visão Panoramica acelerada" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Configurações de textura" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Cache de texturas" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Diversos" @@ -7042,127 +7054,127 @@ msgstr "Por favor, verifique o log do sistema para mais informação." msgid " successfully installed from cache" msgstr " instalado do cache com sucesso" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Estas configurações podem desestabilizar o OpenCPN e estão desativadas por defeito. Para ativa-las manualmente apesar dos perigos, adicione uma linha CatalogExpert=1 na seção [PlugIns] no ficheiro de configuração." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Catálogo de Plugins" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Atualizar Catálogo de Plugins" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importar plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Configurações..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Desativado" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Atualizar Catálogo de Plugins: Master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN Atualização de Catálogo" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Não foi possível copiar ficheiro de catálogo" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Não foi possível copiar o ficheiro de catálogo para o cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Catálogo atualizado com sucesso" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Selecione um ficheiro tarball" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Erro de Importação de Plugin OpenCPN" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Detetado Plugin de importação incompatível." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Erro ao extrair o tarball de importação do plugin." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Catálogo Ativo" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Último Catálogo" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Última alteração:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Por favor, atualize o Catálogo de Plugins." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Desinstalar" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Ativo" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Atualizar para a versão " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Instalar..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Atualizar para " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Website" @@ -7207,10 +7219,6 @@ msgstr "Satélites" msgid "OpenCPN Server Message" msgstr "Mensagem do servidor OpenCPN" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Alerta AIS" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "TideCurrentGraphRollover" @@ -7328,12 +7336,6 @@ msgstr "Rota a partir do Percurso" msgid "Send to &Peer" msgstr "Enviar para &Emparelhado" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Marcas" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7537,15 +7539,15 @@ msgstr "mas a escala atual da carta é" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Portanto, o novo ponto de passagem não será visível a este nível de ampliação." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Ponto(s) de passagem transmitido(s)." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Erro na transmissão do Ponto de Passagem. GPS Garmin não conectado" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Erro na Transmissão do Ponto de Passagem. Por favor verifique o ficheiro de log..." @@ -7850,11 +7852,11 @@ msgstr " (setores de ângulos são direções verdadeiras do lado msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

A última execução de opencpn parece ter falhado. Você quer executar\n" "no modo de segurança sem plugins e outros recursos possivelmente problemáticos\n" "?\n" -"



Você pode considerar visitar a lista de problemas conhecidos.

" +"



Você pode considerar visitar a lista de problemas conhecidos.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7969,7 +7971,7 @@ msgstr "Hoje" msgid "Tomorrow" msgstr "Amanhã" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Dicas" @@ -8259,153 +8261,156 @@ msgstr "Mover ponto de passagem" msgid "Dismiss" msgstr "Dispensar" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_ro_RO.po b/po/opencpn_ro_RO.po index 686b928668..36b012e7dc 100644 --- a/po/opencpn_ro_RO.po +++ b/po/opencpn_ro_RO.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Romanian\n" "Language: ro_RO\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "" @@ -414,7 +414,7 @@ msgstr "" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "" @@ -476,7 +476,7 @@ msgstr "" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "" @@ -509,11 +509,11 @@ msgstr "" msgid "Left" msgstr "" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "" @@ -2435,8 +2435,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Despre OpenCPN" @@ -2482,9 +2482,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Opțiuni" @@ -2526,7 +2526,7 @@ msgstr "" msgid "Track properties" msgstr "Proprietățile Urmăriri" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2539,12 +2539,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2641,23 +2641,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3057,7 +3057,7 @@ msgstr "" msgid "Undefined (default)" msgstr "" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "" @@ -3068,7 +3068,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "" @@ -3084,7 +3084,7 @@ msgstr "" msgid "&Jump To" msgstr "" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "" @@ -3107,7 +3107,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "" @@ -3196,37 +3196,37 @@ msgstr "" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "" @@ -3280,7 +3280,7 @@ msgstr "" msgid "Navigate To Here" msgstr "" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "" @@ -3289,8 +3289,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "" @@ -3299,7 +3299,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3324,7 +3324,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3442,7 +3442,7 @@ msgstr "" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "" @@ -3596,18 +3596,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "" @@ -3615,32 +3615,32 @@ msgstr "" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "" @@ -3660,7 +3660,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "" @@ -3676,8 +3676,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "" @@ -3685,8 +3685,8 @@ msgstr "" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "" @@ -3702,18 +3702,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "" @@ -3758,7 +3758,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3813,8 +3813,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4146,28 +4146,28 @@ msgstr "" msgid "Merge waypoints?" msgstr "" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "" @@ -4175,7 +4175,7 @@ msgstr "" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4191,7 +4191,7 @@ msgstr "" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4239,9 +4239,9 @@ msgstr "" msgid "User Y Offset" msgstr "" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "" @@ -4252,11 +4252,13 @@ msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4292,12 +4294,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4326,7 +4328,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4615,12 +4617,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "" @@ -4629,17 +4631,17 @@ msgstr "" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "" @@ -4665,59 +4667,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4775,7 +4777,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4783,7 +4785,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4813,7 +4815,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4821,6 +4823,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4833,7 +4850,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -4954,7 +4971,7 @@ msgstr "" msgid "Icon" msgstr "" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4964,7 +4981,7 @@ msgid "Links" msgstr "" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5005,22 +5022,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "" @@ -5109,16 +5126,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "" @@ -5150,35 +5167,35 @@ msgstr "" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5226,8 +5243,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5235,379 +5252,379 @@ msgstr "" msgid "Anchorage created " msgstr "" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr "" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "" -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5618,7 +5635,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5630,1259 +5647,1254 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "" @@ -6959,127 +6971,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7124,10 +7136,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7245,12 +7253,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7448,15 +7450,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7759,7 +7761,7 @@ msgstr "" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7875,7 +7877,7 @@ msgstr "" msgid "Tomorrow" msgstr "" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "" @@ -8156,153 +8158,156 @@ msgstr "" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_ru_RU.po b/po/opencpn_ru_RU.po index 718b794c72..884de964eb 100644 --- a/po/opencpn_ru_RU.po +++ b/po/opencpn_ru_RU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(безымянный путь)" @@ -414,7 +414,7 @@ msgstr "Поисково-спасательный самолёт" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "Идентификатор морской передвижной службы" @@ -476,7 +476,7 @@ msgstr " (последнее известное)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Местоположение" @@ -509,11 +509,11 @@ msgstr "Вправо" msgid "Left" msgstr "Влево" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Скорость" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Высота:" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "Скорость ветра" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Навигационные сооружения" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Базовый" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "см." #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "миль/ч" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "км/ч" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "м/с" @@ -2452,8 +2452,8 @@ msgstr "Путевые точки будут переименованы в со "Вы хотите переименовать путевые точки?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "О программе OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Перезаписать маршрут Garmin устройства но msgid "OpenCPN Message" msgstr "OpenCPN сообщение" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Настройки" @@ -2543,7 +2543,7 @@ msgstr "Печать выбранного трека" msgid "Track properties" msgstr "Параметры пути" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2556,12 +2556,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "API Модуля: " msgid "OpenCPN Website" msgstr "Сайт OpenCPN" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "Документация помощи OpenCPN недоступна локально." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Хотите посетить сайт opencpn.org для получения дополнительной информации?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Отмена ограничений(?) согласно AIS Message Link msgid "Undefined (default)" msgstr "Не определено (по умолчанию)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Наименование цели АИС" @@ -3089,7 +3089,7 @@ msgstr "\n" "Поэтому постоянная запись трека будет перезапущена для этой цели.\n\n" "Вы хотите остановить постоянное отслеживание для этой цели?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "АИС" @@ -3105,7 +3105,7 @@ msgstr "&Выключить сигнал тревоги" msgid "&Jump To" msgstr "&Показать опасность" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Создать путевую точку" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "—" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Список целей АИС" @@ -3217,38 +3217,38 @@ msgstr "Количество целей" msgid "Undock Target List" msgstr "Открепить Список целей АИС" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Записать путь" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Путь движения этой цели был записан.\n" "Желаете продолжить запись до конца текущего сеанса работы OpenCPN?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Сведения о цели АИС" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "OK" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Прекратить отслеживание" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Меню" @@ -3302,7 +3302,7 @@ msgstr "Поместить судно в эту точку" msgid "Navigate To Here" msgstr "Маршрут в эту точку" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Ориентация Карты по Курсу" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Ориентация карты по направлению" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Ориентация Карты по Северу" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Ориентация Карты Согласно Карте" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Полноэкранный режим" @@ -3346,7 +3346,7 @@ msgstr "Вставить путь из буфера" msgid "CM93 Offset Dialog..." msgstr "Корректировка сдвига карт CM93..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Группы карт" @@ -3464,7 +3464,7 @@ msgstr "Скопировать в буфер в формате KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Удалить" @@ -3618,18 +3618,18 @@ msgstr "Отправить путь(и) в OpenCPN по Сети" msgid "Chart Panel Options" msgstr "Параметры Отображения Карты" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Режим Ориентации Карты" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "По Северу" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "По Курсу" @@ -3637,32 +3637,32 @@ msgstr "По Курсу" msgid "Heading Up" msgstr "По Направлению" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Заглядывать вперёд по курсу" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Параметры Отображения" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Сшивание Карты из Фрагментов" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Координатная Сетка" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Рамки Карт" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Единицы Измерения Глубины" @@ -3682,7 +3682,7 @@ msgstr "Приливы и течения" msgid "Show Tide stations" msgstr "Станции Прилива\\Отлива" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Приливные Течения" @@ -3698,8 +3698,8 @@ msgstr "Надписи на карте" msgid "Show depths" msgstr "Отметки Глубин" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Надписи к буям / маякам" @@ -3707,8 +3707,8 @@ msgstr "Надписи к буям / маякам" msgid "Lights" msgstr "Огни" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Характеристики Огней" @@ -3724,18 +3724,18 @@ msgstr "Видимые сектора маяков" msgid "Show chart data quality" msgstr "Показать качество данных ENC" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Отображаемый набор объектов карты" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Стандартный" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Все объекты" @@ -3780,7 +3780,7 @@ msgstr "Использовать в качестве активного ката msgid "Latest available catalog:" msgstr "Последний доступный каталог:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Не удается загрузить данные из url" @@ -3835,8 +3835,8 @@ msgstr "Ошибка: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "При ответе «Нет» будут созданы все нов msgid "Merge waypoints?" msgstr "Объединить путевые точки?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Плечо маршрута" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "Для MBTile требуется включить OpenGL" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "фт" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "м" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "мор. саж" @@ -4197,7 +4197,7 @@ msgstr "мор. саж" msgid "OverZoom" msgstr "Завышение масштаба" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Значок прилива" @@ -4213,7 +4213,7 @@ msgstr "Сведения о цели АИС" msgid "Show all AIS Targets" msgstr "Цели АИС" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Уменьшать некритические цели АИС" @@ -4261,9 +4261,9 @@ msgstr "Поправка по X" msgid "User Y Offset" msgstr "Поправка по Y" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "м" @@ -4274,11 +4274,13 @@ msgstr "Плечо" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Консоль маршрута, надпись" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Консоль маршрута, значение" @@ -4314,12 +4316,12 @@ msgstr "ETA (VMG)" msgid "ETA @SOG" msgstr "ETA (SOG)" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Название" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Меньше" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Изменить подключение" @@ -4637,12 +4639,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN — Предупреждение" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN — Сведения" @@ -4651,17 +4653,17 @@ msgstr "OpenCPN — Сведения" msgid "Sentence Filter" msgstr "Фильтр предложений" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Выбрать все" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Снять выделение" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Добавить" @@ -4693,59 +4695,59 @@ msgstr "Код сообщения NMEA обычно состоит из 3-х  msgid "REGEX syntax error: \n" msgstr "Синтаксическая ошибка REGEX: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Общие параметры" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Фильтровать данные о курсе и скорости" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Период фильтрации, сек." -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Отладочное окно NMEA протокола" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Протокол отправки данных FURUNO GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Использовать протокол Garmin при загрузке данных" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Настройка приоритетов" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Навигационные Датчики" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "Добавить" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "Редактировать" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Удалить" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Настроить новый датчик" @@ -4803,7 +4805,7 @@ msgid "Install" msgstr "Установить" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Переустановить" @@ -4811,7 +4813,7 @@ msgstr "Переустановить" msgid "Update" msgstr "Обновить" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Понизить версию" @@ -4841,7 +4843,7 @@ msgid " successfully installed" msgstr " успешно установлено" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Установка завершена" @@ -4849,6 +4851,21 @@ msgstr "Установка завершена" msgid "Installation error" msgstr "Ошибка установки" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Метки" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "Всплывающая подсказка о цели АИС" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "Градусная Сетка" @@ -4861,7 +4878,7 @@ msgstr "Ожидается завершение сжатия растровой msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN — Обновление кэша текстур" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Расстояние от собственного судна: %4.0f м. м." @@ -4992,7 +5009,7 @@ msgstr "Редактирование невозможно" msgid "Icon" msgstr "Значок" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Комбинация! (Фаталити?)" @@ -5002,7 +5019,7 @@ msgid "Links" msgstr "Гиперссылки" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5043,22 +5060,22 @@ msgstr "Количество колец" msgid "Number" msgstr "Номер" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Расстояние" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Цвет:" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Нет" @@ -5148,16 +5165,16 @@ msgstr "Показывать только на масштабе" msgid "Tide Station not found" msgstr "Приливная станция не найдена" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Установить масштаб" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Масштаб Карты" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Постоянно" @@ -5189,35 +5206,35 @@ msgstr "Отладочное окно NMEA протокола" msgid "Cannot load route or waypoint file: " msgstr "Не удается загрузить маршрут или файл точки маршрута: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Не удалось инициализировать пользовательский интерфейс." -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "Программа OpenCPN не может запуститься. " -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Необходимые файлы настроек не были найдены. " -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "См. файл журнала работы " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " для уточнения деталей." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Портативный комплект (-p) выполняется из папки " -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Получение первоначального каталога карт из реестра Windows" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "Инициализация OpenCPN выполнена за %ld мс." @@ -5270,8 +5287,8 @@ msgstr "Предполагаемое время: " msgid "Remaining time : " msgstr "Оставшееся время: " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "OpenCPN — Обновление карт" @@ -5279,277 +5296,277 @@ msgstr "OpenCPN — Обновление карт" msgid "Anchorage created " msgstr "Якорная стоянка " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Показать панель инструментов" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Скрыть панель инструментов" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "ЧЕЛОВЕК ЗА БОРТОМ" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " в " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " на " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1 ММ по COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Временный маршрут «Человек за бортом»" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Предполагаемая 1-мильная точка" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Время: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Положение: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Выключить отслеживание пути" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Включить отслеживание пути" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Автоматически центрировать" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "По Направлению" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Приблизить" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Отдалить" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Карта большего масштаба" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Карта меньшего масштаба" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Выйти из OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Навигация" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Панель Выбора Карт" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Надписи на карте" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Огни" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Отметки Глубин" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Якорная Информация" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Качество данных ENC" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Навигационные Объекты (Маршруты, Пути, Пут.Точки)" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Станции Прилива\\Отлива" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Сменить цветовую схему" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Вид" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Цели АИС, САРП, ЦИВ" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Скрывать пришвартованные цели АИС" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Показывать пути целей АИС" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Показывать предупреждения о столкновении" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Звуковое предупреждение о столкновении" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Показывать предупреждения о Столкновении" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&АИС" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Измерение Расстояния" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Диспетчер маршрутов и меток..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Создать маршрут" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Поставить метку под судном" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Поставить метку под курсором" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Установить метку «Человек за бортом»" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Настройки" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "&Инструменты" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Окно" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "Справка по OpenCPN" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Помощь" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Пожалуйста, перезапустите OpenCPN, чтобы активировать изменения языка или стиля." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Судно " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Режим Циркуляции" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "При печати возникла проблема.\n" "Возможно, ваш принтер неправильно настроен." -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(безымянный маршрут)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "АИС - ЧЕЛОВЕК ЗА БОРТОМ" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Собственное судно" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Временный маршрут до человека за бортом" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Текущее местоположение" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Местоположение: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " Местоположение ЧЗБ " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "АИС - ЧЗБ - ОБНОВЛЕНО" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Диспетчер маршрутов и меток" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Напечатать карту" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Пробел)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "OpenCPN — Подготовка карт" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "Подготовка карты завершена." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5557,105 +5574,105 @@ msgstr "Создать шаблон конфигурации на основе "Этот шаблон будет сохранен и может быть выбран для дальнейшего использования в любое время.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Расширенные характеристики MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Отслеживание пути" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Отслеживание пути по умолчанию" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Всегда" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "Никогда" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Игнорировать данный идентификатор" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Воспринимать этот идентификатор как спасательный маяк" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Преобразовывать сообщения AIVDM от этого объекта в сообщения AIVDO" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Это судно следует рядом — не требует предупреждения" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Идентификатор судна (MMSI) должен состоять из 9 цифр.\n\n" "Исправьте введённый номер или отмените операцию." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "По умолчанию" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Всегда" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Никогда" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Редактировать параметры судна" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Параметры идентифицированного судна" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Режим отслеживания пути" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Игнорирование" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "Человек за бортом" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM→VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Название судна" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Отслеживание" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Добавить судно…" -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Добавить параметры идентифицированного судна" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5673,7 +5690,7 @@ msgstr "Выбранное устройство недоступно. Опция " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Для получения дополнительной информации см. файл LINUX_DEVICES. d в документации.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5693,1179 +5710,1174 @@ msgstr "\n" " КЕРНЕЛ==\"ttyS*\", MODE=\"0666\"\n\n" "Подробнее см. в файле LINUX_DEVICES. d в документации.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Линия курса COG, длина (мин)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Линия истинного путевого угла HDT, длина (м. м.)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Тип значка судна" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Растровый в масштабе" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Векторный в масштабе" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Общая длина, м" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Общая ширина, м" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Смещение GPS относительно носа (по длине), м" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Смещение GPS относительно киля (по ширине), м" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Минимальный размер на экране, мм" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Кольца дальности" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Расстояние между кольцами" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Единицы расстояния" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "м. м." -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "км" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Цвет Кольца Дальности" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Показать направление к активной путевой точке" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Стиль:" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Сплошной узор" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Точечный узор" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Длинный пунктир" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Короткий пунктир" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Точечный пунктир" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Цвет по умолчанию" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Чёрный" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Тёмно-красный" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Тёмно-зелёный" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Тёмно-жёлтый" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Тёмно-синий" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Тёмно-малиновый" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Тёмно-голубой" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Светло-серый" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Тёмно-серый" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Красный" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Зелёный" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Жёлтый" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Синий" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Малиновый" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Голубой" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Белый" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Пути" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Разбивать путь по суткам в полночь" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Разбивать путь по суткам в указанное время" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Местное" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "Гринвич (UTC)" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "Астрономическое" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Подсвечивать пути" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Цвет Подсветки" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Точность отслеживания пути" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Низкая" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Средняя" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Высокая" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Расчет значений" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Вычислять SOG и COG от изменения позиции" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Минимум секунд между обновлениями" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Маршруты/Метки" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Новый маршрут" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Активный маршрут" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Сохранять активный маршрут, автоматически активировать при запуске" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Значок Пут.точки по умолчанию" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Точность подхода к путевой точке, м. м." -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Переходить к следующей путевой точке только по прибытию в очередную точку" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "Новая Метка" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "Значок метки по умолчанию" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "Показывать метки на масштабе более 1:" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Переопределить настройки видимости на основе масштаба и показать всегда" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "Кольца дальности метки" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Цвет колец" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Настройки управления" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "Зафиксировать метки (если не открыт диалог параметров)" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Подтверждать удаление путей и маршрутов" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Файлы карт" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Папки" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Добавить папку…" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Удалить выделенное" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Сжать выделенное" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Добавить.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Удалить" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Сжать" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Перенос Карт..." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Управление обновлением" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Просканировать карты и обновить базу данных" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Принудительно выполнить полное перестроение базы данных" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Подготовить все карты ЭНК" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Изменен]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Шаблоны" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Статус шаблона" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Последнее название шаблона:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Сохраненные шаблоны" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Создать конфигурацию..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Удалить выбранную конфигурацию..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Применить выбранные настройки" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Создать конфигурацию" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Проблема при использовании выбранной конфигурации." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Дополнительно" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Спрямлять наклонённые растровые карты" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Использовать видеоускорение OpenGL" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Параметры OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Среднее время поворота карты" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "с" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Баланс масштаба и детализации" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Растр" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Вектор" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "Уровень детализации CM93" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Физическая ширина экрана" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Автоматически" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Вручную:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "мм" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Отображение карт" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Ориентировать наклонённые растровые карты на север" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Меньшее значение понижает детализацию при том же масштабе.\n" "Большее значение повышает детализацию при том же масштабе." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Видеографика" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Панель карт" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Показать расширенную информацию в панели карт." -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Векторные карты" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Объекты по выбору" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Отметки глубин" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Мета-информация на карте" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Буи и маяки" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Расширенное отображение секторов Огней" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Надписи на карте" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Надписи на карте (национальный язык)" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Только важные надписи" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Не загромождающие надписи" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Детализация" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Пониженная детализация при малом масштабе" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "Дополнительное уменьшение деталей при малом масштабе" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Стиль элементов" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Бумажная карта" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Упрощённо" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Границы" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Простые" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Символьные" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Область глубины" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 цвета" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 цвета" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Мелководье" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Безопасная глубина" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Большая глубина" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Пользовательский" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Сброс к стандартному набору" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Приливы и течения" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Активные наборы данных" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Добавить данные…" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Все доступные карты" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Убрать карты" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Все карты" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Новая группа…" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Удалить группу" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Сохранять масштаб при смене карт" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Органы управления" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Плавное панорамирование и приближение" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Масштабировать карту под курсором" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Экранные элементы" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Параметры Строки состояния" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Вычисление ETA под курсором" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Скорость Судна по Умолчанию " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Макет Представления Экрана Карты" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Строка состояния" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Единицы измерения" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "с. м." -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "уз." -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "с. м./ч" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Глубина" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Температура" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Цельсий" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Фаренгейт" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Кельвин" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Координаты" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Градусы, минуты и доли" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Градусы и доли" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Градусы, минуты, секунды" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Пеленги" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Показывать истинное значение" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Показать магнитный" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Предполагаемое магнитное склонение" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "° (−W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Скорость ветра" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Истинные пеленги и путевые углы" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Магнитные пеленги и путевые углы" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Магнитное склонение, вычисленное плагином WMM" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "Чтобы задать магнитное склонение вручную, необходимо отключить плагин WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Тест" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Имя аудио файла:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Выберите звуковой файл" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Тревоги" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Якорная Стоянка" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Воспроизводить звук" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Выбрать звук" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Воспроизводить звук" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Выбрать звук" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "РЛО/SART" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Воспроизводить звук" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Выбрать звук" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "ЦИВ/DSC" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Воспроизводить звук" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Выбрать звук" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Конфигурации звукового устройства" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Неизвестное устройство:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Устройства ввода :" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Звуковое Устройство" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Команда Воспроизведения Аудио:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Цели АИС, САРП, ЦИВ" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Вычисление точки минимального подхода" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Игнорировать далёкие цели / Граница поиска опасностей, м. м." -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Предупреждать об опасном сближении / Граница зоны безопасности, м. м." -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "…когда время подхода меньше заданного, мин." -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Потерянные цели" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Считать цели потерянными по прошествии времени / Период молчания, мин." -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Удалять потерянные цели по прошествии времени / Период устаревания, мин." -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Отображение" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Линия курса цели, длинна (мин)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Синхронизация вектора направления AIS с предиктором COG собственного судна" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Путь цели, длина (мин)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Скрывать неподвижные и пришвартованные цели / Макс. скорость, уз." -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Прогнозирование положения АИС цели, мин скорость цели (уз.)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Разрешить уменьшение менее важных целей при большом количестве целей" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Районные извещения" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Значки целей АИС в полную величину" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Названия целей АИС при масштабе крупнее 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Использовать сообщения позиции WPL. Действие при получении:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "Позиция APRS" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Создать метку" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Всплывающая подсказка о цели" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Включить блок информации о маршруте/АИС" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "✓ «Наименование судна» MMSI-номер (Позывной)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Класс] Тип (Статус)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "Скорость и курс" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "Дистанция минимального подхода и время до сближения" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Предупреждение об опасном сближении" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Диалог предупреждения о сближении" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Издавать звук при опасном сближении и экстренных случаях" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Тест звука оповещения AIS" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Подавлять сигналы о сближении с неподвижными целями" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Повторять предупреждение по прошествии времени, мин." -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Общие параметры" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Язык" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Шрифты" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Выбрать шрифт…" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Выбрать цвет шрифта…" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Пример" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Стиль интерфейса" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Параметры пользовательского интерфейса" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Строка Состояния" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Строка Меню [постоянно]" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Индикатор Ориентации Карты и Состояния ГНСС" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Автоматически скрывать панель инструментов через" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Издавать регулярные сигналы судового колокола" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Интерфейс для сенсорных экранов" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Масштабирование графического интерфейса" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Показать кнопки изменения масштаба" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Использовать Inland ECDIS" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "Руководство inland ECDIS" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Масштаб графического интерфейса" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Масштаб точечных объектов" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Коэффициент масштабирования судна" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "Размер отметок глубин ENC" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "Размер Надписей ENC" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Чувств. масш. колесом мыши" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Применить" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Карты" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Соединения" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Подключение" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Суда" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Интерфейс" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Пользователь" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Модули" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Заданное магнитное склонение" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "фт" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "саж." -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Укажите папку, где лежат карты." -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " — длина вашего судна должбна быть > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " — ширина вашего судна должна быть > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " — смещение GPS от миделя должно быть в пределах ширины вашего судна" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " — смещение GPS от носа должно быть в пределах длины вашего судна" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " — минимальный размер значка вашего судна должен быть от 1 до 100 мм" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Настройка размера вашего судна произведена некорректно:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Руководство по ECDIS для внутренних водных путей не доступно локально." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Хотите посетить сайт i-ECDIS для получения дополнительной информации?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6875,15 +6887,15 @@ msgstr "Файлы карт на диске будут изменены в п "Загрузка и отображение сжатых карт происходит медленнее обычного.\n" "Карты можно будет распаковать обратно, используя программы unxz или 7-Zip." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN — Сжатие карт" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Не найдено карт для сжатия." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6892,71 +6904,71 @@ msgstr "сжато %ld карт\n" "из %.1f Мбайт в %.1f Мбайт\n" "сохранено %.1f Мбайт (%.1f %%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Введите имя группы" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Новая группа карт" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Выберите источник данных о приливах и течениях" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Сжатие текстур" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Сжатие текстур и кэширование" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Кэширование сжатых текстур" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Размер памяти текстур, Мбайт" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Объём: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Пересоздать кэш текстур" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Очистить кэш текстур" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Сглаживание полигонов" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Сглаживание линий" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Программная отрисовка (требуется перезапуск)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Использовать видеоускорение OpenGL" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Параметры текстур" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Кэш-память текстур" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Прочее" @@ -7037,127 +7049,127 @@ msgstr "Пожалуйста, проверьте системный журнал msgid " successfully installed from cache" msgstr " успешно установлен из кэша" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Эти настройки могут дестабилизировать OpenCPN и по умолчанию отключены. Несмотря на опасности, они вручную добавляют строку catalalogExpert=1 в раздел [PlugIns] в файле конфигурации." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Каталог Модулей" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Обновить каталог модулей" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Импортировать модуль..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Настройки..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Отключено" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Каталог обновления модулей: Мастер" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN — Обновление каталога" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Не удалось скопировать файл каталога" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Не удалось скопировать файл каталога в кэш" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Обновление каталога успешно" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Выбрать файл архива" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Ошибка извлечения метаданных из tarball." -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN — Ошибка импорта модуля" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Обнаружен несовместимый модуль импорта." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Ошибка при извлечении архива модуля импорта." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Модули расширения" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "Успешно импортировано" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Активный каталог" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Последний каталог" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Последнее изменение: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Обновите каталог модулей." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Удалить" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Удалить модуль" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Удалить установку" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Включено" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Обновить до версии " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Установить..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Обновить до " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Сайт" @@ -7202,10 +7214,6 @@ msgstr "Спутники" msgid "OpenCPN Server Message" msgstr "OpenCPN — Сообщение сервера" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "Всплывающая подсказка о цели АИС" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Графики приливов и течений" @@ -7323,12 +7331,6 @@ msgstr "Маршрут из Пути" msgid "Send to &Peer" msgstr "Отправить в OpenCPN по Сети" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Метки" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "Показать все метки" @@ -7532,15 +7534,15 @@ msgstr "но текущий масштаб карты" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Поэтому новая Пут.точка не будет видна на этом уровне масштаба." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "Путевая точка(и) переданы." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Ошибка при передаче Путевой точки. Не подключён GPS-приёмник Garmin." -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Ошибка при передаче Путевой точки. Проверьте файл журнала." @@ -7845,7 +7847,7 @@ msgstr "(Углы секторов являются истинны msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

OpenCPN запустится в безопасном режиме без модулей и других возможных проблемных функций.

" #: gui/src/safe_mode_gui.cpp:38 @@ -7962,7 +7964,7 @@ msgstr "Сегодня" msgid "Tomorrow" msgstr "Завтра" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Всплывающие подсказки" @@ -8252,153 +8254,156 @@ msgstr "Передвинуть пут. точку" msgid "Dismiss" msgstr "Отклонить" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_sv_SE.po b/po/opencpn_sv_SE.po index 8fc7f56267..ba2a8c8e47 100644 --- a/po/opencpn_sv_SE.po +++ b/po/opencpn_sv_SE.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Ej namngivet spår)" @@ -414,7 +414,7 @@ msgstr "SAR Flygplan" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr "(Senaste kända)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Position" @@ -509,11 +509,11 @@ msgstr "Höger" msgid "Left" msgstr "Vänster" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Fart" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Altitud" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "vindhastighet" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Navigationshjälp" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Bas" @@ -2263,21 +2263,21 @@ msgid "cm" msgstr "cm" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "mph" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/t" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2452,8 +2452,8 @@ msgstr "Waypoints kommer att döpas om för att återspegla den naturliga ordnin "Vill du byta namn på waypoints?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Om OpenCPN" @@ -2499,9 +2499,9 @@ msgstr "Skriva över Garminenhetens ruttnummer 1?" msgid "OpenCPN Message" msgstr "OpenCPN meddelande" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Användarinställningar" @@ -2543,7 +2543,7 @@ msgstr "Skriv ut valda Rutter" msgid "Track properties" msgstr "Spåregenskaper" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "OpenCPN Hjälp med de första inställningarna" @@ -2556,12 +2556,12 @@ msgstr "OpenCPN Hjälp med de första inställningarna" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2659,23 +2659,23 @@ msgstr "Plugin API: " msgid "OpenCPN Website" msgstr "OpenCPN hemsida" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN hjälpdokumentation finns inte lokalt." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Vill du besöka webbplatsen opencpn.org mer information?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3075,7 +3075,7 @@ msgstr "Annullering - annullering av område som anges av meddelandets ID" msgid "Undefined (default)" msgstr "Odefinierad" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS Målnamn" @@ -3089,7 +3089,7 @@ msgstr "\n" "En ständigt spår kommer därför att startas om för detta mål.\n\n" "Vill du istället avsluta ständigt spår för detta mål?\n" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS-Varning" @@ -3105,7 +3105,7 @@ msgstr "&Tysta larmet" msgid "&Jump To" msgstr "&Hoppa till" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Skapa waypoint" @@ -3128,7 +3128,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS lista" @@ -3217,38 +3217,38 @@ msgstr "Antal AIS-mål" msgid "Undock Target List" msgstr "Frikoppla AIS mållista" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Visa/spara spår" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Spåret efter detta mål kommer nu att sparas och visas oavbrutet.\n" "Om funktionen inte avslutas kommer den att vara aktiv tills OpenCPN avslutas. OK?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS-fartygsegenskaper" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Ok" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Avsluta spår" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Meny" @@ -3302,7 +3302,7 @@ msgstr "Flytta båten hit" msgid "Navigate To Here" msgstr "Starta navigering hit" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Visa kurs uppåt (COG)" @@ -3311,8 +3311,8 @@ msgid "Heading Up Mode" msgstr "Visa kompasskurs uppåt" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Visa Norr uppåt" @@ -3321,7 +3321,7 @@ msgid "Chart Up Mode" msgstr "Visa Norr uppåt" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Växla helskärm" @@ -3346,7 +3346,7 @@ msgstr "Klistra in spår" msgid "CM93 Offset Dialog..." msgstr "CM93-korrektion..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Sjökortsbuntar" @@ -3464,7 +3464,7 @@ msgstr "Kopiera som KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Ra&dera" @@ -3618,18 +3618,18 @@ msgstr "Skicka spåret till annan OCPN" msgid "Chart Panel Options" msgstr "Anpassa sjökortet" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Navigeringsläge" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Norr upp" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Kurs upp (COG)" @@ -3637,32 +3637,32 @@ msgstr "Kurs upp (COG)" msgid "Heading Up" msgstr "Kompasskurs upp" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Se mer kort förut" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Skärminställningar" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Aktivera sömlös visning" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Visa lat/long-linjer" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Visa sjökortsgränser" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Visa sjökortets djupenhet" @@ -3682,7 +3682,7 @@ msgstr "Tidvatten och strömmar" msgid "Show Tide stations" msgstr "Visa tidvattenstationer" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Visa strömmar" @@ -3698,8 +3698,8 @@ msgstr "Visa text" msgid "Show depths" msgstr "Visa djupinfo" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Namn på bojar och fyrar" @@ -3707,8 +3707,8 @@ msgstr "Namn på bojar och fyrar" msgid "Lights" msgstr "Fyr/boj-ljus" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Visa fyrkaraktärer" @@ -3724,18 +3724,18 @@ msgstr "Visa synliga fyrsektorer" msgid "Show chart data quality" msgstr "Visa status för sjökortsunderlaget" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Grundinställning" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standard" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Alla" @@ -3780,7 +3780,7 @@ msgstr "Använd som aktiv katalog" msgid "Latest available catalog:" msgstr "Senaste tillgängliga katalog:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "Kan inte ladda ner internetdata, url." @@ -3835,8 +3835,8 @@ msgstr "Misslyckades: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4168,28 +4168,28 @@ msgstr "Om du svarar \"Nej\" kommer helt nya waypoint:er att skapas för den hä msgid "Merge waypoints?" msgstr "Slå samman waypoints?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Rutt/Beninformation \"Rulla över\"" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "OpenGl måste vara aktiverad för att visa MBTiles" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Fot" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Meter" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Famnar" @@ -4197,7 +4197,7 @@ msgstr "Famnar" msgid "OverZoom" msgstr "Överzoom" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Utökad tidvattensymbol" @@ -4213,7 +4213,7 @@ msgstr "Visa AIS info " msgid "Show all AIS Targets" msgstr "Visa alla AIS-mål" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Förminska oprioriterade AIS-Mål" @@ -4261,9 +4261,9 @@ msgstr "Anpassad X-korrektion" msgid "User Y Offset" msgstr "Anpassad Y-korrektion" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "meter" @@ -4274,11 +4274,13 @@ msgstr "Ben" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Aktiv rutt. Rubriker" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Aktiv rutt-värden " @@ -4314,12 +4316,12 @@ msgstr "ETA @VMG" msgid "ETA @SOG" msgstr "ETA @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Titel" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4348,7 +4350,7 @@ msgid "Less" msgstr "Mindre" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "Redigera markerad anslutning" @@ -4637,12 +4639,12 @@ msgstr "Om du aktiverar den inmatningen använd filter på båda anslutningarna msgid "Or consider using a different data port for one of them" msgstr "Eller överväg att använda en annan dataport för en av dem" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN varning" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN Information" @@ -4651,17 +4653,17 @@ msgstr "OpenCPN Information" msgid "Sentence Filter" msgstr "Meddelandefilter" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Välj alla" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Rensa alla" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Lägg till" @@ -4692,59 +4694,59 @@ msgstr "En NMEA-mening är i allmänhet 3 tecken lång (som RMC, GGA etc.\n" msgid "REGEX syntax error: \n" msgstr "REGEX syntaxfel: \n" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Allmänna inställningar" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "Filtrera NMEA kurs- och hastighetsdata" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "Filterperiod (sek)" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "Visa fönster med NMEA0183 dataström" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "Formatera för överföring till Furuno GP3X" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "Använd Garmin GRMN/GRMN (Host) läge vid uppladdning." -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "Använd magnetisk bäring för utgående meddelande (EC)APB" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" -msgstr "NMEA0183 Talker ID" - -#: gui/src/connections_dialog.cpp:200 +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 msgid "Adjust communication priorities..." msgstr "Justera prioriteringsordning för data ..." -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" +msgstr "NMEA0183 Talker ID" + +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "Dataanslutning" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "Lägg till anslutning..." -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "Redigera anslutning..." -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "Ta bort anslutning" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "Skapa en ny anslutning" @@ -4802,7 +4804,7 @@ msgid "Install" msgstr "Installera" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Installera igen" @@ -4810,7 +4812,7 @@ msgstr "Installera igen" msgid "Update" msgstr "Uppdatera" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Nedgradera" @@ -4840,7 +4842,7 @@ msgid " successfully installed" msgstr " Installationen lyckades" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "Installation slutförd" @@ -4848,6 +4850,21 @@ msgstr "Installation slutförd" msgid "Installation error" msgstr "Installationen misslyckades" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "Punkter WP" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS \"Rulla över\"" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "Text på vektorsjökort" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "GridText" @@ -4860,7 +4877,7 @@ msgstr "Väntar på att komprimering av rasterkort skall avslutats." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN Uppdatera lagring av komprimerad data" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Avstånd från båten: %4.0f NMi" @@ -4997,7 +5014,7 @@ msgstr "Denna Waypoint tillhör ett lager och kan inte ändras" msgid "Icon" msgstr "Symbol" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Kombo!" @@ -5007,7 +5024,7 @@ msgid "Links" msgstr "Länkar" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5048,22 +5065,22 @@ msgstr "Avståndsringar" msgid "Number" msgstr "Antal" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Distans" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Färg" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Ingen" @@ -5153,16 +5170,16 @@ msgstr "Visa bara om skalan" msgid "Tide Station not found" msgstr "Tidvattenstationen hittades inte" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "Ange skala" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "Sjökortsskala" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Ständigt" @@ -5194,35 +5211,35 @@ msgstr "NMEA felsökningsfönster" msgid "Cannot load route or waypoint file: " msgstr "Kan inte ladda rutt eller waypoint-fil: " -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "Användargränssnittet kan inte startas. " -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "OpenCPN kan inte starta." -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "Konfigurationsfilen hittades inte." -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "Se loggfilen på " -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr " för ytterligare information." -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr " -- [Flyttbar version (-p) körs från" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "Hämtar sökväg för sjökortsmappar från Windows register" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "OpenCPN initierades på %ld ms." @@ -5278,8 +5295,8 @@ msgstr "Beräknad tid: " msgid "Remaining time : " msgstr "Återstående tid : " -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "Uppdatering av sjökort" @@ -5287,277 +5304,277 @@ msgstr "Uppdatering av sjökort" msgid "Anchorage created " msgstr "Ankring skapad" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "Visa verktygsfältet" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "Dölj verktygsfältet" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "Man över bord" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr " vid " -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr " på " -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "1,0 NM längs COG" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "Temporär MOB-rutt" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "Beräknad punkt 1 NM" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr " Tid: " -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr " Position: " -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "Inaktivera spår" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Aktivera spår" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Följ båt automatiskt" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "Kurs uppåt" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Zooma in" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Zooma ut" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "Sjökort med större skala" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "Sjökort med mindre skala" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "Avsluta OpenCPN" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "&Navigation" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Visa list med aktuella sjökort" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Visa ENC-text" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "Visa Ljus i ENC vektorkort" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "Visa Djup i ENC vektorkort" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "Visa Ankringsinfo i ENC kort" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "Visa ENC Status för sjökortsunderlaget" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "Visa Rutter o WP" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Visa tidvatten" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Skärminställning Dag/Skymning/Natt" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "&Visa" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Visa AIS-fartyg" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "Dölj förtöjda AIS-Mål" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "Visa spår efter AIS mål" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "Visa CPA larmdialog" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "Ljudsignal vid CPA larm" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "Visa CPA-varningar" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "&AIS" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "Mät avstånd" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "Rutt, spår & WP -hantering..." -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Skapa rutt" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "Placera WP/märke vid båten" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "Placera WP vid pekare" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Markera MOB" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Inställningar" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "Verk&tyg" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "&Skärmkontroll" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "OpenCPN hjälp" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "&Hjälp" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "Starta om OpenCPN för att aktivera språk- eller stiländringar." -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr " Fartyg " -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "Roterad vy" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Det gick inte att skriva ut.\n" "Kontrollera dina skrivarinställningar!" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Ej namngiven rutt)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "AIS MAN ÖVERBORD" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Eget fartyg" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "Tillfällig AISMOB Rutt" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "Aktuell båtposition" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr " Egen position: " -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr " MOB Position: " -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "UPPDATERAD AIS MAN ÖVERBORD" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Rutt, spår & WP -hantering" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Skriv ut sjökort" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr "(Ctrl-Mellanslag)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "Förbereder OpenCPN ENC" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "ENC har slutförts." -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5565,105 +5582,105 @@ msgstr "Skapa en privat konfigurationsmall baserat på aktuella inställningar.\ "Denna mall kommer att sparas och kan användas när som helst.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI utökade inställningar" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Spårning" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Standardspår" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Visa spår" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Inget spår" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Visa aldrig detta MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Detta MMSI är en SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Konvertera AIVDM till AIVDO för detta MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Detta MMSI är min följeslagare - Inget CPA-larm" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Ett MMSI har vanligen nio siffror.\n" "Kontrollera och klicka på Avbryt vid behov." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Standard" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Alltid" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Aldrig" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Redigera MMSI inställningar" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI inställningar" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Spårvisning" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Ignorera" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM-> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Namn" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Följare" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Ny..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Lägg till MMSI inställningar" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5681,7 +5698,7 @@ msgstr "The device selected is not accessible; opencpn will likely not be able\n " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5701,1180 +5718,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "GPS-kurs (COG): Pilens längd i tid (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Kompasskurs: Pilens längd (NM)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Fartygssymbol" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Skalenlig rasterbild" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Skalenlig vektorbild" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Längd över allt (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Bredd över allt (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS avstånd från för (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS avstånd från midskepps (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Minsta skärmstorlek (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Visa avståndsringar" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Avstånd mellan ringar" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Enhet för avstånd" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Nautisk mil" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometer" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "Minuter (tid)" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Färg på avståndsringar" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "Visa riktning till aktiv waypoint" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Textstil" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Fylld" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Prickad" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Streckad m långa streck" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Korta streck" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Streck-prickad" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Standardfärg" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Svart" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Mörkröd" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Mörkgrön" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Mörkgul" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Mörkblå" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Mörk magenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Mörk cyan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Ljusgrå" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Mörkgrå" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Röd" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Grön" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Gul" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Blå" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Magenta" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Cyan" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Vit" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Spår" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Automatisk dagligt spår vid midnatt" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Automatisk dagligt spår vid" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Dator" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Markera spår" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "Markeringsfärg" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Precision för nya spår" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Låg" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Medel" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Hög" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Beräknade värden" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "Beräkna SOG och COG från positionsförändringar (vid GPS-fel)" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Minimum antal sekunder mellan uppdateringar" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rutter/Punkter" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "För nya rutter" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "Aktiv rutt" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "Beständig aktiv rutt, aktivera automatiskt vid uppstart" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Standardikon för punkter WP" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Radie för Waypoint ankomstcirkel (NMI)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Växla till nästa WP i rutten endast efter ankomst till aktiv WP" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "Nya Waypoints" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "Markera standardikon" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "Visa waypoints bara om visad skala är större än 1:" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Åsidosätt inställningarna för skala och visa punkterna alltid" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "Visa avståndsringar" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Färg på Waypoint-avståndsringar" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Allmänna inställningar" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "Lås alla waypoints (Om inte egenskapsdialogen visas)" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Bekräfta borttagning av spår och rutter?" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Sjökortsfiler" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Sjökortsmappar" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Lägg till mapp...." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Ta bort markerade" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Komprimera markerade" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "Lägg till.." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Ta bort" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "Komprimera" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "Anpassa sjökortslagringen.." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Inställning för uppdatering" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Sök efter nya sjökort och uppdatera databasen" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Läs in alla sjökort på nytt" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Förbered alla ENC sjökort" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Ändrad]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Mallar" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Status" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Senast använda mall:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Sparade mallar" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Skapa konfigurationsmall..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Tag bort vald mall..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Använd vald mall" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Skapa konfigurationsmall" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Det gick inte att använda vald mall." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Avancerat" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Visa skeva rasterkort med norr upp" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Använd hårdvarugrafik (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "Alternativ för OpenGL" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "Utjämna kortrörelser. Medelvärdestid" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "sekunder" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Nivå för skaländring vid zoom" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektor" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93 detaljnivå" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Skärmens fysiska bredd" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Auto" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Manuell:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Skärminställningar" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Visa vridna rasterkort med Norr upp" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Ett lågt värde ger senare växling till kort med mer detaljer vid inzoomning. \n" "Ett högt värde ger tidigare växling till kort med mer detaljer." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Skärm" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "Sjökortslist" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "Visa utökad info för sjökortslister." -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vektorsjökort" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Marinstandard" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Visa djupinformation" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Sjökortsfakta" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Fyrar/Bojar" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Utdragna fyrsektorer" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Text på sjökort" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Nationell text på sjökort" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Enbart viktig text" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Rensa överlappande text" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Kortdetaljer" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Färre detaljer i utzoomat läge" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "Ytterligare detaljreduktion vid liten skala" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Sjökortspresentation" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Traditionell" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Förenklad" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Gränser" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Enkla" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Med symboler" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Färger" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Färger" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Färger" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Grunt vatten" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Säkert djup" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Djupt vatten" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Användarstyrda objekt" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Återställ till STANDARD" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Tidvatten && strömmar " -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Datafiler för tidvatten och strömmar" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Lägg till fil...." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Alla tillgängliga sjökort" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Ta bort sjökort" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Alla sjökort" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Ny bunt..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Radera bunt" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Behåll skala vid växling till nytt sjökort" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Inställningar" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Steglös skalning och förflyttning" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Zooma kring markören" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Skärminställningar" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Alternativ för Statuslisten" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "Tid, ETA, till pekaren" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Båtens Standardfart " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Kortytans användning" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Statusfält" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Enheter" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Eng. Mile" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Knop" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Djup" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Temperatur" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Celsius" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenheit" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Lat/Long" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Grader decimala Minuter" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Decimala Grader" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Grader Minuter Sekunder" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Bäring" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Visa sann" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Visa magnetisk" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Förmodad magnetisk missvisning" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "grader (-V, +O)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "Vindhastighet" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Visa sann bäring och kurs" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Visa magnetiskt bäring och kurs." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "Plugin WMM's beräknade missvisning" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " För att manuellt ställa in den magnetiska missvisningen\n" " måste du först inaktivera plugin WMM." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "Testa" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "Namn på ljudfilen:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Välj ljudfil" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Ljud" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "Ankarlarm" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "Spela upp ljud vid ankarlarm." -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "Välj ankarljud" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "Spela upp ljud vid ankarlarm." -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "Välj AIS larmljud" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART alarm" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "Spela upp ljud vid AIS SART alarm." -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "Välj AIS SART larmljud" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC Varning" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "Spela upp ljud vid DSC-avisering." -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "Välj aviseringsljud" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "Ekolodskonfiguration" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Okänd enhet:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "Indataenhet" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Ljudenhet" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Audio Play command:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS-fartyg" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA-beräkning. CPA = Närmaste mötespunkt. TCPA = Tid till CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Inga (T)CPA varningar om avståndet till målet är större än (NM)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Larma om CPA är mindre än (NM)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...och TCPA är mindre än (minuter):" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Borttappade fartyg" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Markera AIS-fartyg som borttappade efter (min)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Tag bort borttappade fartyg efter (min)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Visa" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Visa kurspil (COG) med beräknad position efter (min)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "Synk. längd på AIS kurspil med kurspilen för eget fartyg" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Visa fartygsspår, med längd (min):" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Visa inte ankrade/förtöjd mål, d.v.s. när farten är mindre än .....(kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "Visa AIS realtidsprognos, vid fart större än .. (kn)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Tillåt förminskning av mindre kritiska mål om fler mål än: ..." -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Visa områdesupplysningar (från AIS datameddelanden)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Visa AIS-fartyg med verklig storlek" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Visa namn på AIS-mål när skalan är större än 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "Använd WPL-positionsmeddelanden. Åtgärd vid mottagning:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS Positionsrapport " -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "Skapa märke" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "\"Rulla över\"" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Aktivera inforuta för rutter och AIS-mål" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Fartygsnamn\" MMSI (Anropssignal)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Klass] Typ (Status)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA/TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA-larm" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Visa larmmeddelande för CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Ljudsignal vid CPA/TCPA-larm och DSC/SART nödmeddelanden." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "Testa AIS-larmljud" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Larma inte för ankrade/förtöjda fartyg" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Aktivera max tid för kvittens av AIS-larm (min)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Allmänna inställningar" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Språk" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Typsnitt" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Välj Teckensnitt..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Välj Teckenfärg..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Exempel" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Utseende på verktygslist och fönster" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Användargränssnitt" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Visa statusraden" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Visa menyrad" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Visa kompass/GPS-statusfönstret" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Dölj verktygsfältet automatiskt" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Skeppsklocka (ljud)" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Aktivera pekskärm" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Använd skalad skärmgrafik" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Visa zoom knappar" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "Använd ECDIS-läge för inre vattenvägar" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "ECDIS handbok för inre vatten" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Storlek på meny och kartlist" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Storlek på kortdetaljer" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Storlek på båtsymboler" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC djupsiffror. Textstorlek" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "ENC textstorlek" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "Mushjulets zoomkänslighet" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Använd" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Sjökort" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Anslutningar" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "Anslut" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Fartyg" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Användargränssnitt" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "Användare" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Plugins" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Skriv värdet för kompassens missvisning" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "fot" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "famnar" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Lägg till en ny mapp med sjökort" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - Fartygets längd ska vara > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - Fartygets bredd ska vara > 0." -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - GPS avstånd från midskepps hamnar utanför fartygets bredd." -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - GPS avstånd från fören är större än fartygets längd." -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - Minsta storlek på fartygssymbolen ska vara mellan 1 och 100 mm." -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Inställningarna för fartygets storlek är inte korrekta:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "Manualen för inland ECDIS finns inte tillgänglig lokalt." -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "Vill du gå till websidan för iECDIS manual?" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6884,15 +6896,15 @@ msgstr "Komprimering kommer att förändra sjökortsfilerna på disken. \n" "Komprimerade kort kan ta lite längre tid att ladda och visa på vissa system. \n" "Filerna kan expanderas igen med hjälp av unxz eller 7 zip program." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN komprimera sjökort" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Hittade inga sjökort att komprimera." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6901,71 +6913,71 @@ msgstr "komprimerat %ld kort\n" "från %.1fMB till %.1fMB\n" "sparade %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Buntens namn" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Ny sjökortsbunt" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Välj tidvatten och strömdata" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Bildkomprimering" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Buffrad bildkomprimering" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Buffertlagrad bildkomprimering" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Minneskapacitet för bildkomprimering (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Storlek: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Återskapa bildbuffring" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Töm bildbufferten" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Kantutjämning av polygoner" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Linjeutjämning" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Mjukvarugrafik OpenGL (Starta om OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Använd hårdvarugrafik (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Bildkomprimering" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Bildbuffert" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Övrigt" @@ -7047,127 +7059,127 @@ msgstr "Kontrollera logfilen för mer information." msgid " successfully installed from cache" msgstr " installerat från buffert" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "Dessa inställningar kan destabilisera OpenCPN och är som standard inaktiverade. För att trots detta aktivera dem skall du manuellt lägga till en rad CatalogExpert=1 i sektionen [PlugIns] i konfigurationsfilen." -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "Katalog för plugin" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "Uppdatera plugin-katalogen" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "Importera plugin..." -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Inställningar..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Inaktiverad" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "Uppdatera pluginkatalog: Master" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "Uppdaterar pluginkatalog" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "Det går inte att kopiera katalogfilen" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "Det går inte att kopiera katalogfilen till cache" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "Kataloguppdatering lyckades" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "Välj tarball fil" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "Fel vid tolkning av metadata från tarball." -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "Fel vid import av OpenCPN plugin" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "Inkompatibel importplugin upptäckt." -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "Fel vid extrahering av importplugins tarball." -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "Plugin" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "Importen lyckades" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Aktiv katalog" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "Senaste katalogen" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Senast ändrad:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "Vänligen uppdatera plugin-katalogen." -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Avinstallera" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "Avinstallera plugin" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "Avinstallation" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Aktiverad" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Uppgradera till version" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Installera..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Uppdatera till " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Webbplats" @@ -7212,10 +7224,6 @@ msgstr "Satelliter" msgid "OpenCPN Server Message" msgstr "OCPN Servermeddelande" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS \"Rulla över\"" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "Tidvatten/Ström \"Rulla över\"" @@ -7333,12 +7341,6 @@ msgstr "Rutt från Spår" msgid "Send to &Peer" msgstr "Skicka till annan OCPN" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "Punkter WP" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "Visa alla WPs" @@ -7539,15 +7541,15 @@ msgstr "men visad kortskala är" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "Därför visas inte den nya WP på denna zoomnivå." -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "WP(s) är överförda." -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "Fel vid sändning av WP. Garmin GPS är inte ansluten" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "Fel vid uppladdning av WP. Kontrollera loggfilen..." @@ -7852,11 +7854,11 @@ msgstr "(Sektorvinklarna anges som sann angöringsbäring)< msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "

Den senaste opencpn-körningen verkar ha misslyckats. Vill du köra\n" "i felsäkert läge utan plugins och andra möjligen problematiska\n" "-funktioner?\n" -"



Du kan överväga att besöka listan över kända problem.

" +"



Du kan överväga att besöka listan över kända problem.

" #: gui/src/safe_mode_gui.cpp:38 msgid "Safe restart" @@ -7972,7 +7974,7 @@ msgstr "Idag" msgid "Tomorrow" msgstr "I morgon" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Verktygstips" @@ -8273,153 +8275,156 @@ msgstr "Flytta waypoint" msgid "Dismiss" msgstr "Avbryt" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "Välj vilka enheter och dataformat du vill använda." -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Alla inställningar kan ändras när som helst i användarinställningar genom att klicka på " -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr " ikonen i verktygsfältet." -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "Om du redan har sparade sjökortsfiler, kan du lägga till dem i här." -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "Ytterligare sjökort för vissa länder kan hämtas med hjälp av sjökortshämtaren (plugin ChartDownloader) som finns med i denna installation." -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "För att komma åt sjökortshämtaren klicka på " -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr " ikonen i verktygsfältet och välja fliken Sjökort-> Sjökortshämtare." -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "

Välkommen till OpenCPN!

Du har slutfört den initiala konfigurationen. Du kan nu börja använda programmet.

" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "NMEA0183: UDP port %d" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "NMEA2000: UDP port %d" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "NMEA0183: %s TCP-port %d" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "NMEA2000: %s TCP-port %d" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "GPSd: %s TCP-port %d" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." -msgstr "Letar efter Signal K servrar..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." +msgstr "Letar efter källor för navigationsdata, detta kan ta ett tag..." -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "Skannar USB-enheter..." -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "Letar efter UDP-dataflöden..." -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "Letar efter TCP-servrar..." -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "Letar efter Signal K servrar..." + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "Letar efter CAN-gränssnitt..." -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "Letar efter GPSD-servrar..." -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "SignalK: %s (%s port %d)" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "Systemet har skannats efter källor till navigationsdata." -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "Anslutningar till upptäckta källor med navigationsdata kommer att konfigureras automatiskt. Du kan avmarkera de som du vill ignorera." -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "Du kan nu ansluta ytterligare USB-enheter eller ansluta till ett annat nätverk och tryck på knappen \"Sök igen\" för att uppdatera listan." -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "Alla inställningar kan ändras när som helst i användarinställningar genom att klicka på " -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr " ikonen i verktygsfältet. I Inställningar navigerar du till fliken Anslut." -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "Välj en mapp med sjökort" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "Enheter och format" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "Grader, decimalminuter (DD MM.MM)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "Decimalgrader (DD.DDDDD)" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "Grader, minuter, sekunder (DD MM SS)" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "Visa sann bäring och kurs" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "Visa magnetiskt bäring och kurs" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "Upptäckta navigationsdatakällor:" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "Sök igen..." -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "Lägg till befintliga sjökort" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "Lägg till sjökortskatalog..." - diff --git a/po/opencpn_th_TH.po b/po/opencpn_th_TH.po index de0ee0163c..b8daee582a 100644 --- a/po/opencpn_th_TH.po +++ b/po/opencpn_th_TH.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Thai\n" "Language: th_TH\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "" @@ -414,7 +414,7 @@ msgstr "" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "" @@ -476,7 +476,7 @@ msgstr "" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "" @@ -509,11 +509,11 @@ msgstr "" msgid "Left" msgstr "" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "" @@ -2435,8 +2435,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "เกี่ยวกับ OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "ตัวเลือก" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "เอกสารวิธีใช้ OpenCpn ไม่รองรับในพื้นที่ของคุณ" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "" msgid "Undefined (default)" msgstr "" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "" @@ -3085,7 +3085,7 @@ msgstr "" msgid "&Jump To" msgstr "" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "" @@ -3197,37 +3197,37 @@ msgstr "" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "" @@ -3281,7 +3281,7 @@ msgstr "" msgid "Navigate To Here" msgstr "" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "" @@ -3290,8 +3290,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "" @@ -3300,7 +3300,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3325,7 +3325,7 @@ msgstr "" msgid "CM93 Offset Dialog..." msgstr "" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "" @@ -3443,7 +3443,7 @@ msgstr "" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "" @@ -3597,18 +3597,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "" @@ -3616,32 +3616,32 @@ msgstr "" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "" @@ -3661,7 +3661,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "" @@ -3677,8 +3677,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "" @@ -3686,8 +3686,8 @@ msgstr "" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "" @@ -3703,18 +3703,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "" @@ -3759,7 +3759,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3814,8 +3814,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4147,28 +4147,28 @@ msgstr "" msgid "Merge waypoints?" msgstr "" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "" @@ -4176,7 +4176,7 @@ msgstr "" msgid "OverZoom" msgstr "" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "" @@ -4192,7 +4192,7 @@ msgstr "" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4240,9 +4240,9 @@ msgstr "" msgid "User Y Offset" msgstr "" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "" @@ -4253,11 +4253,13 @@ msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "" @@ -4293,12 +4295,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4327,7 +4329,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4616,12 +4618,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "" @@ -4630,17 +4632,17 @@ msgstr "" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "" @@ -4666,59 +4668,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4776,7 +4778,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4784,7 +4786,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4814,7 +4816,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4822,6 +4824,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4834,7 +4851,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -4955,7 +4972,7 @@ msgstr "" msgid "Icon" msgstr "" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4965,7 +4982,7 @@ msgid "Links" msgstr "" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5006,22 +5023,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "" @@ -5110,16 +5127,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "" @@ -5151,35 +5168,35 @@ msgstr "" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5227,8 +5244,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5236,379 +5253,379 @@ msgstr "" msgid "Anchorage created " msgstr "" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr "" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "" -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "" -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5619,7 +5636,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5631,1259 +5648,1254 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "" @@ -6960,127 +6972,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7125,10 +7137,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7246,12 +7254,6 @@ msgstr "" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7449,15 +7451,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7760,7 +7762,7 @@ msgstr "" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7876,7 +7878,7 @@ msgstr "" msgid "Tomorrow" msgstr "" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "" @@ -8157,153 +8159,156 @@ msgstr "" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_tr_TR.po b/po/opencpn_tr_TR.po index fb31b967b4..7688080aed 100644 --- a/po/opencpn_tr_TR.po +++ b/po/opencpn_tr_TR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Adsız Seyirizi)" @@ -414,7 +414,7 @@ msgstr "SAR Uçağı" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr "(Son Bilinen)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Mevki" @@ -509,11 +509,11 @@ msgstr "Sağ" msgid "Left" msgstr "Sol" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Hız" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Yükseklik" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Seyir Yardımcısı" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Üs" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/saat" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/saniye" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "OpenCPN Hakkında" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Ayarlar" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "Seyirizi Özellikleri" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "OpenCPN Web sitesi" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN yardım belgeleri yerel olarak kullanılabilir değil." -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "Daha fazla bilgi için opencpn.org web sitesini ziyaret etmek ister misiniz?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "İptal işlemi- ID Bağlantılı Mesaj olarak tanımlanmış iptal alan msgid "Undefined (default)" msgstr "Tanımlanmamış (varsayılan)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS Hedef Adı" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS Uyarısı" @@ -3085,7 +3085,7 @@ msgstr "&Sessizlik Uyarısı" msgid "&Jump To" msgstr "&a Atla" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Seyirnoktaso Oluştur" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS hedef listesi" @@ -3197,38 +3197,38 @@ msgstr "Hedef Sayısı" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Seyir İzlerini Kaydet" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Bu hedeften son olarak alınan izler kaydedildi.\n" "Bu OpenCPN oturumunun sonuna kadar kaydetmeye devam etmek ister misiniz?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AISHedefAçıklaması" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Tamam" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Rotaizini Durdur." #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Menu" @@ -3282,7 +3282,7 @@ msgstr "Tekneyi Buraya Taşı" msgid "Navigate To Here" msgstr "Buraya Doğru Seyret" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Yön Yukarı Durumu" @@ -3291,8 +3291,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Kuzey Yukarı Durumu" @@ -3301,7 +3301,7 @@ msgid "Chart Up Mode" msgstr "Grafik Modu" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Tam Ekrana Geç" @@ -3326,7 +3326,7 @@ msgstr "Seyirizi Yapıştır" msgid "CM93 Offset Dialog..." msgstr "CM93 Ayarı..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Harita Grupları" @@ -3444,7 +3444,7 @@ msgstr "KML Olarak Kopyala" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Sil" @@ -3598,18 +3598,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "Harita Görünüm Seçenekleri" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Seyir Durumu" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Kuzey Yukarı" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Rota Yukarı" @@ -3617,32 +3617,32 @@ msgstr "Rota Yukarı" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Puruva Yönünde Durumu" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Görünüm Seçenekleri" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Haritaları Birbirine Ekle" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Enlem/Boylamı Göster" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Harita Sınırlarını Göster" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Derinlik Birimlerini Göster" @@ -3662,7 +3662,7 @@ msgstr "Gelgit ve Akıntılar" msgid "Show Tide stations" msgstr "Gelgit istasyonunu göster" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Akıntıları Göster" @@ -3678,8 +3678,8 @@ msgstr "Metni Göster" msgid "Show depths" msgstr "Derinliği göster" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Şamandıra/Fener Etiketleri" @@ -3687,8 +3687,8 @@ msgstr "Şamandıra/Fener Etiketleri" msgid "Lights" msgstr "Fener" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Fener Açıklamaları" @@ -3704,18 +3704,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Görünüm Sınıfı" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Standart" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Tümü" @@ -3760,7 +3760,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3815,8 +3815,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4149,28 +4149,28 @@ msgstr "'Hayır' yanıtı bu rotada tümüyle yeni seyir noktaları oluşturacak msgid "Merge waypoints?" msgstr "Seyirnoktaları birleştirilsin mi?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "Rota Bacağı Bilgisi" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Ayak" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Metre" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Kulaç" @@ -4178,7 +4178,7 @@ msgstr "Kulaç" msgid "OverZoom" msgstr "Aşırı Yaklaştırma." -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Uzantılı Gelgit Simgesi" @@ -4194,7 +4194,7 @@ msgstr "AIS Hedef Sorgusu" msgid "Show all AIS Targets" msgstr "Tüm AIS hedeflerini göster" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Daha az kritik AIS hedeflerini zayıflat" @@ -4242,9 +4242,9 @@ msgstr "Kullanıcı X Ayarı" msgid "User Y Offset" msgstr "Kullanıcı Y Ayarı" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "metre" @@ -4255,11 +4255,13 @@ msgstr "Bu Bacak" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Kumanda Paneli Açıklaması" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Kumanda Paneli Değeri" @@ -4295,12 +4297,12 @@ msgstr "Tahmini Varış @VMG" msgid "ETA @SOG" msgstr "Tahmini Varış @SOG" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "Başlık" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4329,7 +4331,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4618,12 +4620,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN Uyarısı" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN Hakkında " @@ -4632,17 +4634,17 @@ msgstr "OpenCPN Hakkında " msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Tümünü Seç " -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Tümünü Sil" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Ekle" @@ -4668,59 +4670,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Genel" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4778,7 +4780,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "Yeniden yükle" @@ -4786,7 +4788,7 @@ msgstr "Yeniden yükle" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "Sürüm düşür" @@ -4816,7 +4818,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4824,6 +4826,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AISRollover" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4836,7 +4853,7 @@ msgstr "Raster grafik. Iş parçacığı çıkışı için bekliyor." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Sahibinden uzaklık: % 4.0f NMi" @@ -4957,7 +4974,7 @@ msgstr "Bu seyirnoktası bir etiketin parçası olduğu için iptal edilemiyor" msgid "Icon" msgstr "Simge" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "Açılır menü!" @@ -4967,7 +4984,7 @@ msgid "Links" msgstr "Bağlantılar" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5008,22 +5025,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Tekneden Uzaklık" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Renk" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Yok" @@ -5112,16 +5129,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Kalıcı" @@ -5153,35 +5170,35 @@ msgstr "NMEA hata ayıklama penceresi" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5229,8 +5246,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5238,277 +5255,277 @@ msgstr "" msgid "Anchorage created " msgstr "Demiryeri oluşturuldu." -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "İzlemeyi Etkinleştir" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Otomatik İzle" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Yakınlaştır" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Uzaklaştır" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Harita Çubuğunu Göster" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Metni göster" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Gelgitleri Göster" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Renk Tonunu Değiştir" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "AIS Hedeflerini Göster" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Rota Oluştur" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "DAD (Denize Adam Düştü) işareti bırak" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Seçenekler" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Yazdırırken bir sorun oluştu.\n" " Kullanılan yazıcı doğru yapılandırılmamış olabilir mi?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Adsız Rota)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Kendi gemin" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Rota & İşaret Düzenleyicisi" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "Haritayı Bas" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Boşluk)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5516,105 +5533,105 @@ msgstr "Mevcut ayarlara göre özel bir konfigürasyon şablonu oluşturun.\n" "Bu şablon kaydedilecek ve ileriki bir zamanda kullanım için seçilebilir.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI Ek Özellikler" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Seyirizi çıkarıyor" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Varsayılan seyirizi" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Herzaman seyirizi al." -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Hiç seyirizi alma" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Bu MMSI'ı yoksay" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Bu MMSI'ı SART/PLB(AIS) DAD olarak dikkate al." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Bu MMSI için, AIVDM'i AIVDO'ya çevir." -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "Bu MMSI benim Refakatçim - Çatışma alarmı verme" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "MMSI kimliği genelikle dokuz haneli bir sayıdır. \n" "Lütfen girişinizi kontrol edin ve gerekirse iptal edin." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Varsayılan" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Her zaman" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Hiçbir zaman" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "MMSI Özelliklerini Değiştir" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI Özellikleri" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "İzleme Durumu" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Yoksay" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "DAD" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Gemi Adı" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Takipçi" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Yeni..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "MMSI Özellikleri" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5630,7 +5647,7 @@ msgstr "Seçilen cihaz kullanılabilir değil; OpenCPN'in bucihazı kullanması " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Daha fazla bilgi için dağıtım dokümanları içerisindeki LINUX_DEVICE.md dosyasına bakın\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5649,1194 +5666,1189 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "Daha fazla bilgi için dağıtım dokümanları içerisindeki LINUX_DEVICE.md dosyasına bakın\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG Gösterge Ok Uzunluğu (dakika)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Pruvadan Uzaklık Göstergesi (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Tekne Simgesinin Türü" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Gerçek Ölçekli Resim" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Gerçek Ölçekli Vektör" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Tüm Uzunluk (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Tüm Genişlik (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "Pruvadan GPS Ayarı (m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "Tekne Merkezinden GPS ayarı (m)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Enküçük Ekran Büyüklüğü (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "Uzaklık Halkalarını Göster" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "Halkalar Arası Uzaklık" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Uzaklık Birimi" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Deniz Mili " -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilometre" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "Mesafe Çemberi Rengi" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Tür" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Kalın" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Noktalı" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Uzun kesili çizgi" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Kısa kesili çizgi" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Noktalı kesili çizgi" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Varsayılan renk" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Siyah" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Koyu Kırmızı" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Koyu Yeşil" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Koyu Sarı" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Koyu Mavi" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Koyu Magenta" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Koyu Cyan" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Gri Işık" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Koyu Gri" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Kırmızı" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Yeşil" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Sarı" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Mavi" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Eflatun" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Deniz mavisi" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Beyaz" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Seyirizleri" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Gece Yarısı Otomatik Günlüğü İzle" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Otomatik günlük izler şurada" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Bilgisayar" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Seyirizlerini Aydınlat" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Seyirizi Kesinliği" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Düşük" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Ortalama" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Yüksek" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "Değerleri hesapla" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "COG ve SOG'u mevki değişiminden hesapla" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "Güncellemeler arasındaki en az saniye" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "Rotalar/Noktalar" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "Yeni Rotalar" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "Seyirnoktası varsayılan simge" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Seyirnoktası Varış Daire Çapı (Mil)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "Ön Rota Seyirnoktası Sadece Varışta" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "Harita ölçek tabanlı görünürlük için ayarları geçersiz kıl ve her zaman göster" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "Seyirnoktası mesafe halkası rengi" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "Kontrol Seçenekleri" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Rota ve Seyirizlerinin İptalini Onaylat" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "Harita Dosyaları" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Klasörler" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Klasör Ekle" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Seçileni Kaldır" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Sıkıştırma Seçildi" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Kaldır" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Denetlemeyi Güncelle" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Haritaları Gözden Geçir ve Veritabanını Güncelle" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Tüm Veritabanını Yeniden Yapılandırmaya Zorla" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Tüm ENC Grafiklerini Hazırla" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [Modified]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "Şablonlar" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "Şablon Durumu" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "Son Uygulanan Şablonun İsmi:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "Şablon Kaydedildi" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "Yapılandır..." -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "Seçilen Yapılandırmayı Sil..." -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "Seçilen Yapılandırmayı Uygula" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "Yapılandır" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "Seçilen yapılandırma uygulanamıyor." -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "İleri" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "Raster Grafiklerinin Eğrilerini Gider" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Hızlandırılmış Grafikleri Kullan (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL Seçenekleri" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "Saniye" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "Harita Yakınlaştır/Ölçümle Derecesi" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vektör" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Fiziki Ekran Genişliği" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Otomatik" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "El ile:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Haritayı Göster" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "Çarpık Raster Haritalarını Kuzey Yukarı Durumunda Göster" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Küçük bir değer ile, aynı yakınlaştırma seviyesi az detaylandırılmış bir görüntü verir.\n" "Büyük bir değer ile, aynı yakınlaştırma seviyesi daha detaylı bir görüntü sunacaktır." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Grafikler" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Vektör Harita Görünümü" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Denizci Standardı" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Derinlik Ölçümleri" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Harita Bilgi Nesneleri" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Şamandıralar/Işıklar" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Uzatılı Fener Alanları" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Harita Metinleri" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Haritadaki Ulusal Metin" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Sadece Önemli Metinler" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Dağınık Metin" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Harita Ayrıntıları" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Küçük Ölçekte Azaltılmış Ayrıntı " -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Grafik Türü" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Kağıt harita" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Basitleştirilmiş" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Sınırlar" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Düz" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Simgeleştirilmiş" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Renkler" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 Renkli" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 Renkli" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Sığ Derinlik" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Güvenli Derinlik" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Derin Su" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "Kullanıcı standart nesneler" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Standartta Sıfırla" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Gelgitler && Akıntılar" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Etkin Veritabanı" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Veritabanı Ekle" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Tüm Ulaşılabilir Haritalar" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Haritayı Kaldır" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Tüm Haritalar" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Yeni Grup" -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Grubu Sil" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Grafikleri Değiştirirken Ölçüyü Koru" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Denetimler" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Tıklamayla Düzgün Yakınlaştırma" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Fareye Yakınlaştır" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Özelliklerini Göster" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "Durum çubuğu seçeneği" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "İmleç noktasına Gerçek Zamanlı Tahmini Varış" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "Varsayılan tekne hızı " -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "Kanvaz Düzeni" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "Durum Çubuğu" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Birimler" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Kara Mili" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Knot" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mil/Saat" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Derinlik" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "Sıcaklık" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "Santigrat" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "Fahrenayt" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "Kelvin" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Enlem/Boylam" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Dereceler, Ondalık Dakika" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Ondalık Dakika" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Derece, Dakika, Saniye" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Kerterizler" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Doğruyu göster" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "Manyetiği Göster" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "Varsayılan Manyetik Sapma" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "derece(-Batı,+Doğu)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Doğru Kerteriz ve Pruvayı Göster" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "Manyetik Kerteriz ve Pruvayı Göster." -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM Eklentisi manyetik varyasyona göre hesaplandı" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " Manyetik değişimi manuel olarak ayarlamak için \\ n WMM eklentisini devre dışı bırakmalısınız." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Ses Dosyasını Seçin" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "Sesler" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "Bilinmeyen Cihaz:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "Ses aygıtı" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "Ses Çal komutu:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS Hedefleri" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA Hesaplaması" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Hedef aralığı (NMi) değerinden büyükse, (T) EBM Uyarıları yok" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "CPA Uyarısı İçin En Uzak Mesafe (NMi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "TCPA'nın En Düşük Değeri (dakika) :" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Kayıp Hedefler" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Hedefleri Kayıp Olarak İşaretleme Süresi (dakika) :" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Kayıp Hedeflerin Kaldırılacağı Süre (dakika)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Görünüm" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Hedef COG Oklarını Göster, Uzunluk (dakika)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Hedef İzsürümünü Göster, Uzunluk (dakika)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "Demirlenmiş / İskeleye halatla bağlanmış hedefleri bastır, maksimum hız (kn)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "Daha fazla kritik hedefin zayıflamasına izin verin ... hedeflerden fazlası " -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Bölgesel Uyarıları Göster (AIS sayısal mesajlarından)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "AIS Hedeflerini Gerçek Boyutta Göster" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Ölçeği 1 den Büyük Olan AIS Hedef Adlarını Göster" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Uzatmalar" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "Rota/AIS bilgi sütununu etkinleştir" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Gemi Adı\" MMSI (Çağrı İşareti)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Sınıf] Tür (Durum)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG / COG " -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA/TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA Alarmları" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "CPA/TCPA Alarm Durumunu Göster" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "CPA/TCPA ve DSC/SART Alarmlarını Sesle Ver." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "Demirdeki/Tonozdaki Hedefler İçin Alarm Verme" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "Hedef Alarm Bilgisini Etkinleştir, Sıklığı (Dakika ):" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Genel Seçenekler" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Dil" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Yazım Şekli Değiştirilebilir Birimler" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Yazı Türünü Seçin" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Yazı Rengini Seçin" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "Örnek" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Araç Çubuğu ve Pencere Düzeni" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Arayüz Seçenekleri" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Durum Çubuğunu Göster" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Kumanda Çubuğunu Göster" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Pusula/GPS Durumu Penceresini Göster" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Araç çubuğunu otomatik gizle özelliğini etkinleştir" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Gemi Çanlarını Çal " -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Dokunmatik Ekran Arayüzünü Etkinleştir" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Ölçekli Grafik arabirimini etkinleştir" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "Yakınlaştırma düğmelerini göster" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Kullanıcı Arayüzü ölçek faktörü" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Grafik Nesne ölçek faktörü" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "Gemi ölçek faktörü" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Uygula" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Haritalar" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Bağlantılar" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Tekneler" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Kullanıcı Seçenekleri" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Eklentiler" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Kullanıcı ayarlı manyetik varyasyon" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "feet" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "kulaç" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Harita dosyalarını içeren klasörü ekle." -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - Teknenizin boyu > 0 olmalıdır." -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - Teknenizin eni > 0 olmalıdır." -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - Tekne ortası GPS ayarı tekne genişliği içinde kalmalıdır." -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - Baş GPS ayarı tekne uzunluğu içinde kalmalıdır" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - Teknenizin en küçük simge büyüklüğü 1 ile 100 arasında olmalıdır." -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Gerçek boyutlu tekne verileriniz doğru değil" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "Sıkıştırma, disk üzerindeki grafik dosyalarını değiştirecektir. \\ n Bu, diğer programlarla veya OpenCPN'nin eski sürümleriyle uyumsuz olmasını sağlayabilir. \\ N Sıkıştırılmış çizelgeleri bazı sistemlere yüklemek ve göstermek biraz daha uzun sürebilir. \\ n Unxz veya 7 zip programı kullanılarak yeniden sıkıştırılabilirler." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN Sıkıştırılmış Tablolar" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Sıkışan herhangi bir çizelge bulunamadı." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6845,71 +6857,71 @@ msgstr "\"sıkıştırılmış %ld çizelgeleri \n" " den %.1fMB ye %.1fMB \n" " kaydedilmiş %.1fMB ( %.1f%%)\"" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Grup Adını Gir" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Yeni Harita Grubu" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Gelgit/Akıntı Verisini Seçin." -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Yapı Sıkıştırma" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Önbellekle Sıkıştırma" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Yapı Sıkıştırma Önbelleğe Alma" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Yapı Bellek Boyutu (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Boyut: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Önbellek Sıkıştırmasını Yenidenkur" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Önbellek Sıkıştırmasını Temizle" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "Çokgen düzgünleştirme" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "Çizgi yumuşatma" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Yazılım OpenGL (OpenCPN'yi yeniden başlat)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Hızlandırılmış Grafikleri Kullan (OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Doku Ayarları" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Doku Önbellek" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Çeşitli" @@ -6989,127 +7001,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "Ayarlar..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "Devre dışı bırakıldı" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "Etkin Katalog" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "Son değişiklik:" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "Kaldır" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "Etknleştirildi" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "Sürümünü yükselt" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "Yükle" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "Güncelle " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "Web sitesi" @@ -7154,10 +7166,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AISRollover" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "GelgitAkıntıÇizelgeUzantısı" @@ -7275,12 +7283,6 @@ msgstr "Seyirizinden Rota" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7484,15 +7486,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7797,7 +7799,7 @@ msgstr "(Sektör açıları denizden alınmış gerçek kerterizle msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7913,7 +7915,7 @@ msgstr "Bugün" msgid "Tomorrow" msgstr "Yarın" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Araç Çubuğu" @@ -8195,153 +8197,156 @@ msgstr "Seyirnoktasını Taşı" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_vi_VN.po b/po/opencpn_vi_VN.po index d7b5b0c6c8..9a374e288d 100644 --- a/po/opencpn_vi_VN.po +++ b/po/opencpn_vi_VN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:37\n" "Last-Translator: \n" "Language-Team: Vietnamese\n" "Language: vi_VN\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(Lộ trình chưa đặt tên)" @@ -414,7 +414,7 @@ msgstr "Máy bay tìm kiểm cứu nạn" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (Vị trí cuối)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "Vị trí" @@ -509,11 +509,11 @@ msgstr "Bên phải" msgid "Left" msgstr "Bên trái" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "Tốc độ" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "Độ cao" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "Phương tiện trợ giúp hàng hải" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "Căn cứ" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "Giới thiệu về OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "Tùy chọn" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "Cấu hình tra cứu hành trình" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "Hủy bỏ - hủy khu vực như được xác định bởi Message Li msgid "Undefined (default)" msgstr "(Chưa định nghĩa)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "Tên mục tiêu AIS" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "Cảnh báo AIS" @@ -3085,7 +3085,7 @@ msgstr "Báo động đã im lặng" msgid "&Jump To" msgstr "&Di chuyển đến" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "Tạo 1 điểm" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "Danh sách AIS mục tiêu" @@ -3197,38 +3197,38 @@ msgstr "Số lượng mục tiêu" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "Ghi lại thông tin đường đi" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "Những thông tin theo đường đi đây của tàu đã được ghi lại.\n" "Bạn có muốn tiếp tục ghi lại hết thông tin đường đi này trên OpenCPN hiện thời?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "Truy vấn mục tiêu AIS" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "Ok" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "Ngừng ghi lại đường đi" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "Thực đơn" @@ -3282,7 +3282,7 @@ msgstr "Di chuyển thuyền đến đây" msgid "Navigate To Here" msgstr "Điều hướng đến đây" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "Chế độ mở khóa" @@ -3291,8 +3291,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "Chế độ phía Bắc bên trên" @@ -3301,7 +3301,7 @@ msgid "Chart Up Mode" msgstr "Chế độ mở biểu đồ" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "Bật tắt toàn màn hình" @@ -3326,7 +3326,7 @@ msgstr "Dán đường đi" msgid "CM93 Offset Dialog..." msgstr "CM93 Hộp thoại bù..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "Nhóm biểu đồ" @@ -3444,7 +3444,7 @@ msgstr "Sao chép như KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "Xoá" @@ -3598,18 +3598,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "Chế độ điều hướng" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "Bắc lên" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "Mở khóa" @@ -3617,32 +3617,32 @@ msgstr "Mở khóa" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "Xem trước chế độ" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "Tùy chọn Hiển thị" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "Kích hoạt ghép Hải đồ" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "Hiển thị lưới" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "Hiển thị đường kẻ hải đồ" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "Hiển thị các đơn vị độ sâu" @@ -3662,7 +3662,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "Hiển thị hiện hành" @@ -3678,8 +3678,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "Nhãn hiển thị Phao/Đèn" @@ -3687,8 +3687,8 @@ msgstr "Nhãn hiển thị Phao/Đèn" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "Ánh sáng mô tả" @@ -3704,18 +3704,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "Danh mục hiển thị" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "Tiêu chuẩn" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "Tất cả" @@ -3760,7 +3760,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3815,8 +3815,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4148,28 +4148,28 @@ msgstr "Trả lời 'Không' sẽ tạo ra tất cả các điểm mới cho l msgid "Merge waypoints?" msgstr "Trộn điểm?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "RouteLegInfoRollover" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "Feet" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "Mét" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "Phút" @@ -4177,7 +4177,7 @@ msgstr "Phút" msgid "OverZoom" msgstr "OverZoom" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "Biểu tượng thủy triều mở rộng" @@ -4193,7 +4193,7 @@ msgstr "Truy vấn AIS mục tiêu" msgid "Show all AIS Targets" msgstr "Hiển thị tất cả đối tượng AIS" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "Giảm chức năng phán đoán AIS mục tiêu" @@ -4241,9 +4241,9 @@ msgstr "Người dùng X bù" msgid "User Y Offset" msgstr "Người dùng Y bù" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "mét" @@ -4254,11 +4254,13 @@ msgstr "Chặng này" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Bảng điều khiển huyền thoại" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Giá trị điều khiển" @@ -4294,12 +4296,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4328,7 +4330,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4617,12 +4619,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "Cảnh báo OpenCPN" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "Thông tin OpenCPN" @@ -4631,17 +4633,17 @@ msgstr "Thông tin OpenCPN" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "Chọn tất cả" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "Xóa tất cả" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "Thêm mới" @@ -4667,59 +4669,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "Tổng quan" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4777,7 +4779,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4785,7 +4787,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4815,7 +4817,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4823,6 +4825,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS Rollover" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4835,7 +4852,7 @@ msgstr "Chờ biểu đồ raster nén thoát." msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "Khoảng cách từ tàu riêng: %4.0f NMi" @@ -4956,7 +4973,7 @@ msgstr "" msgid "Icon" msgstr "Biểu tượng" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4966,7 +4983,7 @@ msgid "Links" msgstr "Liên kết" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5007,22 +5024,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "Khoảng cách" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "Màu sắc" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "Không" @@ -5111,16 +5128,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "Liên tục" @@ -5152,35 +5169,35 @@ msgstr "Bảng gỡ lỗi NMEA" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5228,8 +5245,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5237,381 +5254,381 @@ msgstr "" msgid "Anchorage created " msgstr "Chỗ neo đậu đã được tạo " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "Bật theo dõi" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "Tự động theo dõi" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "Phóng to" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "Thu nhỏ" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "Hiển thị thanh hải đồ" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "Hiển thị chữ ENC" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "Hiển thị thủy triều" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "Thay đổi màu lược đồ" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "Hiển thị AIS mục tiêu" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "Tạo tuyến đường" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "Thả đánh dấu MOB" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "Tùy chọn" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "Lỗi trong quá trình in. \n" "Có lẽ máy in hiện thời của bạn không được thiết lập một cách chính xác?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(Lô trình không tên)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "Tàu của tôi" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "Quản lý lộ trình & đánh dấu" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "In biểu đồ" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "Thuộc tính mở rộng MMSI" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "Theo dõi" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "Theo dõi mặc định" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "Luôn luôn theo dõi" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " Không bao giờ theo dõi" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "Bỏ qua MMSI này" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "Điều chỉnh MMSI này như SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "Chuyển đổi AIVDM sang AIVDO cho MMSI" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "MMSI này là đối tượng theo dõi của tôi - Không CPA cảnh báo" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "Một MMSI Id nói chung là một số 9 chữ số. \n" "Xin hãy kiểm tra các mục của bạn và hủy bỏ nếu cần thiết." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "Mặc định" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "Luôn luôn" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "Không bao giờ" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "Chỉnh sửa thuộc tính MMSI" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "Thuộc tính MMSI" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "Chế độ ghi đường đi" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "Bỏ qua" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM-> VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "Tên tàu" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "Người theo dõi" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "Mới..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "Thêm các thuộc tính MMSI" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5622,7 +5639,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5634,1194 +5651,1189 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "Dự đoán độ dài COG (min)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "Dự đoán độ dài điểm đến (NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "Loại biểu tượng tàu" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "Ảnh bitmap tỉ lệ thực" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "Ảnh vector tỉ lệ thực" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "Chiều dài (m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "Chiều rộng (m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "Kích thước màn hình tối thiểu (mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "Đơn vị khoảng cách" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "Hải lý" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "Kilômét" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "Giao diện" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "Khối" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "Chấm" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "Gạch ngang dài" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "Gạch ngang ngắn" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "Gạch chấm" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "Màu mặc định" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "Đen" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "Đỏ đậm" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "Xanh lục đậm" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "Vàng đậm" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "Xanh đậm" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "Hồng đậm" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "Xanh lơ đậm" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "Xám nhạt" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "Xám đậm" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "Đỏ" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "Xanh" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "Vàng" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "Xanh dương" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "Đỏ tươi" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "Lục lam" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "Trắng" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "Lộ trình" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "Tự động theo dõi hàng ngày lúc nửa đêm" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "Tự động hàng ngày theo dõi tại" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "Máy tính" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "Giờ UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "LMT" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "Tô màu lộ trình" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "Theo dõi chính xác" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "Thấp" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "Trung bình" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "Cao" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "Bán kính vòng tròn đến tọa độ điểm (NMi)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "Xác nhận xóa tuyến và lộ trình" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "File hải đồ" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "Thư mục" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "Thêm thư mục..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "Xoá mục đã chọn" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "Nén mục được chọn" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "Loại bỏ" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "Cập Nhật điều khiển" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "Quét hải đồ hiện có và cập nhật Csdl" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "Cập nhật lại toàn bộ Csdl" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "Chuẩn bị tất cả hải đồ" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "Nâng cao" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "Sử dụng tăng tốc đồ họa (OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "giây" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "Raster" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "Vector" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "Độ rộng màn hình vật lý" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "Tự động" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "Tùy chỉnh:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "Hiển thị hải đồ" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "Với một giá trị thấp hơn, mức độ zoom tương tự cho hải đồ chi tiết ít. \n" "Với một giá trị cao hơn, mức độ zoom tương tự cho hải đồ chi tiết cao hơn." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "Đồ hoạ" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "Hải đồ dạng vector" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "Tiêu chuẩn hàng hải" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "Điểm độ sâu" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "Các đối tượng hải đồ" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "Phao/Đèn" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "Lĩnh vực ánh sáng mở rộng" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "Biểu đồ dạng văn bản" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "Các văn bản quốc gia trên biểu đồ" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "Chỉ văn bản quan trọng" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "Văn bản lộn xộn" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "Biểu đồ chi tiết" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "Giảm chi tiết ở tỷ lệ nhỏ" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "Kiểu mẫu đồ họa" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "Biểu đồ giấy" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "Đơn giản hóa" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "Ranh giới" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "Rõ ràng" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "Biểu tượng" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "Màu sắc" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 màu" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 màu" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "Nông sâu" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "Độ sâu an toàn" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "Sâu sâu" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "Đặt lại tiêu chuẩn" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "Thủy triều && dòng" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "Datasets hoạt động" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "Thêm Dataset..." -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "Tất cả các biểu đồ có sẵn" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "Xoá hải đồ" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "Tất cả các hải đồ" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "Nhóm mới..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "Xoá nhóm" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "Giữ gìn tỷ lệ khi chuyển đổi hải đồ" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "Điều khiển" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "Thu phóng/ kéo dịch mịn" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "Phóng to đến con trỏ" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "Hiển thị các tính năng" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "Đơn vị" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "Quy chế dặm" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "Hải lý" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "Mph" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "Độ sâu" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "Vĩ độ/ Kinh độ" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "Độ, phút thập phân" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "Độ thập phân" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "Độ, phút, giây" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "Điều hướng" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "Hiển thị đúng" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W + E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "Hiển thị tiêu đề và điều hướng thực" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "Chọn tập tin âm thanh" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "Đối tượng AIS" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "Tính toán CPA" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "Không cảnh báo (T)CPA, nếu phạm vi mục tiêu lớn hơn (NMi)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "Cảnh báo nếu CPA ít hơn (NMi)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "... và TCPA thấp hơn (giá trị nhỏ nhất)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "Đối tượng mất tín hiệu" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "Đánh dấu đối tượng là mất tín hiệu sau (phút)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "Xóa đối tượng bị mất tín hiệu sau (phút)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "Hiển thị" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "Hiển thị mũi tên dự đoán COG, độ dài (phút)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "Hiển thị lộ trình đối tượng (phút)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "Hiển thị thông báo khu vực (từ tin nhắn AIS)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "Hiển thị kích cỡ thực của đối tượng AIS" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "Hiển thị tên đối tượng AIS ở tỉ lệ lớn hơn 1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "Làm lại" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"Tên tàu\" MMSI (Call Sign)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[Lớp] loại (Trạng thái)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "Cảnh báo CPA/TCPA" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "Hiển thị hộp thoại cảnh báo CPA/TCPA" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "Phát âm thanh cảnh báo CPA/TCPA và DSC/SART trong trường hợp khẩn cấp." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "Cài đặt chung" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "Ngôn ngữ" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "Phông chữ" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "Chọn phông chữ..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "Chọn màu sắc phông chữ..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "Giao diện thanh công cụ và cửa sổ" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "Tùy chọn giao diện" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "Hiện Thanh Trạng Thái" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "Hiện thanh Menu" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "Hiển thị cửa sổ La bàn/Trạng thái GPS" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "Cho phép thanh công cụ tự ẩn" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "Bật chuông tàu" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "Cho phép dùng giao diện màn hình cảm ứng" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "Cho phép dùng giao diện thu nhỏ đồ họa" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "Hệ số tỷ lệ giao diện người dùng" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "Hệ số tỷ lệ biểu đồ" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "Áp dụng" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "Biểu đồ" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "Kết nối" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "Tàu thuyền" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "Giao diện người dùng" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "Phần bổ xung" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "Người dùng thiết lập biến đổi từ tính" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "feet" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "fathoms" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "Thêm một danh mục chứa tập tin bảng biểu" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - chiều dài của con tàu phải > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - Sườn ngang con tàu của bạn phải > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - Vị trí GPS giữa tàu phải nằm trong chiều ngang tàu của bạn" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - Vị trí GPS ở mũi tàu phải nằm trong chiều dài tàu của bạn" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - kích thước tối thiểu biểu tượng tàu của bạn phải trong khoảng 1mm và 100 mm" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "Các cài đặt cho kích thước thật của con tàu không chính xác:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "Việc nén sẽ làm thay đổi các tệp đồ thị trên đĩa. \\ Nđiều này có thể làm cho chúng không tương thích với các chương trình khác hoặc các phiên bản cũ của OpenCPN. \\ Ncác biểu đồ nén có thể mất một thời gian để tải và hiển thị trên một số hệ thống. \\ Nchúng có thể được giải nén lại bằng cách sử dụng các chương trình zip unxz hoặc 7." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "Biểu đồ nén OpenCPN" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "Không có biểu đồ nào được tìm thấy để nén." -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6830,71 +6842,71 @@ msgstr "nén %ld biểu đồ\n" "từ %.1fMB để %.1fMB\n" "Ghi lại %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "Nhập tên nhóm" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "Nhóm biểu đồ mới" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "Chọn dữ liệu thủy triều/ hiện tại" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "Nén kết cấu" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "Nén kết cấu với bộ nhớ đệm" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "Kết cấu nén bộ nhớ đệm" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "Kích thước bộ nhớ kết cấu (MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "Kích thước: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "Xây dựng lại kết cấu bộ nhớ đệm" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "Xoá kết cấu bộ nhớ đệm" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "Phần mềm OpenGL (khởi động lại OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "Sử dụng tăng tốc kéo dịch" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "Cài đặt kết cấu" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "Kết cấu bộ nhớ đệm" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "Linh tinh" @@ -6973,127 +6985,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7138,10 +7150,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS Rollover" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "" @@ -7259,12 +7267,6 @@ msgstr "&Tuyến đường từ Lộ trình theo dõi" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7465,15 +7467,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7776,7 +7778,7 @@ msgstr " (góc khu vực là đúng vòng bi từ biển) < msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7892,7 +7894,7 @@ msgstr "Hôm nay" msgid "Tomorrow" msgstr "Ngày mai" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "Chú giải" @@ -8173,153 +8175,156 @@ msgstr "Di chuyển điểm" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_zh_CN.po b/po/opencpn_zh_CN.po index 946b1c858b..298c1da321 100644 --- a/po/opencpn_zh_CN.po +++ b/po/opencpn_zh_CN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(未命名航迹)" @@ -414,7 +414,7 @@ msgstr "SAR航空器" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "移动识别码" @@ -476,7 +476,7 @@ msgstr " (最后所知)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "位置" @@ -509,11 +509,11 @@ msgstr "右" msgid "Left" msgstr "左" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "速度" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "高度" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "航行辅助" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "基地" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "km/h" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "m/s" @@ -2437,8 +2437,8 @@ msgstr "航点将被重命名以反映自然顺序,名称将为“001”、“ "你想重命名航点吗?" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "关于OpenCPN" @@ -2484,9 +2484,9 @@ msgstr "覆盖Garmin 设备路由编号1?" msgid "OpenCPN Message" msgstr "OpenCPN 消息" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "选项" @@ -2528,7 +2528,7 @@ msgstr "选择要打印的航迹" msgid "Track properties" msgstr "航迹属性" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2541,12 +2541,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2644,23 +2644,23 @@ msgstr "API插件" msgid "OpenCPN Website" msgstr "OpenCPN网站" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "OpenCPN无本地帮助文档。" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "需要访问opencpn.org网页获取更多信息吗?" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3060,7 +3060,7 @@ msgstr "取消-取消区域,以信息链接ID识别" msgid "Undefined (default)" msgstr "未定义(默认)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS目标名称" @@ -3071,7 +3071,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS报警" @@ -3087,7 +3087,7 @@ msgstr "&静默报警" msgid "&Jump To" msgstr "&跳至" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "创建航路点" @@ -3110,7 +3110,7 @@ msgid "-" msgstr "" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS目标列表" @@ -3199,38 +3199,38 @@ msgstr "目标计数" msgid "Undock Target List" msgstr "目标列表浮动" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "记录航迹" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "此目标当前所捕获的航迹已经纪律.\n" "OpenCPN退出前继续记录吗?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS目标查询" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "确认" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "停止航迹" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "菜单" @@ -3284,7 +3284,7 @@ msgstr "船只移动到此处" msgid "Navigate To Here" msgstr "航行至此" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "光标向上模式" @@ -3293,8 +3293,8 @@ msgid "Heading Up Mode" msgstr "朝向向上模式" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "北向上模式" @@ -3303,7 +3303,7 @@ msgid "Chart Up Mode" msgstr "海图向上模式" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "切换至全屏" @@ -3328,7 +3328,7 @@ msgstr "粘贴航迹" msgid "CM93 Offset Dialog..." msgstr "CM93补偿对话框……" -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "海图组" @@ -3446,7 +3446,7 @@ msgstr "复制为KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "删除" @@ -3600,18 +3600,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "海图面板选项" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "航行模式" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "北向上模式" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "航向向上模式" @@ -3619,32 +3619,32 @@ msgstr "航向向上模式" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "视线向前模式" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "显示选项" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "启用海图补接" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "显示网格" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "显示海图轮廓" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "显示深度单位" @@ -3664,7 +3664,7 @@ msgstr "潮水及海流" msgid "Show Tide stations" msgstr "显示潮汐站" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "显示海流" @@ -3680,8 +3680,8 @@ msgstr "显示文本" msgid "Show depths" msgstr "显示深度" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "浮标/灯塔标签" @@ -3689,8 +3689,8 @@ msgstr "浮标/灯塔标签" msgid "Lights" msgstr "灯塔" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "灯塔描述" @@ -3706,18 +3706,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "显示分类" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "标准" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "所有" @@ -3762,7 +3762,7 @@ msgstr "用作活动目录" msgid "Latest available catalog:" msgstr "最新可用目录:" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "无法从 url 下载数据" @@ -3817,8 +3817,8 @@ msgstr "失败: " #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4150,28 +4150,28 @@ msgstr "回答“否”将为此航线创建所有新的航路点." msgid "Merge waypoints?" msgstr "合并航路点?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "航线区段信息翻转" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "MBTile需要启用OpenGL" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "英尺" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "米" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "寻" @@ -4179,7 +4179,7 @@ msgstr "寻" msgid "OverZoom" msgstr "超过缩放范围" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "延伸潮汐图标" @@ -4195,7 +4195,7 @@ msgstr "AIS目标查询" msgid "Show all AIS Targets" msgstr "显示所有AIS目标" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "弱化次关键AIS目标" @@ -4243,9 +4243,9 @@ msgstr "用户X轴补偿" msgid "User Y Offset" msgstr "用户Y轴补偿" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "米" @@ -4256,11 +4256,13 @@ msgstr "本区段" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "面板图例" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "面板数值" @@ -4296,12 +4298,12 @@ msgstr "有效航速时预抵时间" msgid "ETA @SOG" msgstr "对地航速时预抵时间" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "标题" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4330,7 +4332,7 @@ msgid "Less" msgstr "更少" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4619,12 +4621,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN警报" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN信息" @@ -4633,17 +4635,17 @@ msgstr "OpenCPN信息" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "选择所有" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "清除所有" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "添加" @@ -4669,59 +4671,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "通用的" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4779,7 +4781,7 @@ msgid "Install" msgstr "安装" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "重新安装" @@ -4787,7 +4789,7 @@ msgstr "重新安装" msgid "Update" msgstr "更新" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "降级" @@ -4817,7 +4819,7 @@ msgid " successfully installed" msgstr " 已成功安装" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "安装完成" @@ -4825,6 +4827,21 @@ msgstr "安装完成" msgid "Installation error" msgstr "安装错误" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AIS翻转" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4837,7 +4854,7 @@ msgstr "等待栅格海图线程退出." msgid "OpenCPN Compressed Cache Update" msgstr "OpenCPN 压缩缓存更新" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "自本船距离: %4.0f 海里" @@ -4958,7 +4975,7 @@ msgstr "本航路点是图层的一部分,不能编辑" msgid "Icon" msgstr "图标" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "" @@ -4968,7 +4985,7 @@ msgid "Links" msgstr "链接" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5009,22 +5026,22 @@ msgstr "量距环" msgid "Number" msgstr "数字" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "距离" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "颜色" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "无" @@ -5114,16 +5131,16 @@ msgstr "在……比例尺时显示" msgid "Tide Station not found" msgstr "找不到潮汐站" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "设置比例" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "图表比例" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "持久的" @@ -5155,35 +5172,35 @@ msgstr "NMEA调试窗口" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5231,8 +5248,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5240,277 +5257,277 @@ msgstr "" msgid "Anchorage created " msgstr "锚泊已创建" -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "启用航迹记录" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "自动跟随" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "放大" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "缩小" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "显示海图条" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "显示ENC文本" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "显示潮汐" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "改变色彩方案" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "显示AIS目标" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "创建航线" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "投放有人落水标志" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "首选项" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "打印故障。\n" "可能目前打印机设置不正确?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(未命名航线)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "本船" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "航线&标志管理器" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "打印海图" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl键+空格键)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " @@ -5518,105 +5535,105 @@ msgstr "根据当前设置创建一个私有配置模板.\n" "这一模板将被保存,并且可在以后任何时候调用.\n" " " -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "NMEA扩展属性" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "航迹记录" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "默认航迹记录" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "总是记录航迹" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr " 从不记录航迹" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "忽略此MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "将此MMSI 视为 SART/PLB(AIS) 有人落水." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "为此MMSI将AIVDM转换为AIVDO" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "此MMSI为跟从者 - 无需CPA报警" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "MMSI一般为9个数字的号码.\n" "请检查输入值,必要的取消." -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "默认" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "总是" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "从不" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "编辑MMSI属性" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI属性" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "航迹模式" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "忽略" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "有人落水" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "船只名称" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "跟从者" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "新的..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "添加MMSI属性" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5634,7 +5651,7 @@ msgstr "设备不可用,OpenCPN不能使用当前状态的该设备。\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "获取更多信息,参见公开文档中的LINUX_DEVICES.md文件.\n" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5654,1180 +5671,1175 @@ msgstr "\n" " KERNEL==\"ttyS*\", MODE=\"0666\"\n\n" "获取更多信息,参见公开文档中的LINUX_DEVICES.md文件.\n" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG前伸长度(分钟)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "朝向前伸长度(海里)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "船只图标类型" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "真实比例尺位图" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "真是比例尺矢量图" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "总长(米)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "总宽度(米)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS自船艏补偿长度(米)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS自船中补偿长度(米)" -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "最小屏幕大小(毫米)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "显示量程同心环" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "雷达同心圆间距" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "距离单位" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "海里" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "公里" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "量程同心环颜色" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "显示指向活动航路点的方向" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "样式" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "实线" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "点线" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "长横杠线" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "短横杠线" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "点横杠线" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "默认颜色" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "黑色" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "暗红色" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "墨绿色" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "深黄色" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "深蓝色" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "暗洋红色" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "深青色" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "浅灰色" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "深灰色" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "红色" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "绿色" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "黄色" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "蓝色" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "洋红色" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "青色" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "白色" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "航迹" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "零点时自动记录每日航迹" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "自动记录每日航迹从" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "计算机" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "国际协调时" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "本地时间" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "突出显示航迹" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "航迹记录准确性" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "低" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "中" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "高" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "计算数值" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "计算位置变化后的对地航速和对地航向" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "跟新之间的最小秒数" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "航线/点" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "新航线" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "航路点默认图标" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "航路点抵达半径(海里)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "仅作为到达用驶抵航线航路点" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "忽略基于能见度的海图比例尺设置并总是显示" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "航路点量程同心环颜色" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "控制选项" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "删除航迹和航线确认" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "海图文件" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "目录" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "添加目录……" -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "移除选定" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "压缩选定" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "添加..." -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "移除" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "压缩" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "迁移图表..." -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "更新控制" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "扫描海图并更新数据库" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "强制数据亏重建" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "准备所有ENC海图" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr " [更正的]" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "模板" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "模板状态" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "最后一个引用的模板名称:" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "已保存模板" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "创建配置……" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "删除所选配置……" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "使用所选配置" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "创建配置" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "使用所选配置时问题。" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "高级" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "相位补偿栅格海图" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "使用加速图形(OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "OpenGL选项" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "海图旋转平均时间" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "秒" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "海图缩放/比例尺权重" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "栅格图" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "扇形" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "CM93海图细节水平" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "物理屏宽度" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "自动" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "手动:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "毫米" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "海图显示" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "显示倾斜栅格海图为北向上" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "数值低时,同等缩放水平显示低细节海图.\n" "数值高时,同等缩放水平显示多细节海图." -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "图形" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "矢量海图显示" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "船用标准" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "测量深度" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "海图信息目标" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "浮标/灯塔" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "延伸扇形灯塔" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "海图文本" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "海图上的本国文本" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "仅重要文本" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "清理文本" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "海图细节" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "小比例尺时减少的细节" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "图形样式" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "纸海图" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "简化的" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "疆界" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "平原" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "象征的" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "颜色" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2色" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4色" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "浅水深度" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "安全水深" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "深水深度" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "用户标准对象" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "还原至标准" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "潮汐&&海流" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "活动数据组" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "添加数据组……" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "所有可用海图" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "移除海图" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "所有海图" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "新组..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "删除组" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "海图转换时保留比例尺大小" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "控制" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "平滑计划/缩放" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "缩放至光标" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "显示性能" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "状态栏选项" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "光标处即时ETA" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "默认船速" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "画布布局" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "状态栏" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "单位" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "法定英里" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "节" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "迈" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "深度" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "温度" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "摄氏度" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "华氏度" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "绝对温度(K)" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "纬度/经度" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "度数,小数点分钟数" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "小数点度数" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "度,分,秒" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "方位" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "显示真实的" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "显示磁方位" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "假定磁变" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "度 (-西, +东)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "显示真方位及朝向" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "显示磁方位及朝向。" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "WMM插件计算出的磁变" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr " 如手动设置磁变,\n" " 必须禁用WMM插件." -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "测试" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "音频文件名:" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "选择声音文件" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "声音" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "走锚警报" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "走锚警报触发时播放声音。" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "选择走锚警报声" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "AIS警报触发时播放声音。" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "选择 AIS 警报声" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "SART 警报" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "AIS SART 警报触发时播放声音。" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "选择 AIS SART 警报声" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "DSC 警报" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "在 DSC 通知时播放声音" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "选择DSC通知提示音" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "未知设备:" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "输入设备:" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "声音设备" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "声音播放命令:" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS目标" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA计算" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "无(T)CPA报警,如果目标量程大于 (海里)" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "报警,如果CPA小于(海里)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...并且TCPA少于(分钟)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "目标丢失" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "目标视作丢失,在(分钟)后" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "移除丢失目标,在(分钟)后" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "显示" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "显示目标COG前伸箭头,长度(分钟)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "显示目标航迹,长度(分钟)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "抑制锚泊/系泊目标,最大速度(节)" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "画出AIS实时预报,目标速度分钟(节)" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "允许次关键目标衰减,如果多于...个目标的话" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "显示区域通告(从AIS二进制信息)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "显示AIS目标真实大小" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "比例尺大于1时显示带有AIS目标的名称:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "使用 WPL 位置信息。收到时动作:" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "APRS 位置报告" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "创建标记" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "翻转" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "启用航线/AIS信息块" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"船只名称\" MMSI(呼号)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[船级]类型(状态)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "对地速度 对地航向" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "最小会遇距离 最近会遇时间" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA报警" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "显示CPA/TCPA报警对话框" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "CPA/TCPA报警及DSC/SART应急时播放声音." -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "抑制锚泊/系泊目标警报" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "启用目标报警确认超时(分钟)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "通用选项" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "语言" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "字体" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "选择字体..." -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "选择字体颜色..." -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "样品" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "工具栏及窗口样式" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "界面选项" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "显示状态条" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "显示菜单栏" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "显示指南针/GPS状态窗口" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "启用工具栏自动隐藏" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "播放船钟" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "启用触摸屏界面" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "启用成比例的图形界面" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "显示缩放按钮" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "用户界面比例尺大小" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "海图目标比例尺大小" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "船只比例尺大小" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "ENC 探深因子" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "应用" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "海图" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "连接" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr "船只" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "用户界面" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "插件" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "用户设置磁变" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "英尺" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "英寻" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "添加包含海图文件的目录" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - 船长必须 > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - 船宽必须 > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - 自船中的GPS补偿必须在船只宽度以内" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - 自船艏的GPS补偿必须在船只长度以内" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " -船只图标的最小规格必须在1和100海里之间" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "本船真实大小的设置不正确:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" @@ -6837,15 +6849,15 @@ msgstr "压缩将改变桌面海图文件.\n" "压缩的海图可能在某些系统中需要较长时间装载及显示.\n" "它们可用unxz或7zip解压缩." -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "OpenCPN压缩海图" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "未发现可压缩海图。" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" @@ -6854,71 +6866,71 @@ msgstr "压缩 %ld 海图\n" "从 %.1fMB 至 %.1fMB\n" "节省 %.1fMB (%.1f%%)" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "输入组名称" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "新海图组" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "选择潮汐/海流数据" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "纹理压缩" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "带缓存的纹理压缩" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "纹理压缩缓存" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "纹理存储空间(MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "规格:" -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "重建纹理缓存" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "清除纹理缓存" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "多边形平滑" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "线条平滑" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "OpenCPN软件(重启OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "使用加速计划" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "纹理设置" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "纹理缓存" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "杂项" @@ -7000,127 +7012,127 @@ msgstr "请检查系统日志以获取更多信息。" msgid " successfully installed from cache" msgstr " 从缓存中成功安装" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "这些设置可能会破坏OpenCPN的稳定,因此默认禁用。 在充分了解此风险的前提下,可以手动在配置文件中的 [PlugIns] 章节中添加一行 CatalogExpert=1 来启用该设置。" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "插件目录" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "更新插件目录" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "导入插件" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "设置..." -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "已禁用" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "更新插件目录:主目录" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "OpenCPN 目录更新" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "无法复制目录文件" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "无法将目录文件复制到缓存" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "目录更新成功" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "选择存档文件" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "OpenCPN 插件导入错误" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "检测到不兼容的导入插件。" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "提取导入插件存档时出错。" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "当前活动的目录" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "最后更改: " -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "请更新插件目录。" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "卸载" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "已启用" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "升级到版本 " -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "安装..." -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "更新到 " -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "网址" @@ -7165,10 +7177,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AIS翻转" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "潮汐海流画面翻转" @@ -7286,12 +7294,6 @@ msgstr "从航迹制作航线" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7494,15 +7496,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7807,7 +7809,7 @@ msgstr "<字体大小=-2>(扇形角度为海向真方位)

" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7923,7 +7925,7 @@ msgstr "今天" msgid "Tomorrow" msgstr "明天" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "工具提示" @@ -8205,153 +8207,156 @@ msgstr "移动航路点" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/po/opencpn_zh_TW.po b/po/opencpn_zh_TW.po index e77846922c..4db4fb33d3 100644 --- a/po/opencpn_zh_TW.po +++ b/po/opencpn_zh_TW.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-16 20:55-0400\n" -"PO-Revision-Date: 2024-06-24 02:23\n" +"POT-Creation-Date: 2024-07-24 16:20-0400\n" +"PO-Revision-Date: 2024-07-31 19:36\n" "Last-Translator: \n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" @@ -17,8 +17,8 @@ msgstr "" "X-Crowdin-File: /po/opencpn.pot\n" "X-Crowdin-File-ID: 102\n" -#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3021 -#: gui/src/ocpn_frame.cpp:6426 gui/src/ocpn_frame.cpp:6544 +#: model/include/model/track.h:121 gui/src/ocpn_frame.cpp:3027 +#: gui/src/ocpn_frame.cpp:6422 gui/src/ocpn_frame.cpp:6540 msgid "(Unnamed Track)" msgstr "(未命名航跡)" @@ -414,7 +414,7 @@ msgstr "搜救飛機" #: model/src/ais_target_data.cpp:489 model/src/ais_target_data.cpp:501 #: model/src/ais_target_data.cpp:517 gui/src/AISTargetListDialog.cpp:569 -#: gui/src/options.cpp:903 gui/src/options.cpp:1225 +#: gui/src/options.cpp:907 gui/src/options.cpp:1229 msgid "MMSI" msgstr "MMSI" @@ -476,7 +476,7 @@ msgstr " (最後所知)" #: model/src/ais_target_data.cpp:690 gui/src/GoToPositionDialog.cpp:113 #: gui/src/priority_gui.cpp:221 gui/src/routeprintout.cpp:107 #: gui/src/routeprintout.cpp:376 gui/src/trackprintout.cpp:88 -#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:74 +#: gui/src/trackprintout.cpp:298 gui/src/initwiz/wiz_ui_proto.cpp:77 msgid "Position" msgstr "位置" @@ -509,11 +509,11 @@ msgstr "寬度" msgid "Left" msgstr "Left" -#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4333 -#: gui/src/options.cpp:4490 gui/src/RoutePropDlg.cpp:389 +#: model/src/ais_target_data.cpp:835 gui/src/options.cpp:4337 +#: gui/src/options.cpp:4494 gui/src/RoutePropDlg.cpp:389 #: gui/src/trackprintout.cpp:100 gui/src/trackprintout.cpp:339 #: gui/src/TrackPropDlg.cpp:311 gui/src/TrackPropDlg.cpp:1351 -#: gui/src/initwiz/wiz_ui_proto.cpp:52 +#: gui/src/initwiz/wiz_ui_proto.cpp:57 msgid "Speed" msgstr "船速" @@ -566,7 +566,7 @@ msgid "Altitude" msgstr "緯度" #: model/src/ais_target_data.cpp:905 model/src/ais_target_data.cpp:1178 -#: gui/src/options.cpp:4346 gui/src/initwiz/wiz_ui_proto.cpp:62 +#: gui/src/options.cpp:4350 gui/src/initwiz/wiz_ui_proto.cpp:67 msgid "Wind speed" msgstr "" @@ -709,7 +709,7 @@ msgid "Aid to Navigation" msgstr "導航協助" #: model/src/ais_target_data.cpp:1336 gui/src/CanvasOptions.cpp:326 -#: gui/src/options.cpp:3311 gui/src/options.cpp:3514 +#: gui/src/options.cpp:3315 gui/src/options.cpp:3518 msgid "Base" msgstr "基本" @@ -2262,21 +2262,21 @@ msgid "cm" msgstr "" #: model/src/navutil_base.cpp:323 model/src/navutil_base.cpp:349 -#: gui/src/initwiz/wiz_ui_proto.cpp:56 gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/initwiz/wiz_ui_proto.cpp:61 gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "mph" msgstr "" #: model/src/navutil_base.cpp:326 model/src/navutil_base.cpp:352 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "km/h" msgstr "公里/小時" #: model/src/navutil_base.cpp:329 model/src/navutil_base.cpp:346 -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "m/s" msgstr "公尺/秒" @@ -2436,8 +2436,8 @@ msgid "Waypoints will be renamed to reflect the natural order, the names will be msgstr "" #: gui/include/gui/AboutFrame.h:87 gui/include/gui/AboutFrameImpl.h:68 -#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3592 -#: gui/src/ocpn_frame.cpp:7074 +#: gui/include/gui/about.h:38 gui/src/ocpn_frame.cpp:3601 +#: gui/src/ocpn_frame.cpp:7070 msgid "About OpenCPN" msgstr "關於 OpenCPN" @@ -2483,9 +2483,9 @@ msgstr "" msgid "OpenCPN Message" msgstr "" -#: gui/include/gui/options.h:97 gui/src/ocpn_frame.cpp:3582 -#: gui/src/ocpn_frame.cpp:3860 gui/src/ocpn_frame.cpp:4916 -#: gui/src/ocpn_frame.cpp:7033 gui/src/options.cpp:3251 +#: gui/include/gui/options.h:96 gui/src/ocpn_frame.cpp:3591 +#: gui/src/ocpn_frame.cpp:3869 gui/src/ocpn_frame.cpp:4912 +#: gui/src/ocpn_frame.cpp:7029 gui/src/options.cpp:3255 msgid "Options" msgstr "選項" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Track properties" msgstr "航迹属性" -#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:83 +#: gui/include/gui/wiz_ui.h:69 gui/include/gui/wiz_ui_proto.h:86 msgid "OpenCPN Initial Configuration" msgstr "" @@ -2540,12 +2540,12 @@ msgstr "" #: gui/src/conn_params_panel.cpp:803 gui/src/glChartCanvas.cpp:3809 #: gui/src/glTextureManager.cpp:1447 gui/src/gui_lib.cpp:155 #: gui/src/gui_lib.cpp:293 gui/src/LinkPropDlg.cpp:37 gui/src/MarkInfo.cpp:225 -#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4559 -#: gui/src/ocpn_frame.cpp:8616 gui/src/OCPNPlatform.cpp:1634 +#: gui/src/MarkInfo.cpp:277 gui/src/ocpn_frame.cpp:4555 +#: gui/src/ocpn_frame.cpp:8613 gui/src/OCPNPlatform.cpp:1634 #: gui/src/OCPNPlatform.cpp:1893 gui/src/OCPNPlatform.cpp:1932 -#: gui/src/options.cpp:640 gui/src/options.cpp:665 gui/src/options.cpp:1194 -#: gui/src/options.cpp:1684 gui/src/options.cpp:8558 gui/src/options.cpp:8795 -#: gui/src/options.cpp:9035 gui/src/options.cpp:9173 gui/src/Osenc.cpp:1688 +#: gui/src/options.cpp:644 gui/src/options.cpp:669 gui/src/options.cpp:1198 +#: gui/src/options.cpp:1688 gui/src/options.cpp:8588 gui/src/options.cpp:8825 +#: gui/src/options.cpp:9065 gui/src/options.cpp:9203 gui/src/Osenc.cpp:1688 #: gui/src/routemanagerdialog.cpp:317 gui/src/RoutePropDlg.cpp:84 #: gui/src/TCWin.cpp:78 gui/src/TCWin.cpp:172 gui/src/toolbar.cpp:2390 #: gui/src/TrackPropDlg.cpp:112 gui/src/TrackPropDlg.cpp:326 @@ -2642,23 +2642,23 @@ msgstr "" msgid "OpenCPN Website" msgstr "" -#: gui/src/AboutFrameImpl.cpp:94 +#: gui/src/AboutFrameImpl.cpp:100 msgid "OpenCPN Help documentation is not available locally." msgstr "" -#: gui/src/AboutFrameImpl.cpp:97 +#: gui/src/AboutFrameImpl.cpp:103 msgid "Would you like to visit the opencpn.org website for more information?" msgstr "" -#: gui/src/AboutFrameImpl.cpp:101 gui/src/ais_info_gui.cpp:104 -#: gui/src/AISTargetQueryDialog.cpp:178 gui/src/connection_edit.cpp:2551 +#: gui/src/AboutFrameImpl.cpp:107 gui/src/ais_info_gui.cpp:104 +#: gui/src/AISTargetQueryDialog.cpp:176 gui/src/connection_edit.cpp:2551 #: gui/src/connection_edit.cpp:2564 gui/src/LinkPropDlg.cpp:134 #: gui/src/MarkInfo.cpp:1961 gui/src/navutil.cpp:3265 gui/src/ocpn_frame.cpp:721 -#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4253 -#: gui/src/options.cpp:1033 gui/src/options.cpp:2815 gui/src/options.cpp:7862 -#: gui/src/options.cpp:7899 gui/src/pluginmanager.cpp:311 +#: gui/src/ocpn_frame.cpp:868 gui/src/ocpn_frame.cpp:4249 +#: gui/src/options.cpp:1037 gui/src/options.cpp:2819 gui/src/options.cpp:7867 +#: gui/src/options.cpp:7904 gui/src/pluginmanager.cpp:311 #: gui/src/pluginmanager.cpp:624 gui/src/pluginmanager.cpp:878 -#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:914 +#: gui/src/route_gui.cpp:608 gui/src/route_point_gui.cpp:915 #: gui/src/SendToPeerDlg.cpp:62 gui/src/SendToPeerDlg.cpp:77 #: gui/src/SendToPeerDlg.cpp:85 gui/src/SendToPeerDlg.cpp:93 #: gui/src/SendToPeerDlg.cpp:100 gui/src/SendToPeerDlg.cpp:107 @@ -3058,7 +3058,7 @@ msgstr "刪除 - 刪除定義於訊息連結ID區域" msgid "Undefined (default)" msgstr "未定義(預設)" -#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 +#: gui/src/ais.cpp:750 gui/src/ais.cpp:1719 gui/src/FontMgr.cpp:227 msgid "AIS Target Name" msgstr "AIS目标名称" @@ -3069,7 +3069,7 @@ msgid "\n" "Do you instead want to stop Persistent Tracking for this target?\n" msgstr "" -#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4873 +#: gui/src/ais_info_gui.cpp:203 gui/src/options.cpp:4877 msgid "AIS Alert" msgstr "AIS警报" @@ -3085,7 +3085,7 @@ msgstr "&S無聲警報" msgid "&Jump To" msgstr "&J跳轉到" -#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:276 +#: gui/src/AISTargetAlertDialog.cpp:204 gui/src/AISTargetQueryDialog.cpp:274 msgid "Create Waypoint" msgstr "建立航路點" @@ -3108,7 +3108,7 @@ msgid "-" msgstr "-" #: gui/src/AISTargetListDialog.cpp:350 gui/src/canvasMenu.cpp:694 -#: gui/src/ocpn_frame.cpp:3546 +#: gui/src/ocpn_frame.cpp:3555 msgid "AIS target list" msgstr "AIS 目標列表" @@ -3197,38 +3197,38 @@ msgstr "目標計數" msgid "Undock Target List" msgstr "" -#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:280 -#: gui/src/AISTargetQueryDialog.cpp:311 +#: gui/src/AISTargetQueryDialog.cpp:141 gui/src/AISTargetQueryDialog.cpp:278 +#: gui/src/AISTargetQueryDialog.cpp:309 msgid "Record Track" msgstr "記錄軌跡" -#: gui/src/AISTargetQueryDialog.cpp:175 +#: gui/src/AISTargetQueryDialog.cpp:173 msgid "The recently captured track of this target has been recorded.\n" "Do you want to continue recording until the end of the current OpenCPN session?" msgstr "已錄下了這一目標最近擷取的軌跡。 \n" "Do 您想要繼續錄製,直到目前的 OpenCPN 程式結束嗎?" -#: gui/src/AISTargetQueryDialog.cpp:197 +#: gui/src/AISTargetQueryDialog.cpp:195 msgid "AISTargetQuery" msgstr "AIS 目標查詢" -#: gui/src/AISTargetQueryDialog.cpp:285 gui/src/catalog_mgr.cpp:193 +#: gui/src/AISTargetQueryDialog.cpp:283 gui/src/catalog_mgr.cpp:193 #: gui/src/catalog_mgr.cpp:585 gui/src/catalog_mgr.cpp:606 gui/src/cm93.cpp:6324 -#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:190 -#: gui/src/options.cpp:853 gui/src/options.cpp:955 gui/src/options.cpp:5802 +#: gui/src/GoToPositionDialog.cpp:150 gui/src/MUIBar.cpp:195 +#: gui/src/options.cpp:857 gui/src/options.cpp:959 gui/src/options.cpp:5806 #: gui/src/routeprintout.cpp:428 gui/src/TCWin.cpp:115 gui/src/TCWin.cpp:124 #: gui/src/toolbar.cpp:2457 gui/src/trackprintout.cpp:359 #: gui/src/TrackPropDlg.cpp:615 gui/src/TrackPropDlg.cpp:1003 msgid "OK" msgstr "確定" -#: gui/src/AISTargetQueryDialog.cpp:309 +#: gui/src/AISTargetQueryDialog.cpp:307 msgid "Stop Tracking" msgstr "停止追蹤" #: gui/src/canvasMenu.cpp:240 gui/src/canvasMenu.cpp:269 #: gui/src/canvasMenu.cpp:302 gui/src/canvasMenu.cpp:1051 -#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1146 +#: gui/src/canvasMenu.cpp:1074 gui/src/options.cpp:1150 msgid "Menu" msgstr "選單" @@ -3282,7 +3282,7 @@ msgstr "移动船舶至此" msgid "Navigate To Here" msgstr "导航到这里" -#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3441 +#: gui/src/canvasMenu.cpp:523 gui/src/ocpn_frame.cpp:3450 msgid "Course Up Mode" msgstr "航向朝上模式" @@ -3291,8 +3291,8 @@ msgid "Heading Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:527 gui/src/canvasMenu.cpp:534 -#: gui/src/ocpn_frame.cpp:3154 gui/src/ocpn_frame.cpp:3440 -#: gui/src/ocpn_frame.cpp:5951 +#: gui/src/ocpn_frame.cpp:3160 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:5947 msgid "North Up Mode" msgstr "北方朝上模式" @@ -3301,7 +3301,7 @@ msgid "Chart Up Mode" msgstr "" #: gui/src/canvasMenu.cpp:543 gui/src/canvasMenu.cpp:550 -#: gui/src/ocpn_frame.cpp:3522 +#: gui/src/ocpn_frame.cpp:3531 msgid "Toggle Full Screen" msgstr "" @@ -3326,7 +3326,7 @@ msgstr "貼上 航跡" msgid "CM93 Offset Dialog..." msgstr "CM93 Offset 對話框..." -#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3785 gui/src/options.cpp:3849 +#: gui/src/canvasMenu.cpp:611 gui/src/options.cpp:3789 gui/src/options.cpp:3853 msgid "Chart Groups" msgstr "海圖群組" @@ -3444,7 +3444,7 @@ msgstr "複製為 KML" #: gui/src/canvasMenu.cpp:758 gui/src/canvasMenu.cpp:812 #: gui/src/canvasMenu.cpp:869 gui/src/canvasMenu.cpp:920 #: gui/src/connection_edit.cpp:2411 gui/src/MarkInfo.cpp:485 -#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1142 +#: gui/src/MarkInfo.cpp:1167 gui/src/MarkInfo.cpp:1208 gui/src/options.cpp:1146 #: gui/src/RoutePropDlg.cpp:464 gui/src/TrackPropDlg.cpp:907 msgid "Delete" msgstr "刪除" @@ -3598,18 +3598,18 @@ msgstr "" msgid "Chart Panel Options" msgstr "" -#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3947 -#: gui/src/options.cpp:4130 +#: gui/src/CanvasOptions.cpp:136 gui/src/options.cpp:3951 +#: gui/src/options.cpp:4134 msgid "Navigation Mode" msgstr "導航模式" -#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3955 -#: gui/src/options.cpp:4138 +#: gui/src/CanvasOptions.cpp:143 gui/src/options.cpp:3959 +#: gui/src/options.cpp:4142 msgid "North Up" msgstr "北方朝上" -#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3958 -#: gui/src/options.cpp:4141 +#: gui/src/CanvasOptions.cpp:151 gui/src/options.cpp:3962 +#: gui/src/options.cpp:4145 msgid "Course Up" msgstr "航路朝上" @@ -3617,32 +3617,32 @@ msgstr "航路朝上" msgid "Heading Up" msgstr "" -#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3965 -#: gui/src/options.cpp:4148 +#: gui/src/CanvasOptions.cpp:169 gui/src/options.cpp:3969 +#: gui/src/options.cpp:4152 msgid "Look Ahead Mode" msgstr "前方預視模式" -#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1874 +#: gui/src/CanvasOptions.cpp:180 gui/src/options.cpp:1878 msgid "Display Options" msgstr "顯示選項" -#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3465 -#: gui/src/ocpn_frame.cpp:3471 gui/src/options.cpp:3980 gui/src/options.cpp:4163 +#: gui/src/CanvasOptions.cpp:185 gui/src/ocpn_frame.cpp:3474 +#: gui/src/ocpn_frame.cpp:3480 gui/src/options.cpp:3984 gui/src/options.cpp:4167 msgid "Enable Chart Quilting" msgstr "啟用自動接圖功能" -#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4021 -#: gui/src/options.cpp:4208 +#: gui/src/CanvasOptions.cpp:192 gui/src/options.cpp:4025 +#: gui/src/options.cpp:4212 msgid "Show Grid" msgstr "顯示經緯度網格" -#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3467 -#: gui/src/ocpn_frame.cpp:3473 gui/src/options.cpp:4025 gui/src/options.cpp:4212 +#: gui/src/CanvasOptions.cpp:199 gui/src/ocpn_frame.cpp:3476 +#: gui/src/ocpn_frame.cpp:3482 gui/src/options.cpp:4029 gui/src/options.cpp:4216 msgid "Show Chart Outlines" msgstr "顯示海圖圖框" -#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4029 -#: gui/src/options.cpp:4216 +#: gui/src/CanvasOptions.cpp:206 gui/src/options.cpp:4033 +#: gui/src/options.cpp:4220 msgid "Show Depth Units" msgstr "顯示水深單位" @@ -3662,7 +3662,7 @@ msgstr "" msgid "Show Tide stations" msgstr "" -#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3509 +#: gui/src/CanvasOptions.cpp:248 gui/src/ocpn_frame.cpp:3518 msgid "Show Currents" msgstr "顯示海流" @@ -3678,8 +3678,8 @@ msgstr "" msgid "Show depths" msgstr "" -#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3349 -#: gui/src/options.cpp:3543 +#: gui/src/CanvasOptions.cpp:277 gui/src/options.cpp:3353 +#: gui/src/options.cpp:3547 msgid "Buoy/Light Labels" msgstr "浮標/燈光 標註" @@ -3687,8 +3687,8 @@ msgstr "浮標/燈光 標註" msgid "Lights" msgstr "" -#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3354 -#: gui/src/options.cpp:3548 +#: gui/src/CanvasOptions.cpp:291 gui/src/options.cpp:3358 +#: gui/src/options.cpp:3552 msgid "Light Descriptions" msgstr "燈號說明" @@ -3704,18 +3704,18 @@ msgstr "" msgid "Show chart data quality" msgstr "" -#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3309 -#: gui/src/options.cpp:3512 +#: gui/src/CanvasOptions.cpp:324 gui/src/options.cpp:3313 +#: gui/src/options.cpp:3516 msgid "Display Category" msgstr "顯示分類" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "Standard" msgstr "標準" -#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3311 -#: gui/src/options.cpp:3514 +#: gui/src/CanvasOptions.cpp:326 gui/src/options.cpp:3315 +#: gui/src/options.cpp:3518 msgid "All" msgstr "全部" @@ -3760,7 +3760,7 @@ msgstr "" msgid "Latest available catalog:" msgstr "" -#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3854 +#: gui/src/catalog_mgr.cpp:292 gui/src/pluginmanager.cpp:3855 msgid "Cannot download data from url" msgstr "" @@ -3815,8 +3815,8 @@ msgstr "" #: gui/src/catalog_mgr.cpp:604 gui/src/connection_edit.cpp:237 #: gui/src/connection_edit.cpp:2415 gui/src/GoToPositionDialog.cpp:146 #: gui/src/LinkPropDlg.cpp:76 gui/src/MarkInfo.cpp:751 gui/src/MarkInfo.cpp:1931 -#: gui/src/MUIBar.cpp:186 gui/src/options.cpp:850 gui/src/options.cpp:952 -#: gui/src/options.cpp:5806 gui/src/options.cpp:9096 +#: gui/src/MUIBar.cpp:191 gui/src/options.cpp:854 gui/src/options.cpp:956 +#: gui/src/options.cpp:5810 gui/src/options.cpp:9126 #: gui/src/priority_gui.cpp:112 gui/src/rest_server_gui.cpp:171 #: gui/src/rest_server_gui.cpp:298 gui/src/routeprintout.cpp:424 #: gui/src/RoutePropDlg.cpp:547 gui/src/SendToGpsDlg.cpp:203 @@ -4148,28 +4148,28 @@ msgstr "回答 'No' 將會為此航路建立全新的轉向點." msgid "Merge waypoints?" msgstr "合併轉向點?" -#: gui/src/chcanv.cpp:10556 gui/src/RolloverWin.cpp:144 +#: gui/src/chcanv.cpp:10556 gui/src/FontMgr.cpp:219 gui/src/RolloverWin.cpp:144 #: gui/src/RolloverWin.cpp:312 msgid "RouteLegInfoRollover" msgstr "航程資訊浮動顯示" -#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1000 +#: gui/src/chcanv.cpp:11357 gui/src/mbtiles/mbtiles.cpp:1005 msgid "MBTile requires OpenGL to be enabled" msgstr "" -#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4364 gui/src/options.cpp:4513 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12012 gui/src/options.cpp:4368 gui/src/options.cpp:4517 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Feet" msgstr "英呎" -#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4321 gui/src/options.cpp:4365 -#: gui/src/options.cpp:4482 gui/src/options.cpp:4514 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/chcanv.cpp:12014 gui/src/options.cpp:4325 gui/src/options.cpp:4369 +#: gui/src/options.cpp:4486 gui/src/options.cpp:4518 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Meters" msgstr "公尺" -#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4366 gui/src/options.cpp:4515 -#: gui/src/initwiz/wiz_ui_proto.cpp:36 +#: gui/src/chcanv.cpp:12016 gui/src/options.cpp:4370 gui/src/options.cpp:4519 +#: gui/src/initwiz/wiz_ui_proto.cpp:41 msgid "Fathoms" msgstr "噚" @@ -4177,7 +4177,7 @@ msgstr "噚" msgid "OverZoom" msgstr "過度縮放" -#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 +#: gui/src/chcanv.cpp:12387 gui/src/chcanv.cpp:12388 gui/src/FontMgr.cpp:223 msgid "ExtendedTideIcon" msgstr "延伸潮汐圖示" @@ -4193,7 +4193,7 @@ msgstr "AIS 目標查詢" msgid "Show all AIS Targets" msgstr "" -#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3529 +#: gui/src/chcanv.cpp:13202 gui/src/ocpn_frame.cpp:3538 msgid "Attenuate less critical AIS targets" msgstr "" @@ -4241,9 +4241,9 @@ msgstr "使用者 X 偏移量" msgid "User Y Offset" msgstr "使用者 Y 偏移量" -#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3447 -#: gui/src/options.cpp:3457 gui/src/options.cpp:3467 gui/src/options.cpp:3662 -#: gui/src/options.cpp:3671 gui/src/options.cpp:3680 gui/src/options.cpp:6507 +#: gui/src/cm93.cpp:6298 gui/src/cm93.cpp:6312 gui/src/options.cpp:3451 +#: gui/src/options.cpp:3461 gui/src/options.cpp:3471 gui/src/options.cpp:3666 +#: gui/src/options.cpp:3675 gui/src/options.cpp:3684 gui/src/options.cpp:6511 msgid "meters" msgstr "公尺" @@ -4254,11 +4254,13 @@ msgstr "本區段" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:570 +#: gui/src/FontMgr.cpp:213 msgid "Console Legend" msgstr "Console 圖例" #: gui/src/concanv.cpp:110 gui/src/concanv.cpp:114 gui/src/concanv.cpp:118 #: gui/src/concanv.cpp:122 gui/src/concanv.cpp:126 gui/src/concanv.cpp:571 +#: gui/src/FontMgr.cpp:215 msgid "Console Value" msgstr "Console 數值" @@ -4294,12 +4296,12 @@ msgstr "" msgid "ETA @SOG" msgstr "" -#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:816 +#: gui/src/ConfigMgr.cpp:456 gui/src/options.cpp:820 msgid "Title" msgstr "" #: gui/src/ConfigMgr.cpp:461 gui/src/MarkInfo.cpp:428 gui/src/MarkInfo.cpp:526 -#: gui/src/options.cpp:826 gui/src/routeprintout.cpp:116 +#: gui/src/options.cpp:830 gui/src/routeprintout.cpp:116 #: gui/src/routeprintout.cpp:409 gui/src/RoutePropDlg.cpp:397 #: gui/src/RoutePropDlg.cpp:422 gui/src/TrackPropDlg.cpp:872 msgid "Description" @@ -4328,7 +4330,7 @@ msgid "Less" msgstr "" #: gui/src/connection_edit.cpp:259 gui/src/connection_edit.cpp:803 -#: gui/src/connections_dialog.cpp:481 +#: gui/src/connections_dialog.cpp:557 msgid "Edit Selected Connection" msgstr "" @@ -4617,12 +4619,12 @@ msgstr "" msgid "Or consider using a different data port for one of them" msgstr "" -#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7808 +#: gui/src/connection_edit.cpp:1766 gui/src/options.cpp:7813 #: gui/src/routeman_gui.cpp:73 msgid "OpenCPN Warning" msgstr "OpenCPN 警告" -#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6868 +#: gui/src/connection_edit.cpp:1769 gui/src/options.cpp:6872 #: gui/src/routemanagerdialog.cpp:1949 msgid "OpenCPN info" msgstr "OpenCPN 資訊" @@ -4631,17 +4633,17 @@ msgstr "OpenCPN 資訊" msgid "Sentence Filter" msgstr "" -#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3486 -#: gui/src/options.cpp:3699 +#: gui/src/connection_edit.cpp:2408 gui/src/options.cpp:3490 +#: gui/src/options.cpp:3703 msgid "Select All" msgstr "選擇全部" -#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3488 -#: gui/src/options.cpp:3701 gui/src/priority_gui.cpp:105 +#: gui/src/connection_edit.cpp:2409 gui/src/options.cpp:3492 +#: gui/src/options.cpp:3705 gui/src/priority_gui.cpp:105 msgid "Clear All" msgstr "清除全部" -#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3829 +#: gui/src/connection_edit.cpp:2410 gui/src/options.cpp:3833 #: gui/src/RoutePropDlg.cpp:479 gui/src/TrackPropDlg.cpp:926 msgid "Add" msgstr "加入" @@ -4667,59 +4669,59 @@ msgstr "" msgid "REGEX syntax error: \n" msgstr "" -#: gui/src/connections_dialog.cpp:115 gui/src/options.cpp:3925 +#: gui/src/connections_dialog.cpp:122 gui/src/options.cpp:3929 msgid "General" msgstr "一般" -#: gui/src/connections_dialog.cpp:128 +#: gui/src/connections_dialog.cpp:135 msgid "Filter NMEA Course and Speed data" msgstr "" -#: gui/src/connections_dialog.cpp:134 +#: gui/src/connections_dialog.cpp:141 msgid "Filter period (sec)" msgstr "" -#: gui/src/connections_dialog.cpp:154 +#: gui/src/connections_dialog.cpp:168 gui/src/connections_dialog.cpp:220 msgid "Show NMEA Debug Window" msgstr "" -#: gui/src/connections_dialog.cpp:160 +#: gui/src/connections_dialog.cpp:174 gui/src/connections_dialog.cpp:226 msgid "Format uploads for Furuno GP3X" msgstr "" -#: gui/src/connections_dialog.cpp:166 +#: gui/src/connections_dialog.cpp:180 gui/src/connections_dialog.cpp:232 msgid "Use Garmin GRMN (Host) mode for uploads" msgstr "" -#: gui/src/connections_dialog.cpp:173 +#: gui/src/connections_dialog.cpp:187 gui/src/connections_dialog.cpp:239 msgid "Use magnetic bearings in output sentence APB" msgstr "" -#: gui/src/connections_dialog.cpp:185 -msgid "NMEA0183 Talker ID" +#: gui/src/connections_dialog.cpp:196 gui/src/connections_dialog.cpp:265 +msgid "Adjust communication priorities..." msgstr "" -#: gui/src/connections_dialog.cpp:200 -msgid "Adjust communication priorities..." +#: gui/src/connections_dialog.cpp:204 gui/src/connections_dialog.cpp:250 +msgid "NMEA0183 Talker ID" msgstr "" -#: gui/src/connections_dialog.cpp:209 +#: gui/src/connections_dialog.cpp:275 msgid "Data Connections" msgstr "" -#: gui/src/connections_dialog.cpp:218 +#: gui/src/connections_dialog.cpp:284 msgid "Add Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:222 +#: gui/src/connections_dialog.cpp:288 msgid "Edit Connection..." msgstr "" -#: gui/src/connections_dialog.cpp:227 +#: gui/src/connections_dialog.cpp:293 msgid "Remove Connection" msgstr "" -#: gui/src/connections_dialog.cpp:421 +#: gui/src/connections_dialog.cpp:497 msgid "Configure new connection" msgstr "" @@ -4777,7 +4779,7 @@ msgid "Install" msgstr "" #: gui/src/download_mgr.cpp:251 gui/src/download_mgr.cpp:268 -#: gui/src/pluginmanager.cpp:4758 gui/src/update_mgr.cpp:244 +#: gui/src/pluginmanager.cpp:4759 gui/src/update_mgr.cpp:244 msgid "Reinstall" msgstr "" @@ -4785,7 +4787,7 @@ msgstr "" msgid "Update" msgstr "" -#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4764 +#: gui/src/download_mgr.cpp:270 gui/src/pluginmanager.cpp:4765 #: gui/src/update_mgr.cpp:246 msgid "Downgrade" msgstr "" @@ -4815,7 +4817,7 @@ msgid " successfully installed" msgstr "" #: gui/src/download_mgr.cpp:573 gui/src/pluginmanager.cpp:1122 -#: gui/src/pluginmanager.cpp:3978 +#: gui/src/pluginmanager.cpp:3979 msgid "Installation complete" msgstr "" @@ -4823,6 +4825,21 @@ msgstr "" msgid "Installation error" msgstr "" +#: gui/src/FontMgr.cpp:217 gui/src/routemanagerdialog.cpp:688 +#: gui/src/route_point_gui.cpp:127 gui/src/route_point_gui.cpp:135 +#: gui/src/route_point_gui.cpp:299 gui/src/route_point_gui.cpp:307 +msgid "Marks" +msgstr "" + +#: gui/src/FontMgr.cpp:221 gui/src/RolloverWin.cpp:137 +#: gui/src/RolloverWin.cpp:303 +msgid "AISRollover" +msgstr "AISRollover" + +#: gui/src/FontMgr.cpp:225 +msgid "ChartTexts" +msgstr "" + #: gui/src/glChartCanvas.cpp:1925 msgid "GridText" msgstr "" @@ -4835,7 +4852,7 @@ msgstr "" msgid "OpenCPN Compressed Cache Update" msgstr "" -#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8654 +#: gui/src/glTextureManager.cpp:1505 gui/src/ocpn_frame.cpp:8651 #, c-format msgid "Distance from Ownship: %4.0f NMi" msgstr "" @@ -4956,7 +4973,7 @@ msgstr "" msgid "Icon" msgstr "圖示" -#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2207 gui/src/options.cpp:2270 +#: gui/src/MarkInfo.cpp:380 gui/src/options.cpp:2211 gui/src/options.cpp:2274 msgid "Combo!" msgstr "組合!" @@ -4966,7 +4983,7 @@ msgid "Links" msgstr "連結" #: gui/src/MarkInfo.cpp:490 gui/src/MarkInfo.cpp:1168 gui/src/MarkInfo.cpp:1216 -#: gui/src/options.cpp:1139 gui/src/RoutePropDlg.cpp:454 +#: gui/src/options.cpp:1143 gui/src/RoutePropDlg.cpp:454 #: gui/src/RoutePropDlg.cpp:484 gui/src/TrackPropDlg.cpp:897 #: gui/src/TrackPropDlg.cpp:930 msgid "Edit" @@ -5007,22 +5024,22 @@ msgstr "" msgid "Number" msgstr "" -#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4318 gui/src/options.cpp:4479 +#: gui/src/MarkInfo.cpp:591 gui/src/options.cpp:4322 gui/src/options.cpp:4483 #: gui/src/routeprintout.cpp:113 gui/src/routeprintout.cpp:397 #: gui/src/RoutePropDlg.cpp:146 gui/src/RoutePropDlg.cpp:360 #: gui/src/trackprintout.cpp:94 gui/src/trackprintout.cpp:319 -#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:42 +#: gui/src/TrackPropDlg.cpp:305 gui/src/initwiz/wiz_ui_proto.cpp:47 msgid "Distance" msgstr "距離" -#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2024 +#: gui/src/MarkInfo.cpp:595 gui/src/options.cpp:2028 #: gui/src/RoutePropDlg.cpp:259 gui/src/TrackPropDlg.cpp:476 #: gui/src/TrackPropDlg.cpp:721 msgid "Color" msgstr "顏色" -#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1956 gui/src/options.cpp:2171 -#: gui/src/options.cpp:2600 +#: gui/src/MarkInfo.cpp:598 gui/src/options.cpp:1960 gui/src/options.cpp:2175 +#: gui/src/options.cpp:2604 msgid "None" msgstr "無" @@ -5111,16 +5128,16 @@ msgstr "" msgid "Tide Station not found" msgstr "" -#: gui/src/MUIBar.cpp:89 gui/src/MUIBar.cpp:98 +#: gui/src/MUIBar.cpp:94 gui/src/MUIBar.cpp:103 msgid "Set scale" msgstr "" -#: gui/src/MUIBar.cpp:167 +#: gui/src/MUIBar.cpp:172 msgid "Chart Scale" msgstr "" -#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:928 -#: gui/src/options.cpp:1090 +#: gui/src/navutil.cpp:1835 gui/src/navutil.cpp:3227 gui/src/options.cpp:932 +#: gui/src/options.cpp:1094 msgid "Persistent" msgstr "持續" @@ -5152,35 +5169,35 @@ msgstr "NMEA调试窗口" msgid "Cannot load route or waypoint file: " msgstr "" -#: gui/src/ocpn_app.cpp:1302 gui/src/ocpn_app.cpp:1309 +#: gui/src/ocpn_app.cpp:1294 gui/src/ocpn_app.cpp:1301 msgid "Failed to initialize the user interface. " msgstr "" -#: gui/src/ocpn_app.cpp:1303 +#: gui/src/ocpn_app.cpp:1295 msgid "OpenCPN cannot start. " msgstr "" -#: gui/src/ocpn_app.cpp:1304 +#: gui/src/ocpn_app.cpp:1296 msgid "The necessary configuration files were not found. " msgstr "" -#: gui/src/ocpn_app.cpp:1305 +#: gui/src/ocpn_app.cpp:1297 msgid "See the log file at " msgstr "" -#: gui/src/ocpn_app.cpp:1306 +#: gui/src/ocpn_app.cpp:1298 msgid " for details." msgstr "" -#: gui/src/ocpn_app.cpp:1595 +#: gui/src/ocpn_app.cpp:1596 msgid " -- [Portable(-p) executing from " msgstr "" -#: gui/src/ocpn_app.cpp:1670 +#: gui/src/ocpn_app.cpp:1671 msgid "Retrieving initial Chart Directory set from Windows Registry" msgstr "" -#: gui/src/ocpn_app.cpp:1852 +#: gui/src/ocpn_app.cpp:1853 #, c-format msgid "OpenCPN Initialized in %ld ms." msgstr "" @@ -5228,8 +5245,8 @@ msgstr "" msgid "Remaining time : " msgstr "" -#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4552 -#: gui/src/ocpn_frame.cpp:4562 +#: gui/src/ocpn_frame.cpp:885 gui/src/ocpn_frame.cpp:4548 +#: gui/src/ocpn_frame.cpp:4558 msgid "OpenCPN Chart Update" msgstr "" @@ -5237,380 +5254,380 @@ msgstr "" msgid "Anchorage created " msgstr "錨固建立 " -#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2704 +#: gui/src/ocpn_frame.cpp:2582 gui/src/ocpn_frame.cpp:2710 msgid "Show Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2706 -#: gui/src/ocpn_frame.cpp:7026 +#: gui/src/ocpn_frame.cpp:2583 gui/src/ocpn_frame.cpp:2712 +#: gui/src/ocpn_frame.cpp:7022 msgid "Hide Toolbar" msgstr "" -#: gui/src/ocpn_frame.cpp:2912 gui/src/ocpn_frame.cpp:2975 +#: gui/src/ocpn_frame.cpp:2918 gui/src/ocpn_frame.cpp:2981 msgid "MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:2913 gui/src/ocpn_frame.cpp:6691 +#: gui/src/ocpn_frame.cpp:2919 gui/src/ocpn_frame.cpp:6687 msgid " at " msgstr "" -#: gui/src/ocpn_frame.cpp:2915 gui/src/ocpn_frame.cpp:6693 +#: gui/src/ocpn_frame.cpp:2921 gui/src/ocpn_frame.cpp:6689 msgid " on " msgstr "" -#: gui/src/ocpn_frame.cpp:2935 +#: gui/src/ocpn_frame.cpp:2941 msgid "1.0 NM along COG" msgstr "" -#: gui/src/ocpn_frame.cpp:2947 +#: gui/src/ocpn_frame.cpp:2953 msgid "Temporary MOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:2948 +#: gui/src/ocpn_frame.cpp:2954 msgid "Assumed 1 Mile Point" msgstr "" -#: gui/src/ocpn_frame.cpp:2976 gui/src/ocpn_frame.cpp:6749 -#: gui/src/ocpn_frame.cpp:6790 +#: gui/src/ocpn_frame.cpp:2982 gui/src/ocpn_frame.cpp:6745 +#: gui/src/ocpn_frame.cpp:6786 msgid " Time: " msgstr "" -#: gui/src/ocpn_frame.cpp:2978 +#: gui/src/ocpn_frame.cpp:2984 msgid " Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:2996 gui/src/ocpn_frame.cpp:7105 +#: gui/src/ocpn_frame.cpp:3002 gui/src/ocpn_frame.cpp:7101 msgid "Disable Tracking" msgstr "" -#: gui/src/ocpn_frame.cpp:3068 gui/src/ocpn_frame.cpp:3438 -#: gui/src/ocpn_frame.cpp:7051 +#: gui/src/ocpn_frame.cpp:3074 gui/src/ocpn_frame.cpp:3447 +#: gui/src/ocpn_frame.cpp:7047 msgid "Enable Tracking" msgstr "啟用追跡" -#: gui/src/ocpn_frame.cpp:3437 +#: gui/src/ocpn_frame.cpp:3446 msgid "Auto Follow" msgstr "自動定位" -#: gui/src/ocpn_frame.cpp:3442 +#: gui/src/ocpn_frame.cpp:3451 msgid "Head Up Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:3445 gui/src/ocpn_frame.cpp:3448 +#: gui/src/ocpn_frame.cpp:3454 gui/src/ocpn_frame.cpp:3457 msgid "Zoom In" msgstr "放大" -#: gui/src/ocpn_frame.cpp:3446 gui/src/ocpn_frame.cpp:3449 +#: gui/src/ocpn_frame.cpp:3455 gui/src/ocpn_frame.cpp:3458 msgid "Zoom Out" msgstr "縮小" -#: gui/src/ocpn_frame.cpp:3453 +#: gui/src/ocpn_frame.cpp:3462 msgid "Larger Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3455 +#: gui/src/ocpn_frame.cpp:3464 msgid "Smaller Scale Chart" msgstr "" -#: gui/src/ocpn_frame.cpp:3458 +#: gui/src/ocpn_frame.cpp:3467 msgid "Exit OpenCPN" msgstr "" -#: gui/src/ocpn_frame.cpp:3460 +#: gui/src/ocpn_frame.cpp:3469 msgid "&Navigate" msgstr "" -#: gui/src/ocpn_frame.cpp:3476 gui/src/options.cpp:5409 +#: gui/src/ocpn_frame.cpp:3485 gui/src/options.cpp:5413 msgid "Show Chart Bar" msgstr "顯示圖表欄" -#: gui/src/ocpn_frame.cpp:3481 gui/src/ocpn_frame.cpp:3494 +#: gui/src/ocpn_frame.cpp:3490 gui/src/ocpn_frame.cpp:3503 msgid "Show ENC text" msgstr "" -#: gui/src/ocpn_frame.cpp:3483 gui/src/ocpn_frame.cpp:3496 +#: gui/src/ocpn_frame.cpp:3492 gui/src/ocpn_frame.cpp:3505 msgid "Show ENC Lights" msgstr "" -#: gui/src/ocpn_frame.cpp:3485 gui/src/ocpn_frame.cpp:3498 +#: gui/src/ocpn_frame.cpp:3494 gui/src/ocpn_frame.cpp:3507 msgid "Show ENC Soundings" msgstr "" -#: gui/src/ocpn_frame.cpp:3487 gui/src/ocpn_frame.cpp:3500 +#: gui/src/ocpn_frame.cpp:3496 gui/src/ocpn_frame.cpp:3509 msgid "Show ENC Anchoring Info" msgstr "" -#: gui/src/ocpn_frame.cpp:3489 gui/src/ocpn_frame.cpp:3503 +#: gui/src/ocpn_frame.cpp:3498 gui/src/ocpn_frame.cpp:3512 msgid "Show ENC Data Quality" msgstr "" -#: gui/src/ocpn_frame.cpp:3491 gui/src/ocpn_frame.cpp:3505 +#: gui/src/ocpn_frame.cpp:3500 gui/src/ocpn_frame.cpp:3514 msgid "Show Navobjects" msgstr "" -#: gui/src/ocpn_frame.cpp:3508 +#: gui/src/ocpn_frame.cpp:3517 msgid "Show Tides" msgstr "顯示潮汐" -#: gui/src/ocpn_frame.cpp:3513 gui/src/ocpn_frame.cpp:3516 -#: gui/src/ocpn_frame.cpp:7056 +#: gui/src/ocpn_frame.cpp:3522 gui/src/ocpn_frame.cpp:3525 +#: gui/src/ocpn_frame.cpp:7052 msgid "Change Color Scheme" msgstr "更換色彩樣式" -#: gui/src/ocpn_frame.cpp:3524 +#: gui/src/ocpn_frame.cpp:3533 msgid "&View" msgstr "" -#: gui/src/ocpn_frame.cpp:3527 +#: gui/src/ocpn_frame.cpp:3536 msgid "Show AIS Targets" msgstr "顯示 AIS 目標" -#: gui/src/ocpn_frame.cpp:3532 +#: gui/src/ocpn_frame.cpp:3541 msgid "Hide Moored AIS Targets" msgstr "" -#: gui/src/ocpn_frame.cpp:3533 +#: gui/src/ocpn_frame.cpp:3542 msgid "Show AIS Target Tracks" msgstr "" -#: gui/src/ocpn_frame.cpp:3534 +#: gui/src/ocpn_frame.cpp:3543 msgid "Show CPA Alert Dialogs" msgstr "" -#: gui/src/ocpn_frame.cpp:3535 +#: gui/src/ocpn_frame.cpp:3544 msgid "Sound CPA Alarms" msgstr "" -#: gui/src/ocpn_frame.cpp:3539 gui/src/ocpn_frame.cpp:3542 +#: gui/src/ocpn_frame.cpp:3548 gui/src/ocpn_frame.cpp:3551 msgid "Show CPA Warnings" msgstr "" -#: gui/src/ocpn_frame.cpp:3547 +#: gui/src/ocpn_frame.cpp:3556 msgid "&AIS" msgstr "" -#: gui/src/ocpn_frame.cpp:3552 gui/src/ocpn_frame.cpp:3555 +#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:3564 msgid "Measure Distance" msgstr "" -#: gui/src/ocpn_frame.cpp:3559 +#: gui/src/ocpn_frame.cpp:3568 msgid "Route && Mark Manager..." msgstr "" -#: gui/src/ocpn_frame.cpp:3561 gui/src/ocpn_frame.cpp:7039 +#: gui/src/ocpn_frame.cpp:3570 gui/src/ocpn_frame.cpp:7035 msgid "Create Route" msgstr "建立航路" -#: gui/src/ocpn_frame.cpp:3564 +#: gui/src/ocpn_frame.cpp:3573 msgid "Drop Mark at Boat" msgstr "" -#: gui/src/ocpn_frame.cpp:3566 +#: gui/src/ocpn_frame.cpp:3575 msgid "Drop Mark at Cursor" msgstr "" -#: gui/src/ocpn_frame.cpp:3572 gui/src/ocpn_frame.cpp:3579 -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:3581 gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:7079 msgid "Drop MOB Marker" msgstr "標定人員落水標記" -#: gui/src/ocpn_frame.cpp:3576 gui/src/pluginmanager.cpp:4538 -#: gui/src/pluginmanager.cpp:4559 +#: gui/src/ocpn_frame.cpp:3585 gui/src/pluginmanager.cpp:4539 +#: gui/src/pluginmanager.cpp:4560 msgid "Preferences" msgstr "偏好設定" -#: gui/src/ocpn_frame.cpp:3584 +#: gui/src/ocpn_frame.cpp:3593 msgid "&Tools" msgstr "" -#: gui/src/ocpn_frame.cpp:3588 +#: gui/src/ocpn_frame.cpp:3597 msgid "&Window" msgstr "" -#: gui/src/ocpn_frame.cpp:3593 +#: gui/src/ocpn_frame.cpp:3602 msgid "OpenCPN Help" msgstr "" -#: gui/src/ocpn_frame.cpp:3594 +#: gui/src/ocpn_frame.cpp:3603 msgid "&Help" msgstr "" -#: gui/src/ocpn_frame.cpp:4252 +#: gui/src/ocpn_frame.cpp:4248 msgid "Please restart OpenCPN to activate language or style changes." msgstr "" -#: gui/src/ocpn_frame.cpp:5253 +#: gui/src/ocpn_frame.cpp:5249 msgid " Ship " msgstr "" -#: gui/src/ocpn_frame.cpp:5945 +#: gui/src/ocpn_frame.cpp:5941 msgid "Rotated Mode" msgstr "" -#: gui/src/ocpn_frame.cpp:6301 gui/src/routeprintout.cpp:477 +#: gui/src/ocpn_frame.cpp:6297 gui/src/routeprintout.cpp:477 #: gui/src/trackprintout.cpp:409 msgid "There was a problem printing.\n" "Perhaps your current printer is not set correctly?" msgstr "列印發生錯誤.\n" "印表機是否連接妥當?" -#: gui/src/ocpn_frame.cpp:6470 gui/src/ocpn_frame.cpp:6527 +#: gui/src/ocpn_frame.cpp:6466 gui/src/ocpn_frame.cpp:6523 #: gui/src/routemanagerdialog.cpp:1272 msgid "(Unnamed Route)" msgstr "(未命名航路)" -#: gui/src/ocpn_frame.cpp:6690 gui/src/ocpn_frame.cpp:6748 +#: gui/src/ocpn_frame.cpp:6686 gui/src/ocpn_frame.cpp:6744 msgid "AIS MAN OVERBOARD" msgstr "" -#: gui/src/ocpn_frame.cpp:6710 gui/src/options.cpp:1867 +#: gui/src/ocpn_frame.cpp:6706 gui/src/options.cpp:1871 msgid "Own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6722 +#: gui/src/ocpn_frame.cpp:6718 msgid "Temporary AISMOB Route" msgstr "" -#: gui/src/ocpn_frame.cpp:6723 +#: gui/src/ocpn_frame.cpp:6719 msgid "Present own ship" msgstr "" -#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 +#: gui/src/ocpn_frame.cpp:6747 gui/src/ocpn_frame.cpp:6788 msgid " Ownship Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6755 gui/src/ocpn_frame.cpp:6796 +#: gui/src/ocpn_frame.cpp:6751 gui/src/ocpn_frame.cpp:6792 msgid " MOB Position: " msgstr "" -#: gui/src/ocpn_frame.cpp:6789 +#: gui/src/ocpn_frame.cpp:6785 msgid "AIS MAN OVERBOARD UPDATE" msgstr "" -#: gui/src/ocpn_frame.cpp:7045 gui/src/routemanagerdialog.cpp:314 +#: gui/src/ocpn_frame.cpp:7041 gui/src/routemanagerdialog.cpp:314 msgid "Route & Mark Manager" msgstr "航路 & 標記管理" -#: gui/src/ocpn_frame.cpp:7069 +#: gui/src/ocpn_frame.cpp:7065 msgid "Print Chart" msgstr "列印海圖" -#: gui/src/ocpn_frame.cpp:7083 +#: gui/src/ocpn_frame.cpp:7079 msgid " (Ctrl-Space)" msgstr " (Ctrl-Space)" -#: gui/src/ocpn_frame.cpp:8619 +#: gui/src/ocpn_frame.cpp:8616 msgid "OpenCPN ENC Prepare" msgstr "" -#: gui/src/ocpn_frame.cpp:8685 +#: gui/src/ocpn_frame.cpp:8682 msgid "ENC Completed." msgstr "" -#: gui/src/options.cpp:840 +#: gui/src/options.cpp:844 msgid "Create a private configuration template based on current settings.\n" "This template will be saved, and may be selected for further use at any time.\n" " " msgstr "" -#: gui/src/options.cpp:898 +#: gui/src/options.cpp:902 msgid "MMSI Extended Properties" msgstr "MMSI 擴充屬性" -#: gui/src/options.cpp:912 +#: gui/src/options.cpp:916 msgid "Tracking" msgstr "追跡" -#: gui/src/options.cpp:917 +#: gui/src/options.cpp:921 msgid "Default tracking" msgstr "預設追跡" -#: gui/src/options.cpp:922 +#: gui/src/options.cpp:926 msgid "Always track" msgstr "始終追跡" -#: gui/src/options.cpp:925 +#: gui/src/options.cpp:929 msgid " Never track" msgstr "永不跟踪" -#: gui/src/options.cpp:934 +#: gui/src/options.cpp:938 msgid "Ignore this MMSI" msgstr "忽略此 MMSI" -#: gui/src/options.cpp:938 +#: gui/src/options.cpp:942 msgid "Handle this MMSI as SART/PLB(AIS) MOB." msgstr "處理此 MMSI 如同 SART/PLB(AIS) MOB." -#: gui/src/options.cpp:942 +#: gui/src/options.cpp:946 msgid "Convert AIVDM to AIVDO for this MMSI" msgstr "將此 MMSI 的 AIVDM 轉換為 AIVDO" -#: gui/src/options.cpp:946 +#: gui/src/options.cpp:950 msgid "This MMSI is my Follower - No CPA Alert" msgstr "" -#: gui/src/options.cpp:1031 +#: gui/src/options.cpp:1035 msgid "An MMSI Id is generally a number of nine digits.\n" "Please check your entries and cancel if necessary." msgstr "" -#: gui/src/options.cpp:1078 gui/src/options.cpp:1901 gui/src/options.cpp:2013 +#: gui/src/options.cpp:1082 gui/src/options.cpp:1905 gui/src/options.cpp:2017 #: gui/src/RoutePropDlg.cpp:287 gui/src/RoutePropDlg.cpp:308 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:520 #: gui/src/TrackPropDlg.cpp:743 gui/src/TrackPropDlg.cpp:756 msgid "Default" msgstr "預設" -#: gui/src/options.cpp:1081 gui/src/routemanagerdialog.cpp:2433 +#: gui/src/options.cpp:1085 gui/src/routemanagerdialog.cpp:2433 #: gui/src/routemanagerdialog.cpp:2633 msgid "Always" msgstr "永遠" -#: gui/src/options.cpp:1084 +#: gui/src/options.cpp:1088 msgid "Never" msgstr "永遠不會" -#: gui/src/options.cpp:1121 gui/src/options.cpp:1168 +#: gui/src/options.cpp:1125 gui/src/options.cpp:1172 msgid "Edit MMSI Properties" msgstr "編輯 MMSI 屬性" -#: gui/src/options.cpp:1137 gui/src/options.cpp:4997 gui/src/options.cpp:5004 +#: gui/src/options.cpp:1141 gui/src/options.cpp:5001 gui/src/options.cpp:5008 msgid "MMSI Properties" msgstr "MMSI 屬性" -#: gui/src/options.cpp:1233 +#: gui/src/options.cpp:1237 msgid "Track Mode" msgstr "追蹤模式" -#: gui/src/options.cpp:1242 +#: gui/src/options.cpp:1246 msgid "Ignore" msgstr "忽略" -#: gui/src/options.cpp:1251 +#: gui/src/options.cpp:1255 msgid "MOB" msgstr "MOB" -#: gui/src/options.cpp:1259 +#: gui/src/options.cpp:1263 msgid "VDM->VDO" msgstr "VDM->VDO" -#: gui/src/options.cpp:1268 +#: gui/src/options.cpp:1272 msgid "Ship name" msgstr "船名" -#: gui/src/options.cpp:1277 +#: gui/src/options.cpp:1281 msgid "Follower" msgstr "" -#: gui/src/options.cpp:1282 +#: gui/src/options.cpp:1286 msgid "New..." msgstr "新增..." -#: gui/src/options.cpp:1305 +#: gui/src/options.cpp:1309 msgid "Add MMSI Properties" msgstr "新增 MMSI 屬性" -#: gui/src/options.cpp:1726 +#: gui/src/options.cpp:1730 msgid "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" "retry after creating a file called /etc/udev/rules.d/70-opencpn.rules\n" @@ -5621,7 +5638,7 @@ msgid "The device selected is not accessible; opencpn will likely not be able\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1737 +#: gui/src/options.cpp:1741 msgid "\n" "The device selected is not accessible; opencpn will likely not be able\n" "to use this device as-is. You might want to exit OpenCPN, reboot and\n" @@ -5633,1264 +5650,1259 @@ msgid "\n" "For more info, see the file LINUX_DEVICES.md in the distribution docs.\n" msgstr "" -#: gui/src/options.cpp:1859 +#: gui/src/options.cpp:1863 msgid "NMEA" msgstr "NMEA" -#: gui/src/options.cpp:1884 +#: gui/src/options.cpp:1888 msgid "COG Predictor Length (min)" msgstr "COG 向量線長度(分鐘)" -#: gui/src/options.cpp:1891 +#: gui/src/options.cpp:1895 msgid "Heading Predictor Length (NMi)" msgstr "艏向預測長度(NMi)" -#: gui/src/options.cpp:1898 +#: gui/src/options.cpp:1902 msgid "Ship Icon Type" msgstr "船舶圖示種類" -#: gui/src/options.cpp:1901 +#: gui/src/options.cpp:1905 msgid "Real Scale Bitmap" msgstr "實際比例點陣圖" -#: gui/src/options.cpp:1902 +#: gui/src/options.cpp:1906 msgid "Real Scale Vector" msgstr "實際比例向量圖" -#: gui/src/options.cpp:1917 +#: gui/src/options.cpp:1921 msgid "Length Over All (m)" msgstr "總長LOA(m)" -#: gui/src/options.cpp:1923 +#: gui/src/options.cpp:1927 msgid "Width Over All (m)" msgstr "全寬(m)" -#: gui/src/options.cpp:1929 +#: gui/src/options.cpp:1933 msgid "GPS Offset from Bow (m)" msgstr "GPS 天線距船艏位置(m)" -#: gui/src/options.cpp:1935 +#: gui/src/options.cpp:1939 msgid "GPS Offset from Midship (m)" msgstr "GPS 天線距船舯位置(m) " -#: gui/src/options.cpp:1941 +#: gui/src/options.cpp:1945 msgid "Minimum Screen Size (mm)" msgstr "最小螢幕顯示大小(mm)" -#: gui/src/options.cpp:1953 +#: gui/src/options.cpp:1957 msgid "Show range rings" msgstr "顯示距離圈" -#: gui/src/options.cpp:1970 gui/src/options.cpp:2328 +#: gui/src/options.cpp:1974 gui/src/options.cpp:2332 msgid "Distance between rings" msgstr "" -#: gui/src/options.cpp:1979 gui/src/options.cpp:2339 +#: gui/src/options.cpp:1983 gui/src/options.cpp:2343 msgid "Distance Unit" msgstr "距離單位" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4320 -#: gui/src/options.cpp:4481 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4324 +#: gui/src/options.cpp:4485 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Nautical miles" msgstr "海浬" -#: gui/src/options.cpp:1982 gui/src/options.cpp:2169 gui/src/options.cpp:4321 -#: gui/src/options.cpp:4482 gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:1986 gui/src/options.cpp:2173 gui/src/options.cpp:4325 +#: gui/src/options.cpp:4486 gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Kilometers" msgstr "公里" -#: gui/src/options.cpp:1982 +#: gui/src/options.cpp:1986 msgid "Minutes (time)" msgstr "" -#: gui/src/options.cpp:1989 +#: gui/src/options.cpp:1993 msgid "Range Ring Colour" msgstr "" -#: gui/src/options.cpp:2004 +#: gui/src/options.cpp:2008 msgid "Show direction to Active Waypoint" msgstr "" -#: gui/src/options.cpp:2009 gui/src/RoutePropDlg.cpp:282 +#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:282 #: gui/src/TrackPropDlg.cpp:495 gui/src/TrackPropDlg.cpp:738 msgid "Style" msgstr "樣式" -#: gui/src/options.cpp:2013 gui/src/RoutePropDlg.cpp:287 +#: gui/src/options.cpp:2017 gui/src/RoutePropDlg.cpp:287 #: gui/src/TrackPropDlg.cpp:500 gui/src/TrackPropDlg.cpp:743 msgid "Solid" msgstr "實線" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:743 msgid "Dot" msgstr "點" -#: gui/src/options.cpp:2014 gui/src/RoutePropDlg.cpp:288 +#: gui/src/options.cpp:2018 gui/src/RoutePropDlg.cpp:288 #: gui/src/TrackPropDlg.cpp:501 gui/src/TrackPropDlg.cpp:744 msgid "Long dash" msgstr "長折線" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 +#: gui/src/options.cpp:2019 gui/src/RoutePropDlg.cpp:289 #: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 msgid "Short dash" msgstr "短折線" -#: gui/src/options.cpp:2015 gui/src/RoutePropDlg.cpp:289 -#: gui/src/TrackPropDlg.cpp:502 gui/src/TrackPropDlg.cpp:744 -msgid "Dot dash" -msgstr "點折線" - -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Default color" msgstr "預設顏色" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Black" msgstr "黑" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Red" msgstr "暗紅" -#: gui/src/options.cpp:2029 gui/src/RoutePropDlg.cpp:265 +#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:265 #: gui/src/TrackPropDlg.cpp:482 gui/src/TrackPropDlg.cpp:727 msgid "Dark Green" msgstr "暗綠" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Yellow" msgstr "暗黃" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Blue" msgstr "暗藍" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Magenta" msgstr "暗洋紅" -#: gui/src/options.cpp:2030 gui/src/RoutePropDlg.cpp:266 +#: gui/src/options.cpp:2034 gui/src/RoutePropDlg.cpp:266 #: gui/src/TrackPropDlg.cpp:483 gui/src/TrackPropDlg.cpp:728 msgid "Dark Cyan" msgstr "暗青" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Light Gray" msgstr "亮灰" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Dark Gray" msgstr "暗灰" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Red" msgstr "紅" -#: gui/src/options.cpp:2031 gui/src/RoutePropDlg.cpp:267 +#: gui/src/options.cpp:2035 gui/src/RoutePropDlg.cpp:267 #: gui/src/TrackPropDlg.cpp:484 gui/src/TrackPropDlg.cpp:729 msgid "Green" msgstr "綠" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Yellow" msgstr "黃" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Blue" msgstr "藍" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Magenta" msgstr "洋紅" -#: gui/src/options.cpp:2032 gui/src/RoutePropDlg.cpp:268 +#: gui/src/options.cpp:2036 gui/src/RoutePropDlg.cpp:268 #: gui/src/TrackPropDlg.cpp:485 gui/src/TrackPropDlg.cpp:730 msgid "Cyan" msgstr "青" -#: gui/src/options.cpp:2033 gui/src/RoutePropDlg.cpp:269 +#: gui/src/options.cpp:2037 gui/src/RoutePropDlg.cpp:269 #: gui/src/TrackPropDlg.cpp:486 gui/src/TrackPropDlg.cpp:731 msgid "White" msgstr "白" -#: gui/src/options.cpp:2043 gui/src/routemanagerdialog.cpp:544 +#: gui/src/options.cpp:2047 gui/src/routemanagerdialog.cpp:544 msgid "Tracks" msgstr "航跡" -#: gui/src/options.cpp:2049 +#: gui/src/options.cpp:2053 msgid "Automatic Daily Tracks at midnight" msgstr "" -#: gui/src/options.cpp:2057 +#: gui/src/options.cpp:2061 msgid "Automatic Daily Tracks at" msgstr "" -#: gui/src/options.cpp:2074 +#: gui/src/options.cpp:2078 msgid "Computer" msgstr "" -#: gui/src/options.cpp:2080 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 +#: gui/src/options.cpp:2084 gui/src/RoutePropDlg.cpp:242 gui/src/TCWin.cpp:147 #: gui/src/TrackPropDlg.cpp:446 gui/src/TrackPropDlg.cpp:454 #: gui/src/TrackPropDlg.cpp:819 msgid "UTC" msgstr "UTC" -#: gui/src/options.cpp:2086 +#: gui/src/options.cpp:2090 msgid "LMT" msgstr "" -#: gui/src/options.cpp:2099 +#: gui/src/options.cpp:2103 msgid "Highlight Tracks" msgstr "航跡強調顯示" -#: gui/src/options.cpp:2103 +#: gui/src/options.cpp:2107 msgid "Highlight Colour" msgstr "" -#: gui/src/options.cpp:2118 +#: gui/src/options.cpp:2122 msgid "Tracking Precision" msgstr "追跡精確度" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Low" msgstr "低" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "Medium" msgstr "中" -#: gui/src/options.cpp:2121 +#: gui/src/options.cpp:2125 msgid "High" msgstr "高" -#: gui/src/options.cpp:2129 +#: gui/src/options.cpp:2133 msgid "Calculate values" msgstr "" -#: gui/src/options.cpp:2143 +#: gui/src/options.cpp:2147 msgid "Calculate SOG and COG from position changes" msgstr "" -#: gui/src/options.cpp:2148 +#: gui/src/options.cpp:2152 msgid "Min seconds between updates" msgstr "" -#: gui/src/options.cpp:2164 +#: gui/src/options.cpp:2168 msgid "Routes/Points" msgstr "" -#: gui/src/options.cpp:2177 +#: gui/src/options.cpp:2181 msgid "New Routes" msgstr "" -#: gui/src/options.cpp:2182 +#: gui/src/options.cpp:2186 msgid "Active Route" msgstr "" -#: gui/src/options.cpp:2188 +#: gui/src/options.cpp:2192 msgid "Persist active route, automatically activate on start up" msgstr "" -#: gui/src/options.cpp:2202 +#: gui/src/options.cpp:2206 msgid "Waypoint default icon" msgstr "" -#: gui/src/options.cpp:2228 +#: gui/src/options.cpp:2232 msgid "Waypoint Arrival Circle Radius (NMi)" msgstr "航路點到達圈半徑(海浬)" -#: gui/src/options.cpp:2237 +#: gui/src/options.cpp:2241 msgid "Advance route waypoint on arrival only" msgstr "只有在到達時使用進階航路轉向點" -#: gui/src/options.cpp:2250 +#: gui/src/options.cpp:2254 msgid "New Marks" msgstr "" -#: gui/src/options.cpp:2265 +#: gui/src/options.cpp:2269 msgid "Mark default icon" msgstr "" -#: gui/src/options.cpp:2291 +#: gui/src/options.cpp:2295 msgid "Show marks only at a chartscale greater than 1 :" msgstr "" -#: gui/src/options.cpp:2300 +#: gui/src/options.cpp:2304 msgid "Override the settings for chartscale based visibility and show always" msgstr "" -#: gui/src/options.cpp:2313 +#: gui/src/options.cpp:2317 msgid "Mark range rings" msgstr "" -#: gui/src/options.cpp:2350 +#: gui/src/options.cpp:2354 msgid "Waypoint Range Ring Colours" msgstr "" -#: gui/src/options.cpp:2371 +#: gui/src/options.cpp:2375 msgid "Control Options" msgstr "" -#: gui/src/options.cpp:2380 +#: gui/src/options.cpp:2384 msgid "Lock marks and waypoints (Unless object property dialog visible)" msgstr "" -#: gui/src/options.cpp:2386 +#: gui/src/options.cpp:2390 msgid "Confirm deletion of tracks and routes" msgstr "重複確認刪除航跡與航路" -#: gui/src/options.cpp:2444 +#: gui/src/options.cpp:2448 msgid "Chart Files" msgstr "海圖檔" -#: gui/src/options.cpp:2449 +#: gui/src/options.cpp:2453 msgid "Directories" msgstr "目錄" -#: gui/src/options.cpp:2472 +#: gui/src/options.cpp:2476 msgid "Add Directory..." msgstr "加入目錄..." -#: gui/src/options.cpp:2473 gui/src/options.cpp:3767 +#: gui/src/options.cpp:2477 gui/src/options.cpp:3771 #: gui/src/RoutePropDlgImpl.cpp:933 msgid "Remove Selected" msgstr "移除選取" -#: gui/src/options.cpp:2474 +#: gui/src/options.cpp:2478 msgid "Compress Selected" msgstr "" -#: gui/src/options.cpp:2477 +#: gui/src/options.cpp:2481 msgid "Add.." msgstr "" -#: gui/src/options.cpp:2478 +#: gui/src/options.cpp:2482 msgid "Remove" msgstr "移除" -#: gui/src/options.cpp:2479 +#: gui/src/options.cpp:2483 msgid "Compress" msgstr "" -#: gui/src/options.cpp:2504 +#: gui/src/options.cpp:2508 msgid "Migrate Charts.." msgstr "" -#: gui/src/options.cpp:2512 +#: gui/src/options.cpp:2516 msgid "Update Control" msgstr "更新控制" -#: gui/src/options.cpp:2521 +#: gui/src/options.cpp:2525 msgid "Scan Charts and Update Database" msgstr "掃瞄海圖與更新資料庫" -#: gui/src/options.cpp:2525 +#: gui/src/options.cpp:2529 msgid "Force Full Database Rebuild" msgstr "強制重建索引資料庫" -#: gui/src/options.cpp:2529 +#: gui/src/options.cpp:2533 msgid "Prepare all ENC Charts" msgstr "" -#: gui/src/options.cpp:2597 +#: gui/src/options.cpp:2601 msgid " [Modified]" msgstr "" -#: gui/src/options.cpp:2605 +#: gui/src/options.cpp:2609 msgid "Templates" msgstr "" -#: gui/src/options.cpp:2617 +#: gui/src/options.cpp:2621 msgid "Template Status" msgstr "" -#: gui/src/options.cpp:2627 +#: gui/src/options.cpp:2631 msgid "Last Applied Template Title:" msgstr "" -#: gui/src/options.cpp:2640 +#: gui/src/options.cpp:2644 msgid "Saved Templates" msgstr "" -#: gui/src/options.cpp:2667 +#: gui/src/options.cpp:2671 msgid "Create Config..." msgstr "" -#: gui/src/options.cpp:2679 +#: gui/src/options.cpp:2683 msgid "Delete Selected Config..." msgstr "" -#: gui/src/options.cpp:2687 +#: gui/src/options.cpp:2691 msgid "Apply Selected Config" msgstr "" -#: gui/src/options.cpp:2760 +#: gui/src/options.cpp:2764 msgid "Create Config" msgstr "" -#: gui/src/options.cpp:2814 +#: gui/src/options.cpp:2818 msgid "Problem applying selected configuration." msgstr "" -#: gui/src/options.cpp:2885 gui/src/RoutePropDlg.cpp:519 +#: gui/src/options.cpp:2889 gui/src/RoutePropDlg.cpp:519 #: gui/src/TrackPropDlg.cpp:946 msgid "Advanced" msgstr "進階" -#: gui/src/options.cpp:2905 +#: gui/src/options.cpp:2909 msgid "De-skew Raster Charts" msgstr "" -#: gui/src/options.cpp:2917 gui/src/options.cpp:3239 +#: gui/src/options.cpp:2921 gui/src/options.cpp:3243 msgid "Use Accelerated Graphics (OpenGL)" msgstr "使用圖形顯示加速功能(OpenGL)" -#: gui/src/options.cpp:2922 +#: gui/src/options.cpp:2926 msgid "OpenGL Options" msgstr "" -#: gui/src/options.cpp:2938 gui/src/options.cpp:3099 +#: gui/src/options.cpp:2942 gui/src/options.cpp:3103 msgid "Chart Rotation Averaging Time" msgstr "" -#: gui/src/options.cpp:2954 gui/src/options.cpp:3111 gui/src/options.cpp:5430 +#: gui/src/options.cpp:2958 gui/src/options.cpp:3115 gui/src/options.cpp:5434 msgid "seconds" msgstr "秒" -#: gui/src/options.cpp:2962 gui/src/options.cpp:3120 +#: gui/src/options.cpp:2966 gui/src/options.cpp:3124 msgid "Chart Zoom/Scale Weighting" msgstr "海圖縮放/比例權重" -#: gui/src/options.cpp:2971 gui/src/options.cpp:3145 +#: gui/src/options.cpp:2975 gui/src/options.cpp:3149 msgid "Raster" msgstr "" -#: gui/src/options.cpp:2985 gui/src/options.cpp:3158 +#: gui/src/options.cpp:2989 gui/src/options.cpp:3162 msgid "Vector" msgstr "" -#: gui/src/options.cpp:2999 gui/src/options.cpp:3175 +#: gui/src/options.cpp:3003 gui/src/options.cpp:3179 msgid "CM93 Detail level" msgstr "" -#: gui/src/options.cpp:3018 gui/src/options.cpp:3198 +#: gui/src/options.cpp:3022 gui/src/options.cpp:3202 msgid "Physical Screen Width" msgstr "實體螢幕寬度" -#: gui/src/options.cpp:3023 gui/src/options.cpp:3203 +#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 msgid "Auto" msgstr "自動" -#: gui/src/options.cpp:3027 gui/src/options.cpp:3207 +#: gui/src/options.cpp:3031 gui/src/options.cpp:3211 msgid "Manual:" msgstr "手動:" -#: gui/src/options.cpp:3038 gui/src/options.cpp:3215 +#: gui/src/options.cpp:3042 gui/src/options.cpp:3219 msgid "mm" msgstr "mm" -#: gui/src/options.cpp:3069 gui/src/options.cpp:3974 gui/src/options.cpp:4157 +#: gui/src/options.cpp:3073 gui/src/options.cpp:3978 gui/src/options.cpp:4161 msgid "Chart Display" msgstr "海圖顯示" -#: gui/src/options.cpp:3075 +#: gui/src/options.cpp:3079 msgid "Show Skewed Raster Charts as North-Up" msgstr "允許在北方朝上模式中顯示旋轉的光柵掃瞄式海圖" -#: gui/src/options.cpp:3128 +#: gui/src/options.cpp:3132 msgid "With a lower value, the same zoom level shows a less detailed chart.\n" "With a higher value, the same zoom level shows a more detailed chart." msgstr "" -#: gui/src/options.cpp:3233 +#: gui/src/options.cpp:3237 msgid "Graphics" msgstr "圖形" -#: gui/src/options.cpp:3264 +#: gui/src/options.cpp:3268 msgid "Chart Bar" msgstr "" -#: gui/src/options.cpp:3270 +#: gui/src/options.cpp:3274 msgid "Show extended chart bar information." msgstr "" -#: gui/src/options.cpp:3289 +#: gui/src/options.cpp:3293 msgid "Vector Chart Display" msgstr "向量圖顯示" -#: gui/src/options.cpp:3312 gui/src/options.cpp:3515 +#: gui/src/options.cpp:3316 gui/src/options.cpp:3519 msgid "Mariner's Standard" msgstr "航海用" -#: gui/src/options.cpp:3331 gui/src/options.cpp:3530 +#: gui/src/options.cpp:3335 gui/src/options.cpp:3534 msgid "Depth Soundings" msgstr "水深" -#: gui/src/options.cpp:3337 gui/src/options.cpp:3535 +#: gui/src/options.cpp:3341 gui/src/options.cpp:3539 msgid "Chart Information Objects" msgstr "海圖資訊物件" -#: gui/src/options.cpp:3342 +#: gui/src/options.cpp:3346 msgid "Buoys/Lights" msgstr "浮標/燈號" -#: gui/src/options.cpp:3359 gui/src/options.cpp:3553 +#: gui/src/options.cpp:3363 gui/src/options.cpp:3557 msgid "Extended Light Sectors" msgstr "延伸燈號扇型範圍" -#: gui/src/options.cpp:3364 +#: gui/src/options.cpp:3368 msgid "Chart Texts" msgstr "海圖文字" -#: gui/src/options.cpp:3371 gui/src/options.cpp:3561 +#: gui/src/options.cpp:3375 gui/src/options.cpp:3565 msgid "National text on chart" msgstr "當地文字" -#: gui/src/options.cpp:3376 gui/src/options.cpp:3566 +#: gui/src/options.cpp:3380 gui/src/options.cpp:3570 msgid "Important Text Only" msgstr "僅顯示重要文字" -#: gui/src/options.cpp:3381 gui/src/options.cpp:3571 +#: gui/src/options.cpp:3385 gui/src/options.cpp:3575 msgid "De-Cluttered Text" msgstr "精簡文字" -#: gui/src/options.cpp:3385 +#: gui/src/options.cpp:3389 msgid "Chart Detail" msgstr "海圖細節" -#: gui/src/options.cpp:3388 gui/src/options.cpp:3576 +#: gui/src/options.cpp:3392 gui/src/options.cpp:3580 msgid "Reduced Detail at Small Scale" msgstr "在小比例尺減少細節" -#: gui/src/options.cpp:3395 gui/src/options.cpp:3583 +#: gui/src/options.cpp:3399 gui/src/options.cpp:3587 msgid "Additional detail reduction at Small Scale" msgstr "" -#: gui/src/options.cpp:3404 gui/src/options.cpp:3599 +#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 msgid "Graphics Style" msgstr "圖形樣式" -#: gui/src/options.cpp:3407 gui/src/options.cpp:3602 +#: gui/src/options.cpp:3411 gui/src/options.cpp:3606 msgid "Paper Chart" msgstr "紙海圖" -#: gui/src/options.cpp:3408 gui/src/options.cpp:3603 +#: gui/src/options.cpp:3412 gui/src/options.cpp:3607 msgid "Simplified" msgstr "簡化" -#: gui/src/options.cpp:3414 gui/src/options.cpp:3614 +#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 msgid "Boundaries" msgstr "邊界" -#: gui/src/options.cpp:3417 gui/src/options.cpp:3617 +#: gui/src/options.cpp:3421 gui/src/options.cpp:3621 msgid "Plain" msgstr "平面" -#: gui/src/options.cpp:3418 gui/src/options.cpp:3618 +#: gui/src/options.cpp:3422 gui/src/options.cpp:3622 msgid "Symbolized" msgstr "符號化" -#: gui/src/options.cpp:3424 gui/src/options.cpp:3629 +#: gui/src/options.cpp:3428 gui/src/options.cpp:3633 msgid "Colors" msgstr "色彩" -#: gui/src/options.cpp:3427 gui/src/options.cpp:3633 +#: gui/src/options.cpp:3431 gui/src/options.cpp:3637 msgid "2 Color" msgstr "2 色" -#: gui/src/options.cpp:3428 gui/src/options.cpp:3634 +#: gui/src/options.cpp:3432 gui/src/options.cpp:3638 msgid "4 Color" msgstr "4 色" -#: gui/src/options.cpp:3439 gui/src/options.cpp:3656 +#: gui/src/options.cpp:3443 gui/src/options.cpp:3660 msgid "Shallow Depth" msgstr "淺水區水深" -#: gui/src/options.cpp:3450 gui/src/options.cpp:3665 +#: gui/src/options.cpp:3454 gui/src/options.cpp:3669 msgid "Safety Depth" msgstr "安全水深" -#: gui/src/options.cpp:3460 gui/src/options.cpp:3674 +#: gui/src/options.cpp:3464 gui/src/options.cpp:3678 msgid "Deep Depth" msgstr "深水區水深" -#: gui/src/options.cpp:3475 gui/src/options.cpp:3692 +#: gui/src/options.cpp:3479 gui/src/options.cpp:3696 msgid "User Standard Objects" msgstr "" -#: gui/src/options.cpp:3494 gui/src/options.cpp:3707 +#: gui/src/options.cpp:3498 gui/src/options.cpp:3711 msgid "Reset to STANDARD" msgstr "" -#: gui/src/options.cpp:3720 +#: gui/src/options.cpp:3724 msgid "Tides && Currents" msgstr "潮汐與海流" -#: gui/src/options.cpp:3725 +#: gui/src/options.cpp:3729 msgid "Active Datasets" msgstr "使用中的資料集" -#: gui/src/options.cpp:3765 +#: gui/src/options.cpp:3769 msgid "Add Dataset..." msgstr "新增資料集…" -#: gui/src/options.cpp:3809 +#: gui/src/options.cpp:3813 msgid "All Available Charts" msgstr "所有可用的海圖" -#: gui/src/options.cpp:3831 +#: gui/src/options.cpp:3835 msgid "Remove Chart" msgstr "移除海圖" -#: gui/src/options.cpp:3868 +#: gui/src/options.cpp:3872 msgid "All Charts" msgstr "所有海圖" -#: gui/src/options.cpp:3887 +#: gui/src/options.cpp:3891 msgid "New Group..." msgstr "新群組..." -#: gui/src/options.cpp:3889 +#: gui/src/options.cpp:3893 msgid "Delete Group" msgstr "刪除群組" -#: gui/src/options.cpp:3985 gui/src/options.cpp:4168 +#: gui/src/options.cpp:3989 gui/src/options.cpp:4172 msgid "Preserve scale when switching charts" msgstr "" -#: gui/src/options.cpp:3994 gui/src/options.cpp:4177 +#: gui/src/options.cpp:3998 gui/src/options.cpp:4181 msgid "Controls" msgstr "控制項" -#: gui/src/options.cpp:4000 gui/src/options.cpp:4183 +#: gui/src/options.cpp:4004 gui/src/options.cpp:4187 msgid "Smooth Panning / Zooming" msgstr "平順 移動/縮放" -#: gui/src/options.cpp:4004 gui/src/options.cpp:4186 +#: gui/src/options.cpp:4008 gui/src/options.cpp:4190 msgid "Zoom to Cursor" msgstr "縮放時以游標位置為中心" -#: gui/src/options.cpp:4015 gui/src/options.cpp:4202 +#: gui/src/options.cpp:4019 gui/src/options.cpp:4206 msgid "Display Features" msgstr "顯示功能" -#: gui/src/options.cpp:4045 +#: gui/src/options.cpp:4049 msgid "Status Bar Option" msgstr "" -#: gui/src/options.cpp:4052 gui/src/options.cpp:4239 +#: gui/src/options.cpp:4056 gui/src/options.cpp:4243 msgid "Live ETA at Cursor" msgstr "" -#: gui/src/options.cpp:4061 gui/src/options.cpp:4247 gui/src/options.cpp:7082 +#: gui/src/options.cpp:4065 gui/src/options.cpp:4251 gui/src/options.cpp:7086 msgid "Default Boat Speed " msgstr "" -#: gui/src/options.cpp:4077 gui/src/options.cpp:4262 +#: gui/src/options.cpp:4081 gui/src/options.cpp:4266 msgid "Canvas Layout" msgstr "" -#: gui/src/options.cpp:4232 +#: gui/src/options.cpp:4236 msgid "Status Bar" msgstr "" -#: gui/src/options.cpp:4299 +#: gui/src/options.cpp:4303 msgid "Units" msgstr "單位" -#: gui/src/options.cpp:4320 gui/src/options.cpp:4481 -#: gui/src/initwiz/wiz_ui_proto.cpp:46 +#: gui/src/options.cpp:4324 gui/src/options.cpp:4485 +#: gui/src/initwiz/wiz_ui_proto.cpp:51 msgid "Statute miles" msgstr "法定英哩" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 gui/src/initwiz/wiz_ui_proto.cpp:56 -#: gui/src/initwiz/wiz_ui_proto.cpp:67 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 gui/src/initwiz/wiz_ui_proto.cpp:61 +#: gui/src/initwiz/wiz_ui_proto.cpp:71 msgid "Knots" msgstr "節" -#: gui/src/options.cpp:4335 gui/src/options.cpp:4348 gui/src/options.cpp:4492 -#: gui/src/options.cpp:4502 +#: gui/src/options.cpp:4339 gui/src/options.cpp:4352 gui/src/options.cpp:4496 +#: gui/src/options.cpp:4506 msgid "Mph" msgstr "英哩每小時" -#: gui/src/options.cpp:4361 gui/src/options.cpp:4510 -#: gui/src/initwiz/wiz_ui_proto.cpp:32 +#: gui/src/options.cpp:4365 gui/src/options.cpp:4514 +#: gui/src/initwiz/wiz_ui_proto.cpp:37 msgid "Depth" msgstr "水深" -#: gui/src/options.cpp:4377 gui/src/options.cpp:4523 +#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 msgid "Temperature" msgstr "" -#: gui/src/options.cpp:4380 gui/src/options.cpp:4526 +#: gui/src/options.cpp:4384 gui/src/options.cpp:4530 msgid "Celsius" msgstr "" -#: gui/src/options.cpp:4381 gui/src/options.cpp:4527 +#: gui/src/options.cpp:4385 gui/src/options.cpp:4531 msgid "Fahrenheit" msgstr "" -#: gui/src/options.cpp:4382 gui/src/options.cpp:4528 +#: gui/src/options.cpp:4386 gui/src/options.cpp:4532 msgid "Kelvin" msgstr "" -#: gui/src/options.cpp:4397 gui/src/options.cpp:4540 +#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 msgid "Lat/Long" msgstr "緯度/經度" -#: gui/src/options.cpp:4399 gui/src/options.cpp:4542 +#: gui/src/options.cpp:4403 gui/src/options.cpp:4546 msgid "Degrees, Decimal Minutes" msgstr "度, 十進位分" -#: gui/src/options.cpp:4400 gui/src/options.cpp:4543 +#: gui/src/options.cpp:4404 gui/src/options.cpp:4547 msgid "Decimal Degrees" msgstr "十進位度" -#: gui/src/options.cpp:4401 gui/src/options.cpp:4544 +#: gui/src/options.cpp:4405 gui/src/options.cpp:4548 msgid "Degrees, Minutes, Seconds" msgstr "度, 分, 秒" -#: gui/src/options.cpp:4416 gui/src/options.cpp:4556 +#: gui/src/options.cpp:4420 gui/src/options.cpp:4560 msgid "Bearings" msgstr "方位" -#: gui/src/options.cpp:4421 +#: gui/src/options.cpp:4425 msgid "Show true" msgstr "" -#: gui/src/options.cpp:4426 +#: gui/src/options.cpp:4430 msgid "Show magnetic" msgstr "" -#: gui/src/options.cpp:4442 +#: gui/src/options.cpp:4446 msgid "Assumed magnetic variation" msgstr "假定的磁場偏差" -#: gui/src/options.cpp:4457 gui/src/options.cpp:4589 +#: gui/src/options.cpp:4461 gui/src/options.cpp:4593 msgid "deg (-W, +E)" msgstr "deg (-W, +E)" -#: gui/src/options.cpp:4500 +#: gui/src/options.cpp:4504 msgid "WindSpeed" msgstr "" -#: gui/src/options.cpp:4564 +#: gui/src/options.cpp:4568 msgid "Show true bearings and headings" msgstr "" -#: gui/src/options.cpp:4567 +#: gui/src/options.cpp:4571 msgid "Show magnetic bearings and headings." msgstr "" -#: gui/src/options.cpp:4579 gui/src/options.cpp:6052 +#: gui/src/options.cpp:4583 gui/src/options.cpp:6056 msgid "WMM Plugin calculated magnetic variation" msgstr "" -#: gui/src/options.cpp:4597 +#: gui/src/options.cpp:4601 msgid " To set the magnetic variation manually,\n" " you must disable the WMM plugin." msgstr "" -#: gui/src/options.cpp:4731 +#: gui/src/options.cpp:4735 msgid "Test" msgstr "" -#: gui/src/options.cpp:4744 +#: gui/src/options.cpp:4748 msgid "Audio file name:" msgstr "" -#: gui/src/options.cpp:4772 gui/src/options.cpp:4783 gui/src/options.cpp:8343 -#: gui/src/options.cpp:8354 +#: gui/src/options.cpp:4776 gui/src/options.cpp:4787 gui/src/options.cpp:8373 +#: gui/src/options.cpp:8384 msgid "Select Sound File" msgstr "選擇音效檔" -#: gui/src/options.cpp:4854 +#: gui/src/options.cpp:4858 msgid "Sounds" msgstr "" -#: gui/src/options.cpp:4862 +#: gui/src/options.cpp:4866 msgid "Anchor Alarm" msgstr "" -#: gui/src/options.cpp:4863 +#: gui/src/options.cpp:4867 msgid "Play Sound on Anchor Alarm." msgstr "" -#: gui/src/options.cpp:4864 +#: gui/src/options.cpp:4868 msgid "Select Anchor Alarm Sound" msgstr "" -#: gui/src/options.cpp:4874 +#: gui/src/options.cpp:4878 msgid "Play Sound on AIS Alert." msgstr "" -#: gui/src/options.cpp:4875 +#: gui/src/options.cpp:4879 msgid "Select AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:4888 +#: gui/src/options.cpp:4892 msgid "SART Alert" msgstr "" -#: gui/src/options.cpp:4889 +#: gui/src/options.cpp:4893 msgid "Play Sound on AIS SART Alert." msgstr "" -#: gui/src/options.cpp:4890 +#: gui/src/options.cpp:4894 msgid "Select AIS SART Alert Sound" msgstr "" -#: gui/src/options.cpp:4903 +#: gui/src/options.cpp:4907 msgid "DSC Alert" msgstr "" -#: gui/src/options.cpp:4904 +#: gui/src/options.cpp:4908 msgid "Play Sound on DSC notification." msgstr "" -#: gui/src/options.cpp:4905 +#: gui/src/options.cpp:4909 msgid "Select DSC notification Sound" msgstr "" -#: gui/src/options.cpp:4917 +#: gui/src/options.cpp:4921 msgid "Sound Device Configuration" msgstr "" -#: gui/src/options.cpp:4932 +#: gui/src/options.cpp:4936 msgid "Unknown device :" msgstr "" -#: gui/src/options.cpp:4937 +#: gui/src/options.cpp:4941 msgid "Input device :" msgstr "" -#: gui/src/options.cpp:4965 +#: gui/src/options.cpp:4969 msgid "Sound Device" msgstr "" -#: gui/src/options.cpp:4979 +#: gui/src/options.cpp:4983 msgid "Audio Play command:" msgstr "" -#: gui/src/options.cpp:5020 +#: gui/src/options.cpp:5024 msgid "AIS Targets" msgstr "AIS 目標" -#: gui/src/options.cpp:5027 +#: gui/src/options.cpp:5031 msgid "CPA Calculation" msgstr "CPA 計算" -#: gui/src/options.cpp:5038 +#: gui/src/options.cpp:5042 msgid "No (T)CPA Alerts if target range is greater than (NMi)" msgstr "" -#: gui/src/options.cpp:5045 +#: gui/src/options.cpp:5049 msgid "Warn if CPA less than (NMi)" msgstr "當 CPA 小於多少時發出警告(海浬)" -#: gui/src/options.cpp:5057 +#: gui/src/options.cpp:5061 msgid "...and TCPA is less than (min)" msgstr "...且TCPA 小於多少(分鐘)" -#: gui/src/options.cpp:5065 +#: gui/src/options.cpp:5069 msgid "Lost Targets" msgstr "目標遺失" -#: gui/src/options.cpp:5074 +#: gui/src/options.cpp:5078 msgid "Mark targets as lost after (min)" msgstr "信號消失多久後標記為目標遺失(分鐘)" -#: gui/src/options.cpp:5082 +#: gui/src/options.cpp:5086 msgid "Remove lost targets after (min)" msgstr "多久後移除遺失目標 (分鐘)" -#: gui/src/options.cpp:5092 gui/src/options.cpp:5812 +#: gui/src/options.cpp:5096 gui/src/options.cpp:5816 msgid "Display" msgstr "顯示" -#: gui/src/options.cpp:5101 +#: gui/src/options.cpp:5105 msgid "Show target COG predictor arrow, length (min)" msgstr "顯示目標COG向量, 長度(分鐘)" -#: gui/src/options.cpp:5109 +#: gui/src/options.cpp:5113 msgid "Sync AIS arrow length with own ship's COG predictor" msgstr "" -#: gui/src/options.cpp:5119 +#: gui/src/options.cpp:5123 msgid "Show target tracks, length (min)" msgstr "顯示目標軌跡, 長度(分鐘)" -#: gui/src/options.cpp:5127 +#: gui/src/options.cpp:5131 msgid "Suppress anchored/moored targets, speed max (kn)" msgstr "" -#: gui/src/options.cpp:5135 +#: gui/src/options.cpp:5139 msgid "Draw AIS realtime prediction, target speed min (kn)" msgstr "" -#: gui/src/options.cpp:5145 +#: gui/src/options.cpp:5149 msgid "Allow attenuation of less critical targets if more than ... targets" msgstr "" -#: gui/src/options.cpp:5153 +#: gui/src/options.cpp:5157 msgid "Show area notices (from AIS binary messages)" msgstr "顯示區域通知 (來自 AIS binary 資料)" -#: gui/src/options.cpp:5160 +#: gui/src/options.cpp:5164 msgid "Show AIS targets real size" msgstr "顯示 AIS 目標實際大小" -#: gui/src/options.cpp:5167 +#: gui/src/options.cpp:5171 msgid "Show names with AIS targets at scale greater than 1:" msgstr "顯示 AIS 目標名稱當比例尺大於1:" -#: gui/src/options.cpp:5175 +#: gui/src/options.cpp:5179 msgid "Use WPL position messages. Action when received:" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "APRS position report" msgstr "" -#: gui/src/options.cpp:5178 +#: gui/src/options.cpp:5182 msgid "Create mark" msgstr "" -#: gui/src/options.cpp:5184 +#: gui/src/options.cpp:5188 msgid "Rollover" msgstr "滑鼠移至物件上方時顯示" -#: gui/src/options.cpp:5190 +#: gui/src/options.cpp:5194 msgid "Enable route/AIS info block" msgstr "" -#: gui/src/options.cpp:5198 +#: gui/src/options.cpp:5202 msgid "\"Ship Name\" MMSI (Call Sign)" msgstr "\"船名\" MMSI (Call Sign)" -#: gui/src/options.cpp:5202 +#: gui/src/options.cpp:5206 msgid "[Class] Type (Status)" msgstr "[類別] 形式 (狀態)" -#: gui/src/options.cpp:5205 +#: gui/src/options.cpp:5209 msgid "SOG COG" msgstr "SOG COG" -#: gui/src/options.cpp:5208 +#: gui/src/options.cpp:5212 msgid "CPA TCPA" msgstr "CPA TCPA" -#: gui/src/options.cpp:5213 +#: gui/src/options.cpp:5217 msgid "CPA/TCPA Alerts" msgstr "CPA/TCPA 警示" -#: gui/src/options.cpp:5222 +#: gui/src/options.cpp:5226 msgid "Show CPA/TCPA Alert Dialog" msgstr "顯示 CPA/TCPA 警報視窗" -#: gui/src/options.cpp:5241 +#: gui/src/options.cpp:5245 msgid "Play Sound on CPA/TCPA Alerts and DSC/SART emergencies." msgstr "CPA/TCPA 警報時發出音效" -#: gui/src/options.cpp:5250 +#: gui/src/options.cpp:5254 msgid "Test AIS Alert Sound" msgstr "" -#: gui/src/options.cpp:5263 +#: gui/src/options.cpp:5267 msgid "Suppress Alerts for anchored/moored targets" msgstr "" -#: gui/src/options.cpp:5270 +#: gui/src/options.cpp:5274 msgid "Enable Target Alert Acknowledge timeout (min)" msgstr "啟動目標警告認知計時 (分鐘)" -#: gui/src/options.cpp:5294 +#: gui/src/options.cpp:5298 msgid "General Options" msgstr "一般選項" -#: gui/src/options.cpp:5303 +#: gui/src/options.cpp:5307 msgid "Language" msgstr "語系" -#: gui/src/options.cpp:5318 +#: gui/src/options.cpp:5322 msgid "Fonts" msgstr "字型" -#: gui/src/options.cpp:5354 +#: gui/src/options.cpp:5358 msgid "Choose Font..." msgstr "選擇字型" -#: gui/src/options.cpp:5359 +#: gui/src/options.cpp:5363 msgid "Choose Font Color..." msgstr "選擇字型顏色…" -#: gui/src/options.cpp:5363 +#: gui/src/options.cpp:5367 msgid "Sample" msgstr "" -#: gui/src/options.cpp:5371 +#: gui/src/options.cpp:5375 msgid "Toolbar and Window Style" msgstr "工具列與視窗樣式" -#: gui/src/options.cpp:5389 +#: gui/src/options.cpp:5393 msgid "Interface Options" msgstr "介面選項" -#: gui/src/options.cpp:5395 +#: gui/src/options.cpp:5399 msgid "Show Status Bar" msgstr "顯示狀態列" -#: gui/src/options.cpp:5400 +#: gui/src/options.cpp:5404 msgid "Show Menu Bar" msgstr "顯示功能表列" -#: gui/src/options.cpp:5414 +#: gui/src/options.cpp:5418 msgid "Show Compass/GPS Status Window" msgstr "顯示 羅經/GPS 狀態視窗" -#: gui/src/options.cpp:5422 +#: gui/src/options.cpp:5426 msgid "Enable Toolbar auto-hide" msgstr "啟用工具列自動隱藏" -#: gui/src/options.cpp:5437 +#: gui/src/options.cpp:5441 msgid "Play Ships Bells" msgstr "播放船鐘聲效" -#: gui/src/options.cpp:5442 +#: gui/src/options.cpp:5446 msgid "Enable Touchscreen interface" msgstr "啟用觸控螢幕介面" -#: gui/src/options.cpp:5446 +#: gui/src/options.cpp:5450 msgid "Enable Scaled Graphics interface" msgstr "" -#: gui/src/options.cpp:5459 +#: gui/src/options.cpp:5463 msgid "Show Zoom buttons" msgstr "" -#: gui/src/options.cpp:5466 +#: gui/src/options.cpp:5470 msgid "Use Inland ECDIS" msgstr "" -#: gui/src/options.cpp:5470 gui/src/options.cpp:7777 +#: gui/src/options.cpp:5474 gui/src/options.cpp:7782 msgid "Inland ECDIS Manual" msgstr "" -#: gui/src/options.cpp:5492 +#: gui/src/options.cpp:5496 msgid "User Interface scale factor" msgstr "使用者介面比例因數" -#: gui/src/options.cpp:5506 +#: gui/src/options.cpp:5510 msgid "Chart Object scale factor" msgstr "海圖物件比例因數" -#: gui/src/options.cpp:5520 +#: gui/src/options.cpp:5524 msgid "Ship scale factor" msgstr "" -#: gui/src/options.cpp:5534 +#: gui/src/options.cpp:5538 msgid "ENC Sounding factor" msgstr "" -#: gui/src/options.cpp:5548 +#: gui/src/options.cpp:5552 msgid "ENC Text Scale" msgstr "" -#: gui/src/options.cpp:5558 +#: gui/src/options.cpp:5562 msgid "Mouse wheel zoom sensitivity" msgstr "" -#: gui/src/options.cpp:5809 +#: gui/src/options.cpp:5813 msgid "Apply" msgstr "套用" -#: gui/src/options.cpp:5818 +#: gui/src/options.cpp:5822 msgid "Charts" msgstr "海圖" -#: gui/src/options.cpp:5841 +#: gui/src/options.cpp:5845 msgid "Connections" msgstr "連接" -#: gui/src/options.cpp:5843 +#: gui/src/options.cpp:5847 msgid "Connect" msgstr "" -#: gui/src/options.cpp:5855 +#: gui/src/options.cpp:5859 msgid "Ships" msgstr " 船名" -#: gui/src/options.cpp:5864 +#: gui/src/options.cpp:5868 msgid "User Interface" msgstr "使用者介面" -#: gui/src/options.cpp:5866 +#: gui/src/options.cpp:5870 msgid "User" msgstr "" -#: gui/src/options.cpp:5872 gui/src/options.cpp:5873 +#: gui/src/options.cpp:5876 gui/src/options.cpp:5877 msgid "Plugins" msgstr "插件" -#: gui/src/options.cpp:6057 +#: gui/src/options.cpp:6061 msgid "User set magnetic variation" msgstr "" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "feet" msgstr "英呎" -#: gui/src/options.cpp:6507 +#: gui/src/options.cpp:6511 msgid "fathoms" msgstr "噚" -#: gui/src/options.cpp:6748 +#: gui/src/options.cpp:6752 msgid "Add a directory containing chart files" msgstr "新增包含海圖檔案的目錄" -#: gui/src/options.cpp:6854 +#: gui/src/options.cpp:6858 msgid "\n" " - your ship's length must be > 0" msgstr "\n" " - 船長必須 > 0" -#: gui/src/options.cpp:6856 +#: gui/src/options.cpp:6860 msgid "\n" " - your ship's beam must be > 0" msgstr "\n" " - 船寬必須 > 0" -#: gui/src/options.cpp:6859 +#: gui/src/options.cpp:6863 msgid "\n" " - your GPS offset from midship must be within your ship's beam" msgstr "\n" " - GPS 天線橫向位置設定值不可大於船身寬度" -#: gui/src/options.cpp:6863 +#: gui/src/options.cpp:6867 msgid "\n" " - your GPS offset from bow must be within your ship's length" msgstr "\n" " - GPS 天線距離船頭位置設定值不可大於船身長度" -#: gui/src/options.cpp:6865 +#: gui/src/options.cpp:6869 msgid "\n" " - your minimum ship icon size must be between 1 and 100 mm" msgstr "\n" " - 船舶圖示大小必須介於 1 到 100 mm 之間" -#: gui/src/options.cpp:6867 +#: gui/src/options.cpp:6871 msgid "The settings for own ship real size are not correct:" msgstr "本船設定的實際大小不正確:" -#: gui/src/options.cpp:7770 +#: gui/src/options.cpp:7775 msgid "The Inland ECDIS Manual is not available locally." msgstr "" -#: gui/src/options.cpp:7773 +#: gui/src/options.cpp:7778 msgid "Would you like to visit the iECDIS Manual website for more information?" msgstr "" -#: gui/src/options.cpp:7804 +#: gui/src/options.cpp:7809 msgid "Compression will alter chart files on disk.\n" "This may make them incompatible with other programs or older versions of OpenCPN.\n" "Compressed charts may take slightly longer to load and display on some systems.\n" "They can be decompressed again using unxz or 7 zip programs." msgstr "" -#: gui/src/options.cpp:7825 gui/src/options.cpp:7869 +#: gui/src/options.cpp:7830 gui/src/options.cpp:7874 msgid "OpenCPN Compress Charts" msgstr "" -#: gui/src/options.cpp:7862 +#: gui/src/options.cpp:7867 msgid "No charts found to compress." msgstr "" -#: gui/src/options.cpp:7894 +#: gui/src/options.cpp:7899 #, c-format msgid "compressed %ld charts\n" "from %.1fMB to %.1fMB\n" "saved %.1fMB (%.1f%%)" msgstr "" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "Enter Group Name" msgstr "輸入群組名稱" -#: gui/src/options.cpp:8798 +#: gui/src/options.cpp:8828 msgid "New Chart Group" msgstr "新海圖群組" -#: gui/src/options.cpp:8971 gui/src/options.cpp:8985 +#: gui/src/options.cpp:9001 gui/src/options.cpp:9015 msgid "Select Tide/Current Data" msgstr "選擇 潮汐/洋流 資料" -#: gui/src/options.cpp:9043 +#: gui/src/options.cpp:9073 msgid "Texture Compression" msgstr "紋理壓縮" -#: gui/src/options.cpp:9044 +#: gui/src/options.cpp:9074 msgid "Texture Compression with Caching" msgstr "貼圖壓縮快取" -#: gui/src/options.cpp:9046 +#: gui/src/options.cpp:9076 msgid "Texture Compression Caching" msgstr "紋理壓縮快取" -#: gui/src/options.cpp:9048 +#: gui/src/options.cpp:9078 msgid "Texture Memory Size (MB)" msgstr "紋理記憶體大小(MB)" -#: gui/src/options.cpp:9052 gui/src/options.cpp:9218 +#: gui/src/options.cpp:9082 gui/src/options.cpp:9248 msgid "Size: " msgstr "大小: " -#: gui/src/options.cpp:9054 +#: gui/src/options.cpp:9084 msgid "Rebuild Texture Cache" msgstr "重建紋理快取" -#: gui/src/options.cpp:9056 +#: gui/src/options.cpp:9086 msgid "Clear Texture Cache" msgstr "清除紋理快取" -#: gui/src/options.cpp:9060 +#: gui/src/options.cpp:9090 msgid "Polygon Smoothing" msgstr "" -#: gui/src/options.cpp:9061 +#: gui/src/options.cpp:9091 msgid "Line Smoothing" msgstr "" -#: gui/src/options.cpp:9063 +#: gui/src/options.cpp:9093 msgid "Software OpenGL (restart OpenCPN)" msgstr "軟體 OpenGL (需重新啟動 OpenCPN)" -#: gui/src/options.cpp:9065 +#: gui/src/options.cpp:9095 msgid "Use Accelerated Panning" msgstr "使用圖形顯示加速功能(OpenGL)" -#: gui/src/options.cpp:9067 +#: gui/src/options.cpp:9097 msgid "Texture Settings" msgstr "紋理貼圖設定" -#: gui/src/options.cpp:9074 +#: gui/src/options.cpp:9104 msgid "Texture Cache" msgstr "紋理貼圖快取" -#: gui/src/options.cpp:9081 +#: gui/src/options.cpp:9111 msgid "Miscellaneous" msgstr "其它" @@ -6967,127 +6979,127 @@ msgstr "" msgid " successfully installed from cache" msgstr "" -#: gui/src/pluginmanager.cpp:3700 +#: gui/src/pluginmanager.cpp:3701 msgid "These settings might destabilize OpenCPN and are by default disabled. To despite the dangers enable them manually add a CatalogExpert=1 line in the [PlugIns] section in the configuration file." msgstr "" -#: gui/src/pluginmanager.cpp:3716 +#: gui/src/pluginmanager.cpp:3717 msgid "Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3733 gui/src/pluginmanager.cpp:4007 +#: gui/src/pluginmanager.cpp:3734 gui/src/pluginmanager.cpp:4008 msgid "Update Plugin Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3739 gui/src/pluginmanager.cpp:3811 +#: gui/src/pluginmanager.cpp:3740 gui/src/pluginmanager.cpp:3812 msgid "Import plugin..." msgstr "" -#: gui/src/pluginmanager.cpp:3746 gui/src/pluginmanager.cpp:3803 +#: gui/src/pluginmanager.cpp:3747 gui/src/pluginmanager.cpp:3804 msgid "Settings..." msgstr "" -#: gui/src/pluginmanager.cpp:3754 +#: gui/src/pluginmanager.cpp:3755 msgid "Disabled" msgstr "" -#: gui/src/pluginmanager.cpp:3779 +#: gui/src/pluginmanager.cpp:3780 msgid "Update Plugin Catalog: master" msgstr "" -#: gui/src/pluginmanager.cpp:3855 gui/src/pluginmanager.cpp:3867 -#: gui/src/pluginmanager.cpp:3877 gui/src/pluginmanager.cpp:3886 -#: gui/src/pluginmanager.cpp:3917 +#: gui/src/pluginmanager.cpp:3856 gui/src/pluginmanager.cpp:3868 +#: gui/src/pluginmanager.cpp:3878 gui/src/pluginmanager.cpp:3887 +#: gui/src/pluginmanager.cpp:3918 msgid "OpenCPN Catalog update" msgstr "" -#: gui/src/pluginmanager.cpp:3866 gui/src/pluginmanager.cpp:3876 +#: gui/src/pluginmanager.cpp:3867 gui/src/pluginmanager.cpp:3877 msgid "Unable to copy catalog file" msgstr "" -#: gui/src/pluginmanager.cpp:3885 +#: gui/src/pluginmanager.cpp:3886 msgid "Unable to copy catalog file to cache" msgstr "" -#: gui/src/pluginmanager.cpp:3916 +#: gui/src/pluginmanager.cpp:3917 msgid "Catalog update successful" msgstr "" -#: gui/src/pluginmanager.cpp:3938 +#: gui/src/pluginmanager.cpp:3939 msgid "Select tarball file" msgstr "" -#: gui/src/pluginmanager.cpp:3948 -msgid "Error extracting metadata from tarball." +#: gui/src/pluginmanager.cpp:3949 +msgid "Error extracting metadata from tarball (missing metadata.xml?)" msgstr "" -#: gui/src/pluginmanager.cpp:3949 gui/src/pluginmanager.cpp:3954 -#: gui/src/pluginmanager.cpp:3962 +#: gui/src/pluginmanager.cpp:3950 gui/src/pluginmanager.cpp:3955 +#: gui/src/pluginmanager.cpp:3963 msgid "OpenCPN Plugin Import Error" msgstr "" -#: gui/src/pluginmanager.cpp:3953 +#: gui/src/pluginmanager.cpp:3954 msgid "Incompatible import plugin detected." msgstr "" -#: gui/src/pluginmanager.cpp:3961 +#: gui/src/pluginmanager.cpp:3962 msgid "Error extracting import plugin tarball." msgstr "" -#: gui/src/pluginmanager.cpp:3976 +#: gui/src/pluginmanager.cpp:3977 msgid "Plugin" msgstr "" -#: gui/src/pluginmanager.cpp:3977 +#: gui/src/pluginmanager.cpp:3978 msgid " successfully imported" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Active Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3984 +#: gui/src/pluginmanager.cpp:3985 msgid "Last Catalog" msgstr "" -#: gui/src/pluginmanager.cpp:3999 +#: gui/src/pluginmanager.cpp:4000 msgid "Last change: " msgstr "" -#: gui/src/pluginmanager.cpp:4000 +#: gui/src/pluginmanager.cpp:4001 msgid "Please Update Plugin Catalog." msgstr "" -#: gui/src/pluginmanager.cpp:4355 gui/src/pluginmanager.cpp:4549 -#: gui/src/pluginmanager.cpp:4574 +#: gui/src/pluginmanager.cpp:4356 gui/src/pluginmanager.cpp:4550 +#: gui/src/pluginmanager.cpp:4575 msgid "Uninstall" msgstr "" -#: gui/src/pluginmanager.cpp:4362 +#: gui/src/pluginmanager.cpp:4363 msgid "Uninstall plugin " msgstr "" -#: gui/src/pluginmanager.cpp:4363 +#: gui/src/pluginmanager.cpp:4364 msgid "Un-Installation" msgstr "" -#: gui/src/pluginmanager.cpp:4464 gui/src/pluginmanager.cpp:4517 +#: gui/src/pluginmanager.cpp:4465 gui/src/pluginmanager.cpp:4518 msgid "Enabled" msgstr "" -#: gui/src/pluginmanager.cpp:4738 +#: gui/src/pluginmanager.cpp:4739 msgid "Upgrade to Version " msgstr "" -#: gui/src/pluginmanager.cpp:4745 +#: gui/src/pluginmanager.cpp:4746 msgid "Install..." msgstr "" -#: gui/src/pluginmanager.cpp:4751 +#: gui/src/pluginmanager.cpp:4752 msgid "Update to " msgstr "" -#: gui/src/pluginmanager.cpp:4983 gui/src/update_mgr.cpp:257 +#: gui/src/pluginmanager.cpp:4984 gui/src/update_mgr.cpp:257 msgid "Website" msgstr "" @@ -7132,10 +7144,6 @@ msgstr "" msgid "OpenCPN Server Message" msgstr "" -#: gui/src/RolloverWin.cpp:137 gui/src/RolloverWin.cpp:303 -msgid "AISRollover" -msgstr "AISRollover" - #: gui/src/RolloverWin.cpp:140 gui/src/RolloverWin.cpp:307 msgid "TideCurrentGraphRollover" msgstr "潮流圖表Rollover" @@ -7253,12 +7261,6 @@ msgstr "從軌跡設定航路" msgid "Send to &Peer" msgstr "" -#: gui/src/routemanagerdialog.cpp:688 gui/src/route_point_gui.cpp:127 -#: gui/src/route_point_gui.cpp:135 gui/src/route_point_gui.cpp:299 -#: gui/src/route_point_gui.cpp:307 -msgid "Marks" -msgstr "" - #: gui/src/routemanagerdialog.cpp:714 msgid "Show all marks" msgstr "" @@ -7459,15 +7461,15 @@ msgstr "" msgid "Therefore the new waypoint will not be visible at this zoom level." msgstr "" -#: gui/src/route_point_gui.cpp:906 +#: gui/src/route_point_gui.cpp:907 msgid "Waypoint(s) Transmitted." msgstr "" -#: gui/src/route_point_gui.cpp:909 +#: gui/src/route_point_gui.cpp:910 msgid "Error on Waypoint Upload. Garmin GPS not connected" msgstr "" -#: gui/src/route_point_gui.cpp:911 +#: gui/src/route_point_gui.cpp:912 msgid "Error on Waypoint Upload. Please check logfiles..." msgstr "" @@ -7772,7 +7774,7 @@ msgstr "(扇形角度為朝海的真方位)
" msgid "

The last opencpn run seems to have failed. Do you want to run\n" "in safe mode without plugins and other possibly problematic\n" "features?\n" -"



You may consider visiting the list of known issues.

" +"



You may consider visiting the list of known issues.

" msgstr "" #: gui/src/safe_mode_gui.cpp:38 @@ -7888,7 +7890,7 @@ msgstr "今天" msgid "Tomorrow" msgstr "明天" -#: gui/src/toolbar.cpp:871 gui/src/toolbar.cpp:883 gui/src/toolbar.cpp:898 +#: gui/src/toolbar.cpp:875 gui/src/toolbar.cpp:887 gui/src/toolbar.cpp:902 msgid "ToolTips" msgstr "工具提示" @@ -8170,153 +8172,156 @@ msgstr "移動航路點" msgid "Dismiss" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:69 +#: gui/src/initwiz/wiz_ui.cpp:74 msgid "Select the units and data formats you would like to use." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:73 +#: gui/src/initwiz/wiz_ui.cpp:78 msgid "All the settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:76 +#: gui/src/initwiz/wiz_ui.cpp:81 msgid " icon in the main Toolbar." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:82 +#: gui/src/initwiz/wiz_ui.cpp:87 msgid "If you already have charts on your system, you may add them here." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:85 +#: gui/src/initwiz/wiz_ui.cpp:90 msgid "Additional charts can be obtained using the Chart Downloader integrated in the application." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:90 +#: gui/src/initwiz/wiz_ui.cpp:95 msgid "To access the Chart Downloader click on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:93 +#: gui/src/initwiz/wiz_ui.cpp:98 msgid " icon in the main Toolbar and navigate to Charts -> Chart Downloader tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:97 +#: gui/src/initwiz/wiz_ui.cpp:102 msgid "

Welcome to OpenCPN!

You have successfully completed the initial configuration. You can now start using the application.

" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:345 +#: gui/src/initwiz/wiz_ui.cpp:395 #, c-format msgid "NMEA0183: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:356 +#: gui/src/initwiz/wiz_ui.cpp:406 #, c-format msgid "NMEA2000: UDP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:444 +#: gui/src/initwiz/wiz_ui.cpp:510 #, c-format msgid "NMEA0183: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:456 +#: gui/src/initwiz/wiz_ui.cpp:522 #, c-format msgid "NMEA2000: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:493 +#: gui/src/initwiz/wiz_ui.cpp:609 #, c-format msgid "GPSd: %s TCP port %d" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:508 -msgid "Looking for Signal K servers..." +#: gui/src/initwiz/wiz_ui.cpp:630 +msgid "Looking for navigation data sources, this may take a while..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:512 +#: gui/src/initwiz/wiz_ui.cpp:632 msgid "Scanning USB devices..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:516 +#: gui/src/initwiz/wiz_ui.cpp:637 msgid "Looking for UDP data feeds..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:520 +#: gui/src/initwiz/wiz_ui.cpp:642 msgid "Looking for TCP servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:524 +#: gui/src/initwiz/wiz_ui.cpp:648 +msgid "Looking for Signal K servers..." +msgstr "" + +#: gui/src/initwiz/wiz_ui.cpp:654 msgid "Looking for CAN interfaces..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:528 +#: gui/src/initwiz/wiz_ui.cpp:660 msgid "Looking for GPSD servers..." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:541 +#: gui/src/initwiz/wiz_ui.cpp:676 #, c-format msgid "SignalK: %s (%s port %d)" msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:555 +#: gui/src/initwiz/wiz_ui.cpp:690 msgid "The system has been scanned for sources of navigation data." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:558 +#: gui/src/initwiz/wiz_ui.cpp:693 msgid "The connections to the discovered sources of data will be configured automatically. You may uncheck the ones you want to ignore." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:562 +#: gui/src/initwiz/wiz_ui.cpp:697 msgid "You may now connect additional USB devices or connect to a different network and press the Rescan button to update the list." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:567 +#: gui/src/initwiz/wiz_ui.cpp:702 msgid "The connection settings can be changed at any time in the configuration Toolbox accessible by clicking on the " msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:571 +#: gui/src/initwiz/wiz_ui.cpp:706 msgid " icon in the main Toolbar. In the Toolbox navigate to the Connections tab." msgstr "" -#: gui/src/initwiz/wiz_ui.cpp:578 +#: gui/src/initwiz/wiz_ui.cpp:716 msgid "Select a directory containing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:25 +#: gui/src/initwiz/wiz_ui_proto.cpp:30 msgid "Units and formats" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, decimal minutes (DD MM.MM)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Decimal degrees (DD.DDDDD)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:78 +#: gui/src/initwiz/wiz_ui_proto.cpp:81 msgid "Degrees, minutes, seconds (DD MM SS)" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:87 +#: gui/src/initwiz/wiz_ui_proto.cpp:90 msgid "Show true headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:94 +#: gui/src/initwiz/wiz_ui_proto.cpp:97 msgid "Show magnetic headings and bearings" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:118 +#: gui/src/initwiz/wiz_ui_proto.cpp:132 msgid "Detected navigation data sources:" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:126 +#: gui/src/initwiz/wiz_ui_proto.cpp:140 msgid "Rescan..." msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:145 +#: gui/src/initwiz/wiz_ui_proto.cpp:170 msgid "Add existing charts" msgstr "" -#: gui/src/initwiz/wiz_ui_proto.cpp:152 +#: gui/src/initwiz/wiz_ui_proto.cpp:177 msgid "Add chart directory..." msgstr "" - diff --git a/resources/opencpn.appdata.xml.in b/resources/opencpn.appdata.xml.in index 2e56272991..bd4f28e0f5 100644 --- a/resources/opencpn.appdata.xml.in +++ b/resources/opencpn.appdata.xml.in @@ -5,7 +5,7 @@ CC0-1.0 GPL-2.0+ OpenCPN - + The OpenCPN Community Chartplotter and Navigation tool diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6df1f0b27a..dc8ea43de5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,6 +6,16 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) message(STATUS "Building tests") enable_testing () + +add_library(win32_libs INTERFACE) +if (MSVC) + target_link_libraries(win32_libs + INTERFACE + setupapi.lib psapi.lib + ${CMAKE_SOURCE_DIR}/cache/buildwin/iphlpapi.lib + ) +endif () + set(MODEL_SRC_DIR ${CMAKE_SOURCE_DIR}/model/src) set(SRC tests.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) @@ -41,204 +51,58 @@ target_compile_definitions(tests TESTDATA="${CMAKE_CURRENT_LIST_DIR}/testdata" UNIT_TESTS ) -target_link_libraries(tests PRIVATE ocpn::model ocpn::model-src) - -if (UNIX AND NOT DEFINED ENV{FLATPAK_ID}) - set(IPC_SRV_TESTS_SRC - ipc-srv-tests.cpp - ${MODEL_SRC_DIR}/cmdline.cpp - ${MODEL_SRC_DIR}/config_vars.cpp - ${MODEL_SRC_DIR}/local_api.cpp - ${MODEL_SRC_DIR}/ipc_api.cpp - ${MODEL_SRC_DIR}/ocpn_utils.cpp - ${MODEL_SRC_DIR}/base_platform.cpp - ${MODEL_SRC_DIR}/logger.cpp - ) - if (APPLE) - list(APPEND IPC_SRV_TESTS_SRC ${MODEL_SRC_DIR}/macutils.c) - endif () - add_executable(ipc-srv-tests ${IPC_SRV_TESTS_SRC}) - - # See note in ipc-srv-tests.cpp - target_compile_options(ipc-srv-tests PRIVATE -O0) - target_link_libraries(ipc-srv-tests PRIVATE ocpn::gtest) - target_link_libraries(ipc-srv-tests PRIVATE ${wxWidgets_LIBRARIES}) - target_link_libraries(ipc-srv-tests PRIVATE observable::observable) - target_include_directories(ipc-srv-tests PRIVATE . - ${CMAKE_SOURCE_DIR}/model/include - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/resources - ) - if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") - target_link_libraries(ipc-srv-tests PUBLIC -fsanitize=${ENABLE_SANITIZER}) - endif () - - add_dependencies(ipc-srv-tests cli-server ipc-client) -endif () - -target_compile_definitions(tests - PUBLIC - CLIAPP USE_MOCK_DEFS CMAKE_BINARY_DIR="${CMAKE_BINARY_DIR}" - TESTDATA="${CMAKE_CURRENT_LIST_DIR}/testdata" -) - -if (MSVC) - target_link_libraries(tests - PRIVATE setupapi.lib psapi.lib ${CMAKE_SOURCE_DIR}/cache/buildwin/iphlpapi.lib - ) -endif () - -target_include_directories( - tests - PRIVATE - ${PROJECT_SOURCE_DIR}/../include - ${PROJECT_SOURCE_DIR}/include - ${CMAKE_BINARY_DIR}/include - ${PROJECT_SOURCE_DIR}/../libs/sound/include - ${PROJECT_SOURCE_DIR}/../libs/sound/include - ${PROJECT_SOURCE_DIR}/../buildandroid/libcurl/include -) -if(APPLE AND OCPN_USE_DEPS_BUNDLE) - target_include_directories( - tests - PRIVATE - ${OCPN_DEPS_BUNDLE_PATH}/include - ) -endif() +target_link_libraries(tests PRIVATE ocpn::model-src ocpn::gtest win32_libs) if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") target_link_libraries(tests PRIVATE -fsanitize=${ENABLE_SANITIZER}) endif () -target_link_libraries(tests PRIVATE ${wxWidgets_LIBRARIES}) -if (DEFINED LIBELF_LIBRARY) - target_link_libraries(tests PRIVATE "${LIBELF_LIBRARY}") -endif () -target_link_libraries(tests PRIVATE ocpn::filesystem) -target_link_libraries(tests PRIVATE ocpn::tinyxml) - -if (DEFINED CURL_LIBRARIES) - target_link_libraries(tests PRIVATE ${CURL_LIBRARIES}) -endif () -if (DEFINED WXCURL_LIBRARIES) - target_link_libraries(tests PRIVATE ${WXCURL_LIBRARIES}) -elseif (DEFINED WXSYS_CURL_LIBRARIES) - target_link_libraries(tests PRIVATE ${SYS_WXCURL_LIBRARIES}) -elseif (TARGET ocpn::wxcurl) - target_link_libraries(tests PRIVATE ocpn::wxcurl) -endif () - -if (HAVE_LIBUDEV) - target_link_libraries(tests PRIVATE ocpn::libudev) +find_program(DBUS_SEND NAMES dbus-send) +if (DBUS_SEND) + target_compile_definitions(tests PRIVATE HAVE_DBUS_SEND) endif () -set(BUF_TEST_SRC - buffer_tests.cpp - ${MODEL_SRC_DIR}/cmdline.cpp - ${MODEL_SRC_DIR}/config_vars.cpp - ${MODEL_SRC_DIR}/comm_drv_registry.cpp - ${MODEL_SRC_DIR}/comm_navmsg.cpp - ${MODEL_SRC_DIR}/comm_out_queue.cpp - ${MODEL_SRC_DIR}/ocpn_utils.cpp - ${MODEL_SRC_DIR}/base_platform.cpp - ${MODEL_SRC_DIR}/logger.cpp - ${MODEL_SRC_DIR}/ocpn_plugin.cpp - ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp -) - -if (APPLE) - list(APPEND BUF_TEST_SRC ${MODEL_SRC_DIR}/macutils.c) +if (GLIB_FOUND) + target_compile_definitions(tests PRIVATE HAVE_GLIB) endif () -add_executable(buffer_tests ${BUF_TEST_SRC}) -target_link_libraries(buffer_tests PRIVATE observable::observable) -target_link_libraries(buffer_tests PRIVATE ${wxWidgets_LIBRARIES}) -target_link_libraries(buffer_tests PRIVATE ocpn::gtest) -if (MSVC) - target_link_libraries(buffer_tests PRIVATE setupapi.lib) -endif () -if (APPLE) -target_link_libraries(buffer_tests PRIVATE ocpn::filesystem) +if (UNIX AND NOT DEFINED ENV{FLATPAK_ID}) + set(_IPC_SRV_SRC ipc-srv-tests.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) + add_executable(ipc-srv-tests ${_IPC_SRV_SRC} ) + target_link_libraries( + ipc-srv-tests PRIVATE ocpn::gtest ocpn::model-src win32_libs + ) + if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") + target_link_libraries(ipc-srv-tests PUBLIC -fsanitize=${ENABLE_SANITIZER}) + endif () + # See note in ipc-srv-tests.cpp + target_compile_options(ipc-srv-tests PRIVATE -O0) + add_dependencies(ipc-srv-tests cli-server ipc-client) endif () - -target_include_directories(buffer_tests PRIVATE - ${CMAKE_SOURCE_DIR}/model/include - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/resources +set(_BUF_TEST_SRC buffer_tests.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) +add_executable(buffer_tests ${_BUF_TEST_SRC}) +target_link_libraries( + buffer_tests PRIVATE ocpn::model-src ocpn::gtest win32_libs ) target_compile_definitions( buffer_tests PUBLIC TESTDATA="${CMAKE_CURRENT_LIST_DIR}/testdata" ) if (LINUX) - add_executable(dbus_tests - dbus_tests.cpp - ${MODEL_SRC_DIR}/dbus_client.cpp - ${MODEL_SRC_DIR}/dbus_server.cpp - ${MODEL_SRC_DIR}/cmdline.cpp - ${MODEL_SRC_DIR}/config_vars.cpp - ${MODEL_SRC_DIR}/ipc_api.cpp - ${MODEL_SRC_DIR}/local_api.cpp - ${MODEL_SRC_DIR}/ocpn_utils.cpp - ${MODEL_SRC_DIR}/base_platform.cpp - ${MODEL_SRC_DIR}/logger.cpp - ) - target_link_libraries(dbus_tests PRIVATE observable::observable) - target_link_libraries(dbus_tests PRIVATE ${wxWidgets_LIBRARIES}) - target_link_libraries(dbus_tests PRIVATE ocpn::gtest) - target_link_libraries(dbus_tests PRIVATE ocpn::model) - target_link_libraries(dbus_tests PRIVATE glib::glib) - target_include_directories(dbus_tests PRIVATE - ${CMAKE_SOURCE_DIR}/model/include - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/resources - ) + set(_DBUS_TEST_SRC dbus_tests.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) + add_executable(dbus_tests ${_DBUS_TEST_SRC}) + target_link_libraries(dbus_tests PRIVATE ocpn::gtest ocpn::model-src) if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") target_link_libraries(dbus_tests PUBLIC -fsanitize=${ENABLE_SANITIZER}) endif () endif () - -if (NOT WIN32) - if(APPLE AND OCPN_USE_DEPS_BUNDLE) - set(OPENSSL_ROOT_DIR ${OCPN_DEPS_BUNDLE_PATH}) - endif() - find_package(OpenSSL) - if (OPENSSL_FOUND) - message(STATUS "OpenSSL found ${OPENSSL_INCLUDE_DIR} ${OPENSSL_LIBRARIES}") - target_include_directories(tests PRIVATE ${OPENSSL_INCLUDE_DIR}) - target_link_libraries(tests PRIVATE ${OPENSSL_LIBRARIES}) - add_definitions(-DMG_ENABLE_OPENSSL) - endif (OPENSSL_FOUND) -else (NOT WIN32) - target_include_directories( - tests - PRIVATE ${CMAKE_SOURCE_DIR}/cache/buildwin/include/openssl - ) - target_link_libraries( - tests - PRIVATE ${CMAKE_SOURCE_DIR}/cache/buildwin/libssl.lib - ) - target_link_libraries( - tests - PRIVATE ${CMAKE_SOURCE_DIR}/cache/buildwin/libcrypto.lib - ) -endif (NOT WIN32) -find_program(DBUS_SEND NAMES dbus-send) -if (DBUS_SEND) - target_compile_definitions(tests PRIVATE HAVE_DBUS_SEND) -endif () -if (GLIB_FOUND) - target_compile_definitions(tests PRIVATE HAVE_GLIB) -endif () - - -target_link_libraries(tests PRIVATE ocpn::gtest) include(GoogleTest) gtest_add_tests(TARGET tests) gtest_add_tests(TARGET buffer_tests) + if (LINUX AND NOT DEFINED ENV{FLATPAK_ID} AND NOT OCPN_DISTRO_BUILD) # We don't have a session bus available when testing flatpak # so these can just be run in native builds. @@ -246,78 +110,31 @@ if (LINUX AND NOT DEFINED ENV{FLATPAK_ID} AND NOT OCPN_DISTRO_BUILD) gtest_add_tests(TARGET dbus_tests) endif () -add_executable(cli-server cli_server.cpp ${MODEL_SRC_DIR}/ocpn_utils.cpp) -target_link_libraries(cli-server PRIVATE ${wxWidgets_LIBRARIES}) -target_include_directories(cli-server PRIVATE ../include) -target_include_directories(cli-server PRIVATE - ${CMAKE_SOURCE_DIR}/model/include - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/resources -) +set(_CLI_SRV_SRC cli_server.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) +add_executable(cli-server ${_CLI_SRV_SRC}) +target_link_libraries(cli-server PRIVATE ocpn::model-src win32_libs) if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") target_link_libraries(cli-server PRIVATE -fsanitize=${ENABLE_SANITIZER}) endif () -add_executable(ipc-client ipc_client.cpp ${MODEL_SRC_DIR}/ocpn_utils.cpp) -target_link_libraries(ipc-client PRIVATE ${wxWidgets_LIBRARIES}) -target_link_libraries(ipc-client PRIVATE observable::observable) -target_include_directories(ipc-client PRIVATE - ${CMAKE_SOURCE_DIR}/model/include - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/resources -) +set(_CLI_CLIENT_SRC ipc_client.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) +add_executable(ipc-client ${_CLI_CLIENT_SRC}) +target_link_libraries(ipc-client PRIVATE ocpn::model-src win32_libs) if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") target_link_libraries(ipc-client PRIVATE -fsanitize=${ENABLE_SANITIZER}) endif () - -set (WX_INSTANCE_SRC - wx_instance.cpp - ${MODEL_SRC_DIR}/base_platform.cpp - ${MODEL_SRC_DIR}/cmdline.cpp - ${MODEL_SRC_DIR}/config_vars.cpp - ${MODEL_SRC_DIR}/ocpn_utils.cpp - ${MODEL_SRC_DIR}/logger.cpp -) -if (APPLE) - list(APPEND WX_INSTANCE_SRC ${MODEL_SRC_DIR}/macutils.c) -endif () -add_executable(wx-instance ${WX_INSTANCE_SRC}) -target_link_libraries(wx-instance PRIVATE ${wxWidgets_LIBRARIES}) -target_link_libraries(wx-instance PRIVATE ocpn::opencpn ocpn::model) -target_include_directories(wx-instance PRIVATE - ${CMAKE_SOURCE_DIR}/model/include - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/resources -) -if (MSVC) - target_link_libraries(wx-instance PRIVATE setupapi) -endif () +set(_WX_INST_SRC wx_instance.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) +add_executable(wx-instance ${_WX_INST_SRC}) +target_link_libraries(wx-instance PRIVATE ocpn::model-src win32_libs) if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") target_link_libraries(wx-instance PRIVATE -fsanitize=${ENABLE_SANITIZER}) endif () if (UNIX) - set(STD_INSTANCE_SRC - std_instance.cpp - ${MODEL_SRC_DIR}/std_instance_chk.cpp - ${MODEL_SRC_DIR}/base_platform.cpp - ${MODEL_SRC_DIR}/cmdline.cpp - ${MODEL_SRC_DIR}/config_vars.cpp - ${MODEL_SRC_DIR}/ocpn_utils.cpp - ${MODEL_SRC_DIR}/logger.cpp - ) - if (APPLE) - list(APPEND STD_INSTANCE_SRC ${MODEL_SRC_DIR}/macutils.c) - endif () - add_executable(std-instance ${STD_INSTANCE_SRC}) - target_link_libraries(std-instance PRIVATE ${wxWidgets_LIBRARIES}) - target_link_libraries(std-instance PRIVATE ocpn::model) - target_include_directories(std-instance PRIVATE - ${CMAKE_SOURCE_DIR}/model/include - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/resources - ) + set(_STD_INST_SRC std_instance.cpp ${CMAKE_SOURCE_DIR}/cli/api_shim.cpp) + add_executable(std-instance ${_STD_INST_SRC}) + target_link_libraries(std-instance PRIVATE ocpn::model-src) if (NOT "${ENABLE_SANITIZER}" STREQUAL "none") target_link_libraries(std-instance PRIVATE -fsanitize=${ENABLE_SANITIZER}) endif () diff --git a/test/tests.cpp b/test/tests.cpp index 697a09826b..c072001fab 100644 --- a/test/tests.cpp +++ b/test/tests.cpp @@ -201,7 +201,14 @@ class MsgCliApp : public BasicTest { s_result = ""; s_bus = NavAddr::Bus::Undef; Sink sink; - Source source; + // On loaded CPU:s, for example CI servers, the event might not make + // it to the event queue before ProcessPendingEvents(). Observed on + // at least launchpad. Correct fix would be to use a wxApp instead + // and run it under xvfb or a Wayland composer in headless mode. + do { + Source source; + std::this_thread::yield(); + } while (!HasPendingEvents()); ProcessPendingEvents(); EXPECT_EQ(s_result, std::string("payload data")); EXPECT_EQ(NavAddr::Bus::N2000, s_bus);